diff --git a/flake.nix b/flake.nix index a7089b2..54e1129 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ username = "joy"; domain = "joygnu.org"; mail = "contact@joygnu.org"; + nixpath = "nix/"; systemConfig = {modules}: nixpkgs.lib.nixosSystem { specialArgs = { @@ -19,6 +20,7 @@ inherit username; inherit domain; inherit mail; + inherit nixpath; }; modules = modules ++ [home-manager.nixosModules.default sops-nix.nixosModules.sops]; }; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 9420533..9072524 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -2,6 +2,7 @@ inputs, username, domain, + nixpath, ... }: let mail = { @@ -16,6 +17,7 @@ in { inherit username; inherit mail; inherit domain; + inherit nixpath; }; users = { "${username}" = import ./home.nix; diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index 5da3074..248afdf 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -2,6 +2,7 @@ pkgs, domain, username, + nixpath, ... }: { programs.zsh = { @@ -22,10 +23,10 @@ rs = "z ~ && ssh root@45.145.42.193"; hs = "z ~ && ssh ${username}@${domain}"; su = "z ~ && su"; - ip = "sh ~/nix/modules/programs/zsh/scripts/ip.sh"; - rb = "sh ~/nix/modules/programs/zsh/scripts/rebuild.sh"; + ip = "sh ~/${nixpath}modules/programs/zsh/scripts/ip.sh"; + rb = "sh ~/${nixpath}modules/programs/zsh/scripts/ip.sh"; fr = "doas systemctl reboot --firmware"; - up = "nix flake update --flake ~/nix/"; + up = "nix flake update --flake ~/${nixpath}"; del = "doas nix-collect-garbage -d"; dn = "dotnet new console"; dr = "dotnet run"; diff --git a/modules/wm/home/rofi/default.nix b/modules/wm/home/rofi/default.nix index 6be4578..6bea850 100644 --- a/modules/wm/home/rofi/default.nix +++ b/modules/wm/home/rofi/default.nix @@ -1,12 +1,12 @@ { pkgs, - lib, + nixpath, ... }: { programs.rofi = { enable = true; package = pkgs.rofi-wayland; - theme = lib.mkForce "~/nix/modules/wm/home/rofi/gruvbox-material.rasi"; + theme = "~/${nixpath}modules/wm/home/rofi/gruvbox-material.rasi"; extraConfig = { display-drun = ""; show-icons = true; diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index c32dee0..c3628e1 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -1,6 +1,7 @@ { pkgs, username, + nixpath, ... }: { programs.hyprland = { @@ -12,7 +13,7 @@ enable = true; settings = { "$mod" = "SUPER"; - "$sciPath" = "~/nix/modules/wm/hyprland/scripts"; + "$sciPath" = "~/${nixpath}modules/wm/hyprland/scripts"; cursor = { inactive_timeout = "3"; }; diff --git a/modules/wm/stylix/default.nix b/modules/wm/stylix/default.nix index df4a253..21064d7 100644 --- a/modules/wm/stylix/default.nix +++ b/modules/wm/stylix/default.nix @@ -58,6 +58,6 @@ in { }; home-manager.users.${username}.stylix.targets = { foot.enable = false; - # hyprland.enable = false; + rofi.enable = false; }; }