diff options
| -rw-r--r-- | users/seth/home.nix | 1 | ||||
| -rw-r--r-- | users/seth/options.nix | 5 | ||||
| -rw-r--r-- | users/seth/programs/default.nix | 10 | ||||
| -rw-r--r-- | users/seth/programs/git.nix | 4 | ||||
| -rw-r--r-- | users/seth/programs/mangohud/default.nix | 6 | ||||
| -rw-r--r-- | users/seth/programs/xdg.nix | 4 | ||||
| -rw-r--r-- | users/seth/shell/bash.nix | 2 | ||||
| -rw-r--r-- | users/seth/shell/fish.nix | 8 | ||||
| -rw-r--r-- | users/seth/shell/zsh/default.nix | 2 |
9 files changed, 28 insertions, 14 deletions
diff --git a/users/seth/home.nix b/users/seth/home.nix index 5a43186..79776b6 100644 --- a/users/seth/home.nix +++ b/users/seth/home.nix @@ -8,4 +8,5 @@ _: { seth.devel.enable = true; seth.desktop = "gnome"; + # seth.standalone = true; } diff --git a/users/seth/options.nix b/users/seth/options.nix index 676dbfa..1c71db7 100644 --- a/users/seth/options.nix +++ b/users/seth/options.nix @@ -10,5 +10,10 @@ default = ""; description = "choose a desktop configuration"; }; + standalone = mkOption { + type = types.bool; + default = false; + description = "set to true if using home-manager standalone"; + }; }; } diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix index 902f7bf..d1b8f97 100644 --- a/users/seth/programs/default.nix +++ b/users/seth/programs/default.nix @@ -11,6 +11,7 @@ clang deadnix eclint + lld statix ] else []; @@ -25,6 +26,10 @@ steam ] else []; + systemPackages = + if !config.seth.standalone + then with pkgs; [python311] + else []; in { imports = [ ./git.nix @@ -41,12 +46,11 @@ in { exa fd gh - lld rclone restic ripgrep - python311 ] ++ develPackages - ++ guiApps; + ++ guiApps + ++ systemPackages; } diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix index c051f2b..cd3274f 100644 --- a/users/seth/programs/git.nix +++ b/users/seth/programs/git.nix @@ -1,6 +1,6 @@ -_: { +{config, ...}: { programs.git = { - enable = true; + enable = !config.seth.standalone; extraConfig = { init = {defaultBranch = "main";}; safe = {directory = "/etc/nixos";}; diff --git a/users/seth/programs/mangohud/default.nix b/users/seth/programs/mangohud/default.nix index 3c203c4..ff240b8 100644 --- a/users/seth/programs/mangohud/default.nix +++ b/users/seth/programs/mangohud/default.nix @@ -4,11 +4,11 @@ ... }: let homePackages = - if config.seth.desktop != "null" + if config.seth.desktop != "" then with pkgs; [mangohud] else []; mangohudConf = - if config.seth.desktop != "null" + if config.seth.desktop != "" then { source = ./config; recursive = true; @@ -17,5 +17,5 @@ in { home.packages = homePackages; - xdg.configFile.MangoHud = mangohudConf; + # xdg.configFile.MangoHud = mangohudConf; } diff --git a/users/seth/programs/xdg.nix b/users/seth/programs/xdg.nix index 9467a5b..08230ac 100644 --- a/users/seth/programs/xdg.nix +++ b/users/seth/programs/xdg.nix @@ -1,5 +1,5 @@ -_: { +{config, ...}: { xdg = { - enable = true; + enable = !config.seth.standalone; }; } diff --git a/users/seth/shell/bash.nix b/users/seth/shell/bash.nix index 7412c46..32f4f31 100644 --- a/users/seth/shell/bash.nix +++ b/users/seth/shell/bash.nix @@ -1,6 +1,6 @@ {config, ...}: { programs.bash = { - enable = true; + enable = !config.seth.standalone; historyFile = "${config.xdg.stateHome}/bash/history"; historyFileSize = 1000; historySize = 100; diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix index 6c08684..3345027 100644 --- a/users/seth/shell/fish.nix +++ b/users/seth/shell/fish.nix @@ -1,6 +1,10 @@ -{pkgs, ...}: { +{ + config, + pkgs, + ... +}: { programs.fish = { - enable = true; + enable = !config.seth.standalone; plugins = [ { name = "autopair-fish"; diff --git a/users/seth/shell/zsh/default.nix b/users/seth/shell/zsh/default.nix index be7f043..b37b071 100644 --- a/users/seth/shell/zsh/default.nix +++ b/users/seth/shell/zsh/default.nix @@ -4,7 +4,7 @@ ... }: { programs.zsh = { - enable = true; + enable = !config.seth.standalone; enableAutosuggestions = true; enableSyntaxHighlighting = true; enableVteIntegration = true; |