diff --git a/flake.nix b/flake.nix index ebc2e30..0c4af8a 100644 --- a/flake.nix +++ b/flake.nix @@ -318,6 +318,7 @@ "testuser" = mkHome { username = "testuser"; system = "x86_64-linux"; + modules = [ ./users/testuser/home.nix ]; stateVersion = "23.11"; nixpkgs = inputs.nixpkgs-unstable; home-manager = inputs.home-manager-unstable; diff --git a/home/profile/base.nix b/home/profile/base.nix index 5c92e35..53f9dc6 100644 --- a/home/profile/base.nix +++ b/home/profile/base.nix @@ -22,10 +22,11 @@ in v = "nvim"; icat = "kitty +kitten icat"; }; - programs.fzf.enable = true; - programs.fzf.enableZshIntegration = true; + programs.fzf.enable = lib.mkDefault true; + programs.fzf.enableZshIntegration = lib.mkDefault true; + programs.fzf.enableBashIntegration = lib.mkDefault true; programs.zsh = { - enable = true; + enable = lib.mkDefault (!config.programs.bash.enable); initExtra = '' export HOME_MANAGER_MANAGED=true [[ -e ~/dotfiles/shell/.zshrc ]] && . ~/dotfiles/shell/.zshrc ]] diff --git a/home/standalone.nix b/home/standalone.nix index 270e837..7bbe3cc 100644 --- a/home/standalone.nix +++ b/home/standalone.nix @@ -1,8 +1,21 @@ -# Home Manager default nixfiles entrypoint. Currently this file does nothing -# besides import default.nix +# Home Manager default nixfiles entrypoint. This serves as an alternative to +# default.nix, which sets up some more appropriate options for home-manager { pkgs, config, lib, ... }: { imports = [ ./. ]; + config = { + # bash is more common on my standalone machines for some reason (low + # powered things like raspberry pis, the default on steam deck, termux, + # etc.) + programs.bash.enable = lib.mkDefault true; + programs.home-manager.enable = lib.mkDefault true; + nixfiles = { + profile.base.enable = lib.mkDefault true; + packageSets = { + multimedia.enable = lib.mkDefault true; + }; + }; + }; } diff --git a/users/testuser/home.nix b/users/testuser/home.nix new file mode 100644 index 0000000..e8c4361 --- /dev/null +++ b/users/testuser/home.nix @@ -0,0 +1,6 @@ +{ pkgs, config, lib, ... }: +{ + config = { + programs.bash.enable = true; + }; +}