Update nix (and fix issues that come with that)
diff --git a/flake.lock b/flake.lock
index 9b66aa1..807ba47 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1666766063,
- "narHash": "sha256-5xc/eoUZSUbEt+PKQgICpiSY4L2BCfttjQhjNTa+EPk=",
+ "lastModified": 1667543495,
+ "narHash": "sha256-UoIlfoJwWaN0nOGxjo2bJ+cpfUToNW8nC+BZrR3Yuhk=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "0748dc3f419917e3548419e91839ee062e1a88fb",
+ "rev": "6369e55b8ba49b896da496c06013d7cb0d1395c6",
"type": "github"
},
"original": {
@@ -23,11 +23,11 @@
},
"flake-utils": {
"locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+ "lastModified": 1667395993,
+ "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+ "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@@ -107,36 +107,15 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1665996265,
- "narHash": "sha256-/k9og6LDBQwT+f/tJ5ClcWiUl8kCX5m6ognhsAxOiCY=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "b81e128fc053ab3159d7b464d9b7dedc9d6a6891",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "release-22.05",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "home-manager-unstable": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
],
"utils": "utils"
},
"locked": {
- "lastModified": 1666649150,
- "narHash": "sha256-kINnLxC0KFalUk4tVO/H5hUU7FVAOYYcUSWrsBpnl+I=",
+ "lastModified": 1667468181,
+ "narHash": "sha256-806/nrDW6e7bl4/oJEdAykYz/NaBuTUi7EUYArw2oic=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "7dc4e4ebd71280842b4d30975439980baaac9db8",
+ "rev": "93335810751f0404fe424e61ad58bc8e94bf8e9d",
"type": "github"
},
"original": {
@@ -168,11 +147,11 @@
},
"locked": {
"dir": "nix",
- "lastModified": 1664950533,
- "narHash": "sha256-TooqJDgGNyyhpIGB8U28Y3poYUFW4jeH9h59D7cKSls=",
+ "lastModified": 1666935187,
+ "narHash": "sha256-/7uLVQHQm+d1Qyl9VGfDN3toBp5LvRx+qLLKxNj2ak4=",
"owner": "kmonad",
"repo": "kmonad",
- "rev": "af8c2253754882b5b50c824ce9906d35f9b95657",
+ "rev": "820af08d1ef1bff417829415d5f673041b67ef4d",
"type": "github"
},
"original": {
@@ -184,11 +163,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1667085676,
- "narHash": "sha256-jPHYYoSdrV3ypWG4oi9SUeI2MU6dLjxM88+9io5Rrx0=",
+ "lastModified": 1667379994,
+ "narHash": "sha256-PFOg8WHqfKXsIGZtEC0aB+rl8SB1cXvA01ytIudnRh8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e6e6bad81b7e11f37d893ef39712ce8918ae2338",
+ "rev": "a704b9029586266f63807f64a6718f1a65b0f83b",
"type": "github"
},
"original": {
@@ -200,11 +179,11 @@
},
"nixpkgs-22_05": {
"locked": {
- "lastModified": 1666488099,
- "narHash": "sha256-DANs2epN5QgvxWzH7xF3dzb4WE0lEuMLrMEu/vPmQxw=",
+ "lastModified": 1667091951,
+ "narHash": "sha256-62sz0fn06Nq8OaeBYrYSR3Y6hUcp8/PC4dJ7HeGaOhU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f9115594149ebcb409a42e303bec4956814a8419",
+ "rev": "6440d13df2327d2db13d3b17e419784020b71d22",
"type": "github"
},
"original": {
@@ -231,11 +210,11 @@
},
"nixpkgs-staging-next": {
"locked": {
- "lastModified": 1667317463,
- "narHash": "sha256-9MtO36H+F7XpYCKbqF51VPEdg8kSe1f28ekrfcm9YT0=",
+ "lastModified": 1667541677,
+ "narHash": "sha256-xCXGxJVfzxIK5DvErJj+sZIhgyymbnfYbvorIeKaQvc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "eeca5969b3f42ac943639aaec503816f053e5e53",
+ "rev": "6a18c15838f3421f307a789c01aae0cab6dc1071",
"type": "github"
},
"original": {
@@ -317,7 +296,6 @@
"fzf-tab": "fzf-tab",
"gtimelog": "gtimelog",
"home-manager": "home-manager",
- "home-manager-unstable": "home-manager-unstable",
"impermanence": "impermanence",
"kmonad": "kmonad",
"nixpkgs": "nixpkgs",
@@ -333,11 +311,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1666620525,
- "narHash": "sha256-XL/8MDKydIni4ObTvuXBOVT+i87TLlutFPxYcd0Cy8I=",
+ "lastModified": 1667483916,
+ "narHash": "sha256-CppzXdlxWllq6QxWbWnSH+NixVQ7UaN5jogRcKka0/g=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "53b6d69e931a52cca44ef94c3b713b4d255754b8",
+ "rev": "bbcb77ea6fc08df598b20267afd6a44018b21f5b",
"type": "github"
},
"original": {
@@ -355,11 +333,11 @@
"nixpkgs-22_05": "nixpkgs-22_05"
},
"locked": {
- "lastModified": 1666499473,
- "narHash": "sha256-q1eFnBFL0kHgcnUPeKagw3BfbE/5sMJNGL2E2AR+a2M=",
+ "lastModified": 1667427533,
+ "narHash": "sha256-MsgTnQEi1g7f8anlW5klHW2pJgam4CLbJaYyBw2ed58=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "1b5f9512a265f0c9687dbff47893180f777f4809",
+ "rev": "486b4455da16272c1ed31bc82adcdbe7af829465",
"type": "github"
},
"original": {
@@ -370,11 +348,11 @@
},
"utils": {
"locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+ "lastModified": 1667395993,
+ "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+ "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index e5aa8d1..e8e545a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,8 +11,7 @@
url = "github:nixos/flake-registry";
flake = false;
};
- home-manager.url = "github:nix-community/home-manager/release-22.05";
- home-manager-unstable.url = "github:nix-community/home-manager";
+ home-manager.url = "github:nix-community/home-manager";
sops-nix.url = "github:Mic92/sops-nix";
impermanence.url = "github:nix-community/impermanence";
gtimelog = {
@@ -37,7 +36,6 @@
fenix.inputs.nixpkgs.follows = "nixpkgs";
flake-utils-plus.inputs.flake-utils.follows = "flake-utils";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
};
diff --git a/modules/email.nix b/modules/email.nix
index bb052f6..7f5cbc2 100644
--- a/modules/email.nix
+++ b/modules/email.nix
@@ -1,13 +1,11 @@
{ pkgs
, config
, username
-, home-manager-unstable
, home
, lib
, ...
}: {
home = {
- imports = [ "${home-manager-unstable}/modules/programs/aerc.nix" ];
accounts.email = {
maildirBasePath = "Mail";
accounts = {
diff --git a/modules/neovim/tree-sitter/default.nix b/modules/neovim/tree-sitter/default.nix
index caf1995..d7d7f2e 100644
--- a/modules/neovim/tree-sitter/default.nix
+++ b/modules/neovim/tree-sitter/default.nix
@@ -6,7 +6,7 @@
}:
let
disabledGrammars = [
- "tree-sitter-sql"
+ "sql"
];
in
{
@@ -14,7 +14,12 @@
plugins = with pkgs.vimPlugins; [
(nvim-treesitter.withPlugins (plugins:
(lib.pipe plugins [
- (lib.filterAttrs (name: value: !builtins.elem name disabledGrammars))
+ (lib.filterAttrs (name: value: builtins.substring 0 12 name == "tree-sitter-"))
+ (lib.filterAttrs (name: value: !builtins.elem
+ (builtins.substring 12 (builtins.stringLength name) name)
+ disabledGrammars
+ ))
+ lib.traceVal
builtins.attrValues
])
++ (with pkgs.vimPlugins; [
diff --git a/modules/openssl-fix.nix b/modules/openssl-fix.nix
deleted file mode 100644
index 149fdd8..0000000
--- a/modules/openssl-fix.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{pkgs, nixpkgs-staging-next, ...}: {
- config.system.replaceRuntimeDependencies = [
- ({
- original = pkgs.openssl;
- replacement = nixpkgs-staging-next.legacyPackages.x86_64-linux.openssl_3;
- })
- ];
- home.home.packages = [pkgs.openssl];
-}
diff --git a/modules/zsh.nix b/modules/zsh.nix
index fffc039..9746abc 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -32,6 +32,7 @@
bindkey "\'\'$\{key[Up]}" up-line-or-search
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=243';
+ typeset -gA ZSH_HIGHLIGHT_STYLES
ZSH_HIGHLIGHT_STYLES[comment]='fg=248';