diff options
| -rw-r--r-- | flake.lock | 36 | ||||
| -rw-r--r-- | modules/file-management/lf/default.nix | 10 | ||||
| -rw-r--r-- | modules/scripts/default.nix | 42 | ||||
| -rw-r--r-- | modules/security/ssh/default.nix | 2 |
4 files changed, 42 insertions, 48 deletions
@@ -84,11 +84,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1783538213, - "narHash": "sha256-jNjKlmrejUrBgVAeiavlMLlkmC7ZEv1D9nhfuwMW5Q8=", + "lastModified": 1784325378, + "narHash": "sha256-Gof6j4d43yX2qSLLp78JILke346IggDFIxTgl3ecVQE=", "owner": "cachix", "repo": "devenv", - "rev": "d1fb321e73048d0e1e2b523580268ebb3df2ae90", + "rev": "5f1cf17be0fc48689bd0ecb810de6d2e06d259a1", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1783823409, - "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", + "lastModified": 1784407317, + "narHash": "sha256-iZrxHToDJWnvt+5LGAtvuQMTy1NZYlNEKbKaVtBJNcc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", + "rev": "39411a8e12a5526d992e65bc7e3dc9a4414d6713", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1780381423, - "narHash": "sha256-S1BIJiQF4lRtJUKak0e97JwNvbe69/LW78YJJuB18Qk=", + "lastModified": 1783935112, + "narHash": "sha256-IAQ14nteIKXAz4cd75UcZrsHGEVJ7QNrkUwX9rmeZ/Y=", "owner": "nix-community", "repo": "nixd", - "rev": "0e07c08c448a2995e7793d1098437b29bbe80b02", + "rev": "a64cd33e53b316b6b092ea0a966640cd2309bf3d", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", + "lastModified": 1784356753, + "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", + "lastModified": 1783915482, + "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1783647864, - "narHash": "sha256-gtVkWD4SbsvQQ8aSFEsrUTxxyuim4/ZC6lBJmA+sE/k=", + "lastModified": 1784057377, + "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "ebffdb62cd1604537ee51d4d23258c002f1c90f8", + "rev": "07180a087e4a00720dc0731cbcd8dec796974381", "type": "github" }, "original": { diff --git a/modules/file-management/lf/default.nix b/modules/file-management/lf/default.nix index cd9ca5c..15d34ae 100644 --- a/modules/file-management/lf/default.nix +++ b/modules/file-management/lf/default.nix @@ -34,10 +34,6 @@ "inode/directory" = "lf.desktop"; }; - home.packages = with pkgs; [ - busybox - ]; - programs.lf = { enable = true; package = config.file-management.lf.package; @@ -48,7 +44,7 @@ hidden = true; preview = true; - shell = "sh"; + shell = config.home.sessionVariables.SHELL; ifs = "\n"; scrolloff = "4"; period = "1"; @@ -65,9 +61,7 @@ source = lib.getExe config.scripts.file-preview.package; }; - extraConfig = '' - ${builtins.readFile ./lfrc} - ''; + extraConfig = builtins.readFile ./lfrc; }; home.file.".config/lf/icons".source = ./icons; diff --git a/modules/scripts/default.nix b/modules/scripts/default.nix index abecc38..fd610d0 100644 --- a/modules/scripts/default.nix +++ b/modules/scripts/default.nix @@ -20,27 +20,25 @@ ]; config = { - home.packages = [ - pkgs.file - config.terminal.bat.package - ] - ++ lib.filter (x: x != null) (lib.mapAttrsToList (_: s: s.package) config.scripts) - ++ lib.filter (x: x != null) ( - lib.mapAttrsToList ( - name: sc: - if sc.enable && sc.desktop.enable then - pkgs.makeDesktopItem { - name = name; - desktopName = sc.desktop.displayName; - exec = "${lib.getExe config.terminal.kitty.package} -e ${lib.getExe sc.package}"; - icon = "kitty"; - categories = [ "Utility" ]; - terminal = false; - type = "Application"; - } - else - null - ) config.scripts - ); + home.packages = + [ ] + ++ lib.filter (x: x != null) (lib.mapAttrsToList (_: s: s.package) config.scripts) + ++ lib.filter (x: x != null) ( + lib.mapAttrsToList ( + name: sc: + if sc.enable && sc.desktop.enable then + pkgs.makeDesktopItem { + name = name; + desktopName = sc.desktop.displayName; + exec = "${lib.getExe config.terminal.kitty.package} -e ${lib.getExe sc.package}"; + icon = "kitty"; + categories = [ "Utility" ]; + terminal = false; + type = "Application"; + } + else + null + ) config.scripts + ); }; } diff --git a/modules/security/ssh/default.nix b/modules/security/ssh/default.nix index ff684b4..4b4180f 100644 --- a/modules/security/ssh/default.nix +++ b/modules/security/ssh/default.nix @@ -26,5 +26,7 @@ HashKnownHosts = "yes"; }; }; + + services.ssh-agent.enable = lib.mkIf config.security.gpg.enable false; }; } |