martials/nixos-configuration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🧹 Refactor, moved monitornames to common.nix, removed waypaper reload

Browse Source
This commit is contained in:
Martin Berg Alstad 2025-02-02 18:33:09 +01:00
parent 76ebdad3ce
commit 830b76bcb6
Signed by: martials
GPG Key ID: 706F53DD087A91DE
8 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -12,7 +12,7 @@ My NixOS configurations with dotfiles for my desktop
| Shell | Fish | | Shell | Fish |
| Prompt | Starship | | Prompt | Starship |
| Theme | Catppuccin | | Theme | Catppuccin |
| GPU | NVidia | | GPU | Nvidia |
| Panel | Hyprpanel | | Panel | Hyprpanel |
| Runner | Rofi | | Runner | Rofi |
| Fetch | Fastfetch | | Fetch | Fastfetch |

4
common.nix
View File

@ -20,6 +20,10 @@ rec {
options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
}; };
# Empty matches all
monitor1 = "DP-1";
monitor2 = "DP-3";
username = "martin"; username = "martin";
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default

2
configuration.nix
View File

@ -53,7 +53,7 @@ in
vdhcoapp vdhcoapp
fortune fortune
cowsay cowsay
inputs.zen-browser.packages."${system}".default # beta inputs.zen-browser.packages.${system}.default # beta
onlyoffice-desktopeditors onlyoffice-desktopeditors
]; ];

3
flake.nix
View File

@ -37,6 +37,7 @@
}: }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
hostname = "nixos";
inherit (self) outputs; inherit (self) outputs;
common = import ./common.nix; common = import ./common.nix;
in in
@ -46,7 +47,7 @@
# Adds the nix fmt command to format nix files # Adds the nix fmt command to format nix files
formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
system = system; system = system;
specialArgs = { inherit outputs inputs; }; # Pass args to modules specialArgs = { inherit outputs inputs; }; # Pass args to modules
modules = [ modules = [

1
home-manager/development/git.nix
View File

@ -5,6 +5,7 @@
userEmail = "git@martials.no"; userEmail = "git@martials.no";
aliases = { aliases = {
amend = "commit --amend";
cm = "commit"; cm = "commit";
s = "status"; s = "status";
}; };

1
home-manager/hyprland/hypridle/default.nix
View File

@ -34,4 +34,5 @@ in
]; ];
}; };
}; };
wayland.windowManager.hyprland.settings.exec-once = [ "hypridle" ];
} }

8
home-manager/hyprland/hyprpaper.nix
View File

@ -1,6 +1,8 @@
# Wallpapers # Wallpapers
{ pkgs, ... }: { pkgs, ... }:
let
common = import ../../common.nix;
in
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
hyprpaper hyprpaper
@ -25,8 +27,8 @@
]; ];
wallpaper = [ wallpaper = [
"DP-1,${monitor1}" "${common.monitor1},${monitor1}"
"DP-3,${monitor2}" "${common.monitor2},${monitor2}"
]; ];
}; };
}; };

8
home-manager/hyprland/settings.nix
View File

@ -1,23 +1,21 @@
{ lib, ... }: { lib, ... }:
let let
common = import ../../common.nix; common = import ../../common.nix;
app = common.default;
theme = import ../../theme.nix; theme = import ../../theme.nix;
app = common.default;
in in
{ {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"DP-1, 3440x1440@175, 0x0, 1" "${common.monitor1}, 3440x1440@175, 0x0, 1"
"DP-3, 3840x2160@60, 3440x0, 1.5, transform, 1" "${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
]; ];
# Autostart # Autostart
exec-once = [ exec-once = [
app.browser app.browser
app.terminal app.terminal
"hypridle"
"systemctl --user start hyprpolkitagent" "systemctl --user start hyprpolkitagent"
"waypaper --restore"
]; ];
env = [ env = [