diff --git a/flake.nix b/flake.nix index a729616..f21d933 100644 --- a/flake.nix +++ b/flake.nix @@ -13,10 +13,7 @@ outputs = { nixpkgs, home-manager, ... }: let homeManager = { system, specialArgs ? { - # Whether to configure the zsh prompt. - prompt = true; - - # Whether to also install several useful cli tools and desktop applications. + # Whether to install desktop-targeted tools and applications. # # (This primarily focuses around macOS - please use and adopt at your own risk.) desktop = false; diff --git a/home/home.nix b/home/home.nix index 0df849f..312d948 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, specialArgs, ... }: let - prompt = specialArgs.prompt or false; desktop = specialArgs.desktop or false; in { # It's standard convention that Darwin has the username @@ -26,7 +25,7 @@ in { userEmail = "spotlight@joscomputing.space"; # Only specify signing if GPG is otherwise being pulled in; # i.e. in a prompt configuration. - signing = lib.mkIf (prompt) { + signing = { key = "6EF6CBB6420B81DA3CCACFEA874AA355B3209BDC"; signByDefault = true; }; @@ -39,14 +38,14 @@ in { }; # Only include the desktop configuration if not dotfiles only. - imports = (lib.optional (prompt) ( - # vim, etc + imports = [ + # vim, etc. ./editor.nix - # zsh, etc + # zsh, etc. ./prompt.nix - )) ++ (lib.optional (desktop) - ./desktop.nix - ) ++ []; + ] + # Primarily GUI applications for desktop usage + ++ (lib.optional (desktop) ./desktop.nix); # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage diff --git a/pkgs/default.nix b/pkgs/default.nix index ab060ec..32ce3ef 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,11 +2,4 @@ self: super: { monaco-powerline = super.callPackage ./monaco-powerline/default.nix {}; swiftformat = super.callPackage ./swiftformat.nix {}; - - # Include gnome-icon-theme to virt-manager to fix broken icons. - virt-manager = super.virt-manager.override { - preFixup = super.virt-manager.preFixup '' - --prefix XDG_DATA_DIRS : "${super.hicolor-icon-theme}/share" - ''; - }; }