From a28c9fb66693a18517e92a90d69b044e7ec58075 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Fri, 30 Aug 2024 13:04:49 +0200 Subject: [PATCH 1/3] Add UKMM --- modules/home/gaming.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/gaming.nix b/modules/home/gaming.nix index 9da1f97..b452124 100644 --- a/modules/home/gaming.nix +++ b/modules/home/gaming.nix @@ -39,5 +39,6 @@ ## Others moonlight-qt + ukmm # BOTW mod manager ]; } From eafa0892ae48ff13fd670602c2c2466b194b8cfd Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Fri, 30 Aug 2024 13:57:26 +0200 Subject: [PATCH 2/3] Update flake --- flake.lock | 42 +++++++++++++++++++-------------------- modules/home/starship.nix | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 5578455..0279b79 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "catppuccin-bat": { "flake": false, "locked": { - "lastModified": 1721485583, - "narHash": "sha256-/Ob9iCVyjJDBCXlss9KwFQTuxybmSSzYRBZxOT10PZg=", + "lastModified": 1722864529, + "narHash": "sha256-s0CHTihXlBMCKmbBBb8dUhfgOOQu9PBCQ+uviy7o47w=", "owner": "catppuccin", "repo": "bat", - "rev": "82e7ca555f805b53d2b377390e4ab38c20282e83", + "rev": "d3feec47b16a8e99eabb34cdfbaa115541d374fc", "type": "github" }, "original": { @@ -35,11 +35,11 @@ "catppuccin-starship": { "flake": false, "locked": { - "lastModified": 1716565281, - "narHash": "sha256-KzXO4dqpufxTew064ZLp3zKIXBwbF8Bi+I0Xa63j/lI=", + "lastModified": 1723819937, + "narHash": "sha256-t/Hmd2dzBn0AbLUlbL8CBt19/we8spY5nMP0Z+VPMXA=", "owner": "catppuccin", "repo": "starship", - "rev": "ca2fb0600730fd3958a2cb4d4ca97c401877b365", + "rev": "3c4749512e7d552adf48e75e5182a271392ab176", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1721524502, - "narHash": "sha256-nu8KFg/dBOWYaf5K9/HOEv7RjFgaKNqlxzv6rlhMjNw=", + "lastModified": 1724971150, + "narHash": "sha256-QPmFN1OwO2Ik4cRiGME+40n5c7xe98dmf0sgJfH2IQc=", "owner": "unmojang", "repo": "FjordLauncher", - "rev": "17da1f266ccf66f30280916cbfa13e1c4b758480", + "rev": "26a70d74fe48fb6ae87797173f879ff09425287f", "type": "github" }, "original": { @@ -156,11 +156,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1720709712, - "narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=", + "lastModified": 1722636442, + "narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=", "owner": "hyprwm", "repo": "contrib", - "rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade", + "rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722221733, - "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=", + "lastModified": 1724855419, + "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bf09802d77264e441f48e25459c10c93eada2e", + "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06", "type": "github" }, "original": { @@ -266,11 +266,11 @@ }, "nur": { "locked": { - "lastModified": 1722505514, - "narHash": "sha256-IDkU+iwzj1Xkrj7duPMu7DiWLjOmlGv7i0TohoPA3vI=", + "lastModified": 1725014731, + "narHash": "sha256-4Y3FY4JzZsKQ0FKfdoWCt2BJFWDrnCk+Fi3+oo2kb0M=", "owner": "nix-community", "repo": "NUR", - "rev": "23913254fceb5cca89b1e428d536dc9bfa58ec84", + "rev": "8a0c673833f8c455f54b1c4596fb19715c8d1101", "type": "github" }, "original": { diff --git a/modules/home/starship.nix b/modules/home/starship.nix index 214ccdf..70c1898 100644 --- a/modules/home/starship.nix +++ b/modules/home/starship.nix @@ -41,6 +41,6 @@ palette = "catppuccin_mocha"; } - // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml"); + // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/themes/mocha.toml"); }; } From e9fddc2e9c8c2620c7ccd4176966b646c60c7458 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Fri, 30 Aug 2024 14:26:57 +0200 Subject: [PATCH 3/3] Switch gpg-agent config to home-manager --- modules/core/programs.nix | 10 ---------- modules/home/default.nix | 1 + modules/home/gpg.nix | 7 +++++++ 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 modules/home/gpg.nix diff --git a/modules/core/programs.nix b/modules/core/programs.nix index cea015e..3db60c4 100644 --- a/modules/core/programs.nix +++ b/modules/core/programs.nix @@ -6,16 +6,6 @@ programs.dconf.enable = true; programs.zsh.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - # pinentryFlavor = ""; - }; - environment.shellInit = '' - gpg-connect-agent /bye - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - ''; - programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; []; programs.adb.enable = true; diff --git a/modules/home/default.nix b/modules/home/default.nix index 9a2ce67..3e2ebac 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -9,6 +9,7 @@ ++ [(import ./btop.nix)] # resouces monitor ++ [(import ./cava.nix)] # audio visualizer ++ [(import ./discord.nix)] # discord with catppuccin theme + ++ [(import ./gpg.nix)] # GnuPG and its agent (gpg-agent) ++ [(import ./floorp/floorp.nix)] # firefox based browser ++ [(import ./fuzzel.nix)] # launcher ++ [(import ./gaming.nix)] # packages related to gaming diff --git a/modules/home/gpg.nix b/modules/home/gpg.nix new file mode 100644 index 0000000..2dfe2fb --- /dev/null +++ b/modules/home/gpg.nix @@ -0,0 +1,7 @@ +{...}: { + services.gpg-agent = { + enable = true; + enableSshSupport = true; + sshKeys = ["D2A3680589B81F2B07DA6CFE21DF848F1AF4E9D3"]; + }; +}