Compare commits

..

No commits in common. "29a271d52f9c7e4362f3e32606a154dc40e875f9" and "7f1c17f1516824bb039d095db151c07d595c2ae6" have entirely different histories.

3 changed files with 19 additions and 8 deletions

View file

@ -13,7 +13,10 @@
outputs = { nixpkgs, home-manager, ... }: outputs = { nixpkgs, home-manager, ... }:
let let
homeManager = { system, specialArgs ? { homeManager = { system, specialArgs ? {
# Whether to install desktop-targeted tools and applications. # Whether to configure the zsh prompt.
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,6 +1,7 @@
{ 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
@ -25,7 +26,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 = { signing = lib.mkIf (prompt) {
key = "6EF6CBB6420B81DA3CCACFEA874AA355B3209BDC"; key = "6EF6CBB6420B81DA3CCACFEA874AA355B3209BDC";
signByDefault = true; signByDefault = true;
}; };
@ -38,14 +39,14 @@ in {
}; };
# Only include the desktop configuration if not dotfiles only. # Only include the desktop configuration if not dotfiles only.
imports = [ imports = (lib.optional (prompt) (
# vim, etc. # vim, etc
./editor.nix ./editor.nix
# zsh, etc. # zsh, etc
./prompt.nix ./prompt.nix
] )) ++ (lib.optional (desktop)
# Primarily GUI applications for desktop usage ./desktop.nix
++ (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,4 +2,11 @@ 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"
'';
};
} }