fix some issues and update flake.lock

16 files changed, 46 insertions, 54 deletions

diff --git a/flake.lock b/flake.lock
index 251be29..09b51fb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -81,11 +81,11 @@
     "flake-compat_4": {
       "flake": false,
       "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1669825171,
-        "narHash": "sha256-HxlZHSiRGXnWAFbIJMeujqBe2KgACYx5XDRY0EA9P+4=",
+        "lastModified": 1676367705,
+        "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "478610aa37c8339eacabfa03f07dacf5574edd47",
+        "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5",
         "type": "github"
       },
       "original": {
@@ -197,11 +197,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1674603127,
-        "narHash": "sha256-hlFog8zO2aktIBBgdBddScu95S+8waubHLQAbxEmp2g=",
+        "lastModified": 1676047505,
+        "narHash": "sha256-VN4Qe2Lyu0106QIc+RX8BuzrqpzHb0UzzDVsnNb++s4=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "a9bce1464581098f35f09df555f9920e573324e5",
+        "rev": "a75e2b4c952766adfd41787f09087ad6980c154d",
         "type": "github"
       },
       "original": {
@@ -212,17 +212,17 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1674550793,
-        "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
-        "ref": "refs/heads/master",
-        "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
-        "revCount": 1132,
-        "type": "git",
-        "url": "https://github.com/nixos/nixos-hardware"
+        "lastModified": 1676699914,
+        "narHash": "sha256-cM2Hd+odgCYWSUiYPZGW/4B+OI64S0lrdf9YR9ts9I4=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "9bbcc37b011b0d925f3115888ea77f58487619b8",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "https://github.com/nixos/nixos-hardware"
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "type": "github"
       }
     },
     "nixos-wsl": {
@@ -232,18 +232,18 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1667989099,
-        "narHash": "sha256-mVvXK09YCTkl79J442/4GDeDACB3QiwBvooxOURh3/Y=",
-        "ref": "main",
-        "rev": "a4bbcf329a98a7faf79d10370278f87e836e1d7c",
-        "revCount": 117,
-        "type": "git",
-        "url": "https://github.com/nix-community/NixOS-WSL"
+        "lastModified": 1676381420,
+        "narHash": "sha256-aDRnfGrk/xi7zkuterN78p8/wdM5Iy6vz74uqd/JFWw=",
+        "owner": "nix-community",
+        "repo": "NixOS-WSL",
+        "rev": "4640199aeafcbb63cfbe8318bdf06f4402134f66",
+        "type": "github"
       },
       "original": {
+        "owner": "nix-community",
         "ref": "main",
-        "type": "git",
-        "url": "https://github.com/nix-community/NixOS-WSL"
+        "repo": "NixOS-WSL",
+        "type": "github"
       }
     },
     "nixpkgs": {
@@ -314,11 +314,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1674459583,
-        "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=",
+        "lastModified": 1676569297,
+        "narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f",
+        "rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37",
         "type": "github"
       },
       "original": {
@@ -329,26 +329,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1667653703,
-        "narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=",
+        "lastModified": 1675918889,
+        "narHash": "sha256-hy7re4F9AEQqwZxubct7jBRos6md26bmxnCjxf5utJA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f09ad462c5a121d0239fde645aacb2221553a217",
+        "rev": "49efda9011e8cdcd6c1aad30384cb1dc230c82fe",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-22.05",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1674407282,
-        "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=",
+        "lastModified": 1676546582,
+        "narHash": "sha256-MJ+PXNmUyxnMTFoss7G2lEcUY2cfYZM6RudBAL5aX1k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49",
+        "rev": "2fb7d749c084890192b2cd08ba264e5e4a14df1b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 45ac82f..559765b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
 	inputs = {
 		nixpkgs.url = "nixpkgs/nixos-22.11";
 		nixpkgsUnstable.url = "nixpkgs/nixos-unstable";
-		nixos-wsl.url = "git+https://github.com/nix-community/NixOS-WSL?ref=main";
+		nixos-wsl.url = "github:nix-community/NixOS-WSL?ref=main";
 		home-manager.url = "github:nix-community/home-manager";
 		home-manager.inputs.nixpkgs.follows = "nixpkgs";
-		nixos-hardware.url = "git+https://github.com/nixos/nixos-hardware";
+		nixos-hardware.url = "github:NixOS/nixos-hardware";
 		lanzaboote.url = "github:nix-community/lanzaboote";
 	};
 
diff --git a/hosts/common/systemd.nix b/hosts/common/systemd.nix
index e28ff95..9ee7baf 100644
--- a/hosts/common/systemd.nix
+++ b/hosts/common/systemd.nix
@@ -1,10 +1,10 @@
-_: {
+{wsl, ...}: {
 	services = {
 		journald.extraConfig = ''
 			MaxRetentionSec=1w
 		'';
 		resolved = {
-			enable = true;
+			enable = !wsl;
 			dnssec = "allow-downgrade";
 			extraConfig = ''
 				[Resolve]
diff --git a/users/seth/programs/neovim/lua/getchoo/ftdetect.lua b/users/seth/programs/neovim/config/lua/getchoo/ftdetect.lua
index c13bdb6..c13bdb6 100644
--- a/users/seth/programs/neovim/lua/getchoo/ftdetect.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/ftdetect.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/init.lua b/users/seth/programs/neovim/config/lua/getchoo/init.lua
index d73b5ae..89edf11 100644
--- a/users/seth/programs/neovim/lua/getchoo/init.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/init.lua
@@ -13,6 +13,7 @@ M.bufferline = {
 }
 
 M.catppuccin = {
+	compiler_path = vim.fn.expand('$XDG_CACHE_HOME/nvim/compile'),
 	flavour = "mocha", -- mocha, macchiato, frappe, latte
 	integrations = {
 		barbar = true,
diff --git a/users/seth/programs/neovim/lua/getchoo/keymap.lua b/users/seth/programs/neovim/config/lua/getchoo/keymap.lua
index 9a4484c..9a4484c 100644
--- a/users/seth/programs/neovim/lua/getchoo/keymap.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/keymap.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/lsp/config/cmp.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/cmp.lua
index cef2ad1..cef2ad1 100644
--- a/users/seth/programs/neovim/lua/getchoo/lsp/config/cmp.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/cmp.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/lsp/config/init.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/init.lua
index f2634d5..f2634d5 100644
--- a/users/seth/programs/neovim/lua/getchoo/lsp/config/init.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/init.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/lsp/config/lsp_config.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/lsp_config.lua
index 9874820..9874820 100644
--- a/users/seth/programs/neovim/lua/getchoo/lsp/config/lsp_config.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/lsp_config.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/lsp/config/null_ls.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/null_ls.lua
index 16b1b3c..16b1b3c 100644
--- a/users/seth/programs/neovim/lua/getchoo/lsp/config/null_ls.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/null_ls.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/lsp/config/sources.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/sources.lua
index bed6361..bed6361 100644
--- a/users/seth/programs/neovim/lua/getchoo/lsp/config/sources.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/sources.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/lsp/init.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/init.lua
index f354b2a..f354b2a 100644
--- a/users/seth/programs/neovim/lua/getchoo/lsp/init.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/init.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/lsp/keymap.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/keymap.lua
index 9f34ffa..9f34ffa 100644
--- a/users/seth/programs/neovim/lua/getchoo/lsp/keymap.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/keymap.lua
diff --git a/users/seth/programs/neovim/lua/getchoo/lsp/server.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/server.lua
index f238eb5..f238eb5 100644
--- a/users/seth/programs/neovim/lua/getchoo/lsp/server.lua
+++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/server.lua
diff --git a/users/seth/programs/neovim/default.nix b/users/seth/programs/neovim/default.nix
index 0f814be..52af672 100644
--- a/users/seth/programs/neovim/default.nix
+++ b/users/seth/programs/neovim/default.nix
@@ -45,7 +45,7 @@
 	};
 
 	xdg.configFile.nvim = {
-		source = ./lua;
+		source = ./config;
 		recursive = true;
 	};
 	xdg.configFile."nvim/init.lua" = {
diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix
index 6c08684..a5f9480 100644
--- a/users/seth/shell/fish.nix
+++ b/users/seth/shell/fish.nix
@@ -16,16 +16,6 @@
 					sha256 = "sha256-aij48yQHeAKCoAD43rGhqW8X/qmEGGkg8B4jSeqjVU0=";
 				};
 			}
-
-			{
-				name = "catppuccin-fish";
-				src = pkgs.fetchFromGitHub {
-					owner = "catppuccin";
-					repo = "fish";
-					rev = "8d0b07ad927f976708a1f875eb9aacaf67876137";
-					sha256 = "sha256-/JIKRRHjaO2jC0NNPBiSaLe8pR2ASv24/LFKOJoZPjk=";
-				};
-			}
 		];
 	};
 }