From 905ea34de940ec63999572db3ded2219bde8d8cc Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 18 Sep 2023 02:10:44 +0200 Subject: [PATCH] feat: enable zoxide, nix-index-database, comma and a deadnix check --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 8 ++++++++ modules/config/home-manager.nix | 7 ++++++- modules/optional/dev/default.nix | 2 +- modules/optional/graphical/default.nix | 6 +----- nix/generate-node.nix | 2 +- users/modules/config/impermanence.nix | 1 - users/modules/config/shell/default.nix | 11 +++++++++++ users/myuser/graphical/default.nix | 5 ----- users/myuser/graphical/thunderbird.nix | 2 +- 10 files changed, 50 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 61f5016..6e8ab67 100644 --- a/flake.lock +++ b/flake.lock @@ -542,6 +542,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1694921880, + "narHash": "sha256-yU36cs5UdzhTwsM9bUWUz43N//ELzQ1ro69C07pU/8E=", + "owner": "Mic92", + "repo": "nix-index-database", + "rev": "9d2bcc47110b3b6217dfebd6761ba20bc78aedf2", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-index-database", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1693701915, @@ -806,6 +826,7 @@ "impermanence": "impermanence", "lib-net": "lib-net", "microvm": "microvm", + "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixos-nftables-firewall": "nixos-nftables-firewall", diff --git a/flake.nix b/flake.nix index d6e43cd..7e597b7 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,11 @@ flake = false; }; + nix-index-database = { + url = "github:Mic92/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-generators = { @@ -188,8 +193,11 @@ checks.pre-commit-hooks = pre-commit-hooks.lib.${system}.run { src = lib.cleanSource ./.; hooks = { + # Nix alejandra.enable = true; + deadnix.enable = true; statix.enable = true; + # Lua (for neovim) luacheck.enable = true; stylua.enable = true; }; diff --git a/modules/config/home-manager.nix b/modules/config/home-manager.nix index 566e2ae..a7d6fcd 100644 --- a/modules/config/home-manager.nix +++ b/modules/config/home-manager.nix @@ -1,9 +1,14 @@ -{config, ...}: { +{ + inputs, + config, + ... +}: { home-manager = { useGlobalPkgs = true; useUserPackages = true; verbose = true; sharedModules = [ + inputs.nix-index-database.hmModules.nix-index { home.stateVersion = config.system.stateVersion; } diff --git a/modules/optional/dev/default.nix b/modules/optional/dev/default.nix index 819dc7e..527ab55 100644 --- a/modules/optional/dev/default.nix +++ b/modules/optional/dev/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { imports = [ ./documentation.nix ./yubikey.nix diff --git a/modules/optional/graphical/default.nix b/modules/optional/graphical/default.nix index 8fe5d42..da2eafc 100644 --- a/modules/optional/graphical/default.nix +++ b/modules/optional/graphical/default.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: let +{lib, ...}: let inherit (lib) mkOption diff --git a/nix/generate-node.nix b/nix/generate-node.nix index ffba54e..b92d213 100644 --- a/nix/generate-node.nix +++ b/nix/generate-node.nix @@ -29,8 +29,8 @@ modules ++ [ {node.name = name;} - agenix.nixosModules.default agenix-rekey.nixosModules.default + agenix.nixosModules.default disko.nixosModules.disko elewrap.nixosModules.default home-manager.nixosModules.default diff --git a/users/modules/config/impermanence.nix b/users/modules/config/impermanence.nix index 27ca1f3..47c2fcb 100644 --- a/users/modules/config/impermanence.nix +++ b/users/modules/config/impermanence.nix @@ -14,7 +14,6 @@ in { [ ".cache/fontconfig" ".cache/nix" # nix eval cache - ".cache/nix-index" ".config/dconf" # some apps store their configuration using dconf ] ++ optionals nixosConfig.hardware.nvidia.modesetting.enable [ diff --git a/users/modules/config/shell/default.nix b/users/modules/config/shell/default.nix index eb5b9a6..07beac5 100644 --- a/users/modules/config/shell/default.nix +++ b/users/modules/config/shell/default.nix @@ -5,7 +5,18 @@ ./zsh ]; + programs.zoxide = { + enable = true; + options = ["--cmd p"]; + }; + + # nix-index-database is enabled globally for each user in modules/config/home-manager.nix programs.nix-index.enable = true; + programs.nix-index-database.comma.enable = true; + + home.persistence."/state".directories = [ + ".local/share/zoxide" + ]; home.shellAliases = { l = "ls -lahF --group-directories-first --show-control-chars --quoting-style=escape --color=auto"; diff --git a/users/myuser/graphical/default.nix b/users/myuser/graphical/default.nix index a9dd6f5..60f4248 100644 --- a/users/myuser/graphical/default.nix +++ b/users/myuser/graphical/default.nix @@ -59,11 +59,6 @@ # TODO gpg switch to sk # TODO some font icons not showing neovim because removed from nerdfonts, replace with bertter . - shellAliases = { - p = "cd ~/projects"; - zf = "zathura --fork"; # XXX: do i need this or can i just xdg-open? - }; - persistence."/persist".directories = [ "projects" ]; diff --git a/users/myuser/graphical/thunderbird.nix b/users/myuser/graphical/thunderbird.nix index 0b23dec..0e5d5ba 100644 --- a/users/myuser/graphical/thunderbird.nix +++ b/users/myuser/graphical/thunderbird.nix @@ -12,7 +12,7 @@ in { accounts.email.accounts = lib.flip lib.mapAttrs' config.userSecrets.accounts.email - (n: v: + (_n: v: lib.nameValuePair v.address ({ # TODO genericize passwordCommand =