Compare commits

...

2 commits

Author SHA1 Message Date
29a271d52f
Remove prompt optional
No configuration particuarly needs this.
2023-09-10 23:01:39 -05:00
3672d5e32b
Remove virt-manager fix-up 2023-09-10 23:01:07 -05:00
3 changed files with 8 additions and 19 deletions

View file

@ -13,10 +13,7 @@
outputs = { nixpkgs, home-manager, ... }: outputs = { nixpkgs, home-manager, ... }:
let let
homeManager = { system, specialArgs ? { homeManager = { system, specialArgs ? {
# Whether to configure the zsh prompt. # Whether to install desktop-targeted tools and applications.
prompt = true;
# Whether to also install several useful cli tools and desktop applications.
# #
# (This primarily focuses around macOS - please use and adopt at your own risk.) # (This primarily focuses around macOS - please use and adopt at your own risk.)
desktop = false; desktop = false;

View file

@ -1,7 +1,6 @@
{ config, lib, pkgs, specialArgs, ... }: { config, lib, pkgs, specialArgs, ... }:
let let
prompt = specialArgs.prompt or false;
desktop = specialArgs.desktop or false; desktop = specialArgs.desktop or false;
in { in {
# It's standard convention that Darwin has the username # It's standard convention that Darwin has the username
@ -26,7 +25,7 @@ in {
userEmail = "spotlight@joscomputing.space"; userEmail = "spotlight@joscomputing.space";
# Only specify signing if GPG is otherwise being pulled in; # Only specify signing if GPG is otherwise being pulled in;
# i.e. in a prompt configuration. # i.e. in a prompt configuration.
signing = lib.mkIf (prompt) { signing = {
key = "6EF6CBB6420B81DA3CCACFEA874AA355B3209BDC"; key = "6EF6CBB6420B81DA3CCACFEA874AA355B3209BDC";
signByDefault = true; signByDefault = true;
}; };
@ -39,14 +38,14 @@ in {
}; };
# Only include the desktop configuration if not dotfiles only. # Only include the desktop configuration if not dotfiles only.
imports = (lib.optional (prompt) ( imports = [
# vim, etc # vim, etc.
./editor.nix ./editor.nix
# zsh, etc # zsh, etc.
./prompt.nix ./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 # This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage # configuration is compatible with. This helps avoid breakage

View file

@ -2,11 +2,4 @@ self: super:
{ {
monaco-powerline = super.callPackage ./monaco-powerline/default.nix {}; monaco-powerline = super.callPackage ./monaco-powerline/default.nix {};
swiftformat = super.callPackage ./swiftformat.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"
'';
};
} }