From 81596f7cd9f8bc3eb9558a2392e10d94a83acd1f Mon Sep 17 00:00:00 2001 From: zackartz Date: Wed, 13 Mar 2024 15:43:50 -0400 Subject: [PATCH] 196 current 2024-03-13 15:43:40 24.05.20240312.0ad13a6 6.8.0-zen1 * --- flake.lock | 47 ++++++++++++++++++-------------- modules/home-manager/default.nix | 30 -------------------- modules/shell/git.nix | 4 --- modules/shell/zsh/tools.nix | 2 +- 4 files changed, 27 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index 5d3762a..1b3cce3 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1710164657, - "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", + "lastModified": 1710349883, + "narHash": "sha256-bjbdS2mC76xNJwt1d/uZa+JdHR8CCyYbF4Ey/NgOJus=", "owner": "nix-community", "repo": "home-manager", - "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", + "rev": "2f0db7d418e781354d8a3c50e611e3b1cd413087", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1710062421, - "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", + "lastModified": 1710281778, + "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", "owner": "nix-community", "repo": "home-manager", - "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", + "rev": "49a266d2ca59df8a03249550e73a54626181b65d", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1710257866, - "narHash": "sha256-hn2kNDO76HYyu6/xWF9IeWz6ZUKuCA3awWDuvCM9E28=", + "lastModified": 1710344304, + "narHash": "sha256-jE+/UGqRYkKBBpLTTV5ayCtVmD9N1WsSKpufszUPzcA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5da9591775cbe6b34273c292f1ba0c2ccac8f23c", + "rev": "3e67ee0f5f66c74c0a0bd4f797361fd100c2e2d2", "type": "github" }, "original": { @@ -266,14 +266,19 @@ "inputs": { "hyprland": [ "hyprland" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1710008507, - "narHash": "sha256-XCQ0fpjSObg8sQVRg06/+eLM1t/b9XjaIvOz1OwYGwg=", + "lastModified": 1710281302, + "narHash": "sha256-Eo1Xi3WCc7rn43gxL0Fb1Wr1qjCLB0kTNr+at2a8yoA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "ba7d13e95564635d7769b979275701c6413c8da1", + "rev": "34ade54e1be45210fb7e98d41a0990472d81cefe", "type": "github" }, "original": { @@ -391,11 +396,11 @@ ] }, "locked": { - "lastModified": 1709771483, - "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", + "lastModified": 1710281379, + "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", + "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", "type": "github" }, "original": { @@ -422,11 +427,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -449,11 +454,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710258142, - "narHash": "sha256-jvcEyvl/Z4kkYtaF+hk+0bAMD+7hxML29v4or4tHQ6g=", + "lastModified": 1710347506, + "narHash": "sha256-qwKEfLPd6oDugHfX6efCG9A2Z6360aAObYfFnbIKhzE=", "owner": "nix-community", "repo": "nixvim", - "rev": "9f9d9ac0b7aeb0889e5de60c89da674d481df9b7", + "rev": "9b9912077e11478460c0d919a0101ace8966f44a", "type": "github" }, "original": { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 84ec25f..b555224 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -122,36 +122,6 @@ '') ]; - # Home Manager is pretty good at managing dotfiles. The primary way to manage - # plain files is through 'home.file'. - home.file = { - # # Building this configuration will create a copy of 'dotfiles/screenrc' in - # # the Nix store. Activating the configuration will then make '~/.screenrc' a - # # symlink to the Nix store copy. - # ".screenrc".source = dotfiles/screenrc; - - # # You can also set the file content immediately. - # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 - # ''; - }; - - # Home Manager can also manage your environment variables through - # 'home.sessionVariables'. If you don't want to manage your shell through Home - # Manager then you have to manually source 'hm-session-vars.sh' located at - # either - # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # /etc/profiles/per-user/zack/etc/profile.d/hm-session-vars.sh - # home.sessionVariables = { EDITOR = "nvim"; }; diff --git a/modules/shell/git.nix b/modules/shell/git.nix index 900035c..3f70f5a 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -4,10 +4,6 @@ enable = true; userName = "zack"; userEmail = "zackmyers@lavabit.com"; - signing = { - key = "056CFD15A9F99B0E"; - signByDefault = false; - }; ignores = [ ".cache/" ".DS_Store" diff --git a/modules/shell/zsh/tools.nix b/modules/shell/zsh/tools.nix index f84f55a..2cbf513 100644 --- a/modules/shell/zsh/tools.nix +++ b/modules/shell/zsh/tools.nix @@ -3,7 +3,7 @@ udiskie.enable = true; gpg-agent = { enable = true; - pinentryFlavor = "gnome3"; + pinentryFlavor = "gnome2"; enableSshSupport = true; enableZshIntegration = true; };