From 4ec61784ed258c4310bde26168c584cd25909441 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 29 Nov 2024 00:44:04 -0600 Subject: [PATCH 1/3] modularize zsh --- home/modules/default.nix | 1 + home/modules/terminal/default.nix | 6 ------ home/modules/zsh/default.nix | 18 ++++++++++++++++++ home/modules/{terminal => zsh}/zshrc.nix | 2 +- .../fabian@posixlycorrect/default.nix | 2 ++ 5 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 home/modules/zsh/default.nix rename home/modules/{terminal => zsh}/zshrc.nix (98%) diff --git a/home/modules/default.nix b/home/modules/default.nix index 0ac2c86..5177476 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -12,5 +12,6 @@ ./yubikey.nix ./browsers.nix ./gui + ./zsh ]; } diff --git a/home/modules/terminal/default.nix b/home/modules/terminal/default.nix index 1914821..8d49497 100644 --- a/home/modules/terminal/default.nix +++ b/home/modules/terminal/default.nix @@ -34,12 +34,6 @@ in { }; }; - programs.zsh = { - enable = true; - syntaxHighlighting.enable = true; - initExtra = import ./zshrc.nix pkgs; - }; - programs.git = { enable = true; userEmail = "fabian@posixlycorrect.com"; diff --git a/home/modules/zsh/default.nix b/home/modules/zsh/default.nix new file mode 100644 index 0000000..6434908 --- /dev/null +++ b/home/modules/zsh/default.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.local.services.zsh; +in { + options.local.services.zsh.enable = mkEnableOption "zsh settings"; + config = mkIf cfg.enable { + programs.zsh = { + enable = true; + syntaxHighlighting.enable = true; + initExtra = import ./zshrc.nix pkgs; + }; + }; +} diff --git a/home/modules/terminal/zshrc.nix b/home/modules/zsh/zshrc.nix similarity index 98% rename from home/modules/terminal/zshrc.nix rename to home/modules/zsh/zshrc.nix index 2bcee01..6665b14 100644 --- a/home/modules/terminal/zshrc.nix +++ b/home/modules/zsh/zshrc.nix @@ -83,7 +83,7 @@ alias tree='tree -CF' alias lock="betterlockscreen -l" alias nightmode="${redshift}/bin/redshift -P -O 1000" - alias lightmode="${redshift}/bin/redshift -P -O 6500" + alias lightmode="${redshift}/bin/redshift -x=" alias inbox="echo >> $HOME/gtd/inbox" alias nixoide="nix repl ''" alias vps="ssh -A vps" diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index 6d16ec3..553234a 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -43,6 +43,8 @@ }; }; + local.services.zsh.enable = true; + home = { stateVersion = "21.11"; # No tocar esto username = "fabian"; From a7827e619c4c2e1dd4d015aeb08fd88baa42e94e Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 29 Nov 2024 00:56:20 -0600 Subject: [PATCH 2/3] modularize gpg --- home/modules/default.nix | 1 + home/modules/gpg.nix | 49 +++++++++++++++++++ home/modules/terminal/default.nix | 23 --------- .../fabian@posixlycorrect/default.nix | 8 ++- 4 files changed, 57 insertions(+), 24 deletions(-) create mode 100644 home/modules/gpg.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index 5177476..331f424 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -13,5 +13,6 @@ ./browsers.nix ./gui ./zsh + ./gpg.nix ]; } diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix new file mode 100644 index 0000000..551e078 --- /dev/null +++ b/home/modules/gpg.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.local.services.gpg; +in { + options.local.services.gpg = { + enable = mkEnableOption "gpg settings"; + defaultKey = mkOption { + type = types.str; + description = "fingerprint of default public key to be used in gpg, git, email, etc."; + example = "7AA277E604A4173916BBB4E91FFAC35E1798174F"; + }; + }; + config = mkIf cfg.enable { + programs.gpg = { + enable = true; + settings = { + default-key = config.local.services.gpg.defaultKey; + }; + }; + + services.gpg-agent = { + enable = true; + enableZshIntegration = true; + pinentryPackage = pkgs.pinentry-emacs; + }; + + accounts.email.accounts = { + "fabian@posixlycorrect.com" = { + gpg = { + encryptByDefault = true; + signByDefault = true; + key = config.local.services.gpg.defaultKey; + }; + }; + }; + + programs.git = { + signing = { + key = config.local.services.gpg.defaultKey; + signByDefault = true; + }; + }; + }; +} diff --git a/home/modules/terminal/default.nix b/home/modules/terminal/default.nix index 8d49497..d79053c 100644 --- a/home/modules/terminal/default.nix +++ b/home/modules/terminal/default.nix @@ -38,23 +38,6 @@ in { enable = true; userEmail = "fabian@posixlycorrect.com"; userName = "Fabian Montero"; - #signing = { - # key = "7AA277E604A4173916BBB4E91FFAC35E1798174F"; - # signByDefault = true; - #}; - }; - - programs.gpg = { - enable = true; - #settings = { - # default-key = "7AA277E604A4173916BBB4E91FFAC35E1798174F"; - #}; - }; - - services.gpg-agent = { - enable = true; - enableZshIntegration = true; - pinentryPackage = pkgs.pinentry-emacs; }; accounts.email.accounts = { @@ -64,12 +47,6 @@ in { realName = "fabian"; primary = true; flavor = "fastmail.com"; - - gpg = { - encryptByDefault = true; - signByDefault = true; - key = "7AA277E604A4173916BBB4E91FFAC35E1798174F"; - }; }; }; }; diff --git a/home/platforms/fabian@posixlycorrect/default.nix b/home/platforms/fabian@posixlycorrect/default.nix index 553234a..2a14e08 100644 --- a/home/platforms/fabian@posixlycorrect/default.nix +++ b/home/platforms/fabian@posixlycorrect/default.nix @@ -43,7 +43,13 @@ }; }; - local.services.zsh.enable = true; + local.services = { + zsh.enable = true; + gpg = { + enalbe = true; + defaultKey = "7AA277E604A4173916BBB4E91FFAC35E1798174F"; + }; + }; home = { stateVersion = "21.11"; # No tocar esto From 541f80ff911883ced7328593dfa9cf1524d43146 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Fri, 29 Nov 2024 01:01:35 -0600 Subject: [PATCH 3/3] update baseline to configure git --- home/modules/baseline.nix | 7 ++++++- home/modules/terminal/default.nix | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix index 2d00d9a..02b2353 100644 --- a/home/modules/baseline.nix +++ b/home/modules/baseline.nix @@ -17,7 +17,6 @@ in { packages = with pkgs; [ calc file - git htop killall man-pages @@ -36,5 +35,11 @@ in { "EDITOR" = mkDefault "vim"; }; }; + + programs.git = { + enable = true; + userEmail = "fabian@posixlycorrect.com"; + userName = "Fabian Montero"; + }; }; } diff --git a/home/modules/terminal/default.nix b/home/modules/terminal/default.nix index d79053c..693be1e 100644 --- a/home/modules/terminal/default.nix +++ b/home/modules/terminal/default.nix @@ -34,12 +34,6 @@ in { }; }; - programs.git = { - enable = true; - userEmail = "fabian@posixlycorrect.com"; - userName = "Fabian Montero"; - }; - accounts.email.accounts = { "fabian@posixlycorrect.com" = { address = "fabian@posixlycorrect.com";