44 files changed, 147 insertions, 122 deletions

diff --git a/flake.nix b/flake.nix
index 3838adc..3c5931c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,17 +7,16 @@
 	};
 
 	outputs = { self, nixpkgs, nixos-wsl, home-manager, ... }: {
-		nixosConfigurations.glados = nixpkgs.lib.nixosSystem {
+		nixosConfigurations.glados-wsl = nixpkgs.lib.nixosSystem {
 			system = "x86_64-linux";
 			modules = [
-				./configuration.nix
-				./hosts/glados
 				home-manager.nixosModules.home-manager
 				{
-					home-manager.useGlobalPkgs = true;
-					home-manager.useUserPackages = true;
-					home-manager.users.seth = import ./seth;
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
 				}
+
+				./hosts/glados-wsl
 				
 				nixos-wsl.nixosModules.wsl
 				({ config, lib, pkgs, ... }: {
diff --git a/hosts/glados/default.nix b/hosts/common/default.nix
index 8f9a315..32dad83 100644
--- a/hosts/glados/default.nix
+++ b/hosts/common/default.nix
@@ -1,7 +1,5 @@
 {
 	imports = [
-		./config.nix
-		./packages.nix
 		./security.nix
 		./users.nix
 	];
diff --git a/hosts/glados/security.nix b/hosts/common/security.nix
index debd6b7..debd6b7 100644
--- a/hosts/glados/security.nix
+++ b/hosts/common/security.nix
diff --git a/hosts/glados/users.nix b/hosts/common/users.nix
index e0b04c5..1dd219e 100644
--- a/hosts/glados/users.nix
+++ b/hosts/common/users.nix
@@ -15,13 +15,4 @@ with config; with lib; with pkgs;
 				initialHashedPassword = mkDefault "!";
 			};
 
-			seth = {
-				extraGroups = [ "wheel" ];
-				isNormalUser = true;
-				hashedPassword = "idontknowhowtosecurethis";
-				shell = fish;
-			};
-
-		};
-	};
 }
diff --git a/hosts/glados/config.nix b/hosts/glados-wsl/config.nix
index 819a4f4..7a649af 100644
--- a/hosts/glados/config.nix
+++ b/hosts/glados-wsl/config.nix
@@ -9,7 +9,7 @@
 	#   opengl.enable = true;
 	# };
 
-	networking.hostName = "glados";
+	networking.hostName = "glados-wsl";
 
 	programs = {
 		gnupg = {
diff --git a/configuration.nix b/hosts/glados-wsl/default.nix
index 4e5635e..2846100 100644
--- a/configuration.nix
+++ b/hosts/glados-wsl/default.nix
@@ -1,8 +1,11 @@
-{ pkgs, config, modulesPath, ... }:
+{ config, modulesPath, pkgs, ...}:
 
 {
 	imports = [
-		"${modulesPath}/profiles/minimal.nix"
+		(modulesPath + "/profiles/minimal.nix")
+		./config.nix
+		./packages.nix
+		../../users/seth
 	];
 
 	# enable non-free packages
diff --git a/hosts/glados/packages.nix b/hosts/glados-wsl/packages.nix
index 63de591..bfca6df 100644
--- a/hosts/glados/packages.nix
+++ b/hosts/glados-wsl/packages.nix
@@ -2,6 +2,7 @@
 
 {
 	environment.systemPackages = with pkgs; [
+		git
 		neofetch
 		nixos-option
 		python310
diff --git a/seth/default.nix b/seth/default.nix
deleted file mode 100644
index 4a383ed..0000000
--- a/seth/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ home-manager, ... }:
-
-{
-	programs.home-manager.enable = true;
-
-	home = {
-		username = "seth";
-		homeDirectory = "/home/seth";
-		stateVersion = "22.11";
-	};
-
-	imports = [
-		./config.nix
-		./options.nix
-		./xdg.nix
-		./programs
-		./shell	      
-	];
-
-}
diff --git a/seth/programs/default.nix b/seth/programs/default.nix
deleted file mode 100644
index 2606b8c..0000000
--- a/seth/programs/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	imports = [
-		./git.nix
-		# ./mangohud.nix
-		./neovim.nix
-		# ./npm.nix
-		./starship.nix
-		./vim.nix
-	];
-}
diff --git a/seth/programs/nvim/init.lua b/seth/programs/nvim/init.lua
deleted file mode 100644
index e0fd064..0000000
--- a/seth/programs/nvim/init.lua
+++ /dev/null
@@ -1,22 +0,0 @@
---
--- getchoo's neovim config (but in lua :p)
---
-
-local cmd = vim.cmd
-local opt = vim.opt
-
-require("getchoo")
-require("getchoo.ftdetect")
--- require("getchoo.lsp")
-
--- text options
-opt.tabstop = 2
-opt.shiftwidth = 2
-opt.expandtab = false
-opt.smartindent = true
-opt.wrap = false
-
--- appearance
-opt.syntax = "on"
-cmd("filetype plugin indent on")
-opt.termguicolors = true
diff --git a/seth/programs/vim.nix b/seth/programs/vim.nix
deleted file mode 100644
index 35de9c5..0000000
--- a/seth/programs/vim.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, nix, ...}:
-
-{
-	programs.vim = {
-		enable = true;
-		extraConfig = ''
-			set runtimepath^=$XDG_CONFIG_HOME/vim
-			set runtimepath+=$XDG_DATA_HOME/vim
-			set runtimepath+=$XDG_CONFIG_HOME/vim/after
-			
-			set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
-			set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
-			
-			let g:netrw_home = $XDG_DATA_HOME."/vim"
-			call mkdir($XDG_DATA_HOME."/vim/spell", 'p')
-			
-			set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p')
-			set directory=$XDG_STATE_HOME/vim/swap   | call mkdir(&directory, 'p')
-			set undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')
-			set viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')
-			set viminfofile=$XDG_STATE_HOME/vim/viminfo
-		'';
-		settings = {
-			expandtab = false;
-			shiftwidth = 2;
-			tabstop = 2;
-		};
-	};
-}
diff --git a/seth/config.nix b/users/seth/config.nix
index 6c2335d..233c8da 100644
--- a/seth/config.nix
+++ b/users/seth/config.nix
@@ -1,6 +1,12 @@
 { config, ... }:
 
 {
+	imports = [
+		./options.nix
+		./programs
+		./shell	      
+	];
+
 	options.seth = {
 		devel-packages = false;
 		gui-stuff = false;
diff --git a/users/seth/default.nix b/users/seth/default.nix
new file mode 100644
index 0000000..ef6cba4
--- /dev/null
+++ b/users/seth/default.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, modulesPath, ...}:
+
+{
+	imports = [
+		"${modulesPath}/profiles/minimal.nix"
+	];
+
+	users.users.seth = {
+		extraGroups = [ "wheel" ];
+		isNormalUser = true;
+		hashedPassword = "***REMOVED***";
+		shell = pkgs.bash;
+	};
+
+	home-manager.users.seth = {
+		imports = [
+			./config.nix
+		];
+
+		home.stateVersion = config.system.stateVersion;
+	};
+}
diff --git a/seth/options.nix b/users/seth/options.nix
index 479df1b..479df1b 100644
--- a/seth/options.nix
+++ b/users/seth/options.nix
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
new file mode 100644
index 0000000..b97a73a
--- /dev/null
+++ b/users/seth/programs/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+	imports = [
+		./git.nix
+		# ./mangohud
+		./neovim
+		# ./npm.nix
+		./starship.nix
+		./vim.nix
+		./xdg.nix
+	];
+
+	home.packages = with pkgs; [
+		bat
+		clang
+		exa
+		fd
+		lld
+		ripgrep	
+		python311
+	];
+}
diff --git a/seth/programs/git.nix b/users/seth/programs/git.nix
index 6164432..6164432 100644
--- a/seth/programs/git.nix
+++ b/users/seth/programs/git.nix
diff --git a/seth/programs/MangoHud/MangoHud.conf b/users/seth/programs/mangohud/MangoHud/MangoHud.conf
index 8e02a99..8e02a99 100644
--- a/seth/programs/MangoHud/MangoHud.conf
+++ b/users/seth/programs/mangohud/MangoHud/MangoHud.conf
diff --git a/seth/programs/mangohud.nix b/users/seth/programs/mangohud/default.nix
index 700647e..700647e 100644
--- a/seth/programs/mangohud.nix
+++ b/users/seth/programs/mangohud/default.nix
diff --git a/seth/programs/neovim.nix b/users/seth/programs/neovim/default.nix
index 0aa6799..94e30cb 100644
--- a/seth/programs/neovim.nix
+++ b/users/seth/programs/neovim/default.nix
@@ -15,6 +15,7 @@
 			rust-analyzer
 			rustfmt
 			stylua
+			sumneko-lua-language-server
 		];
 		plugins = with pkgs.vimPlugins; [
 			lualine-nvim
@@ -25,7 +26,7 @@
 			nvim-lspconfig
 			null-ls-nvim
 			plenary-nvim
-			nvim-treesitter
+			(nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))
 			nvim-cmp
 			cmp-nvim-lsp
 			cmp-buffer
@@ -43,7 +44,7 @@
 	};
 
 	xdg.configFile."nvim" = {
-		source = ./nvim;
+		source = ./lua;
 		recursive = true;
 	};
 }
diff --git a/users/seth/programs/neovim/lua/init.lua b/users/seth/programs/neovim/lua/init.lua
new file mode 100644
index 0000000..262f556
--- /dev/null
+++ b/users/seth/programs/neovim/lua/init.lua
@@ -0,0 +1,39 @@
+--
+-- getchoo's neovim config (but in lua :p)
+--
+
+local cmd = vim.cmd
+local opt = vim.opt
+
+require("getchoo")
+require("getchoo.ftdetect")
+require("getchoo.lsp")
+
+-- text options
+opt.tabstop = 2
+opt.shiftwidth = 2
+opt.expandtab = false
+opt.smartindent = true
+opt.wrap = false
+
+-- appearance
+opt.syntax = "on"
+cmd("filetype plugin indent on")
+opt.termguicolors = true
+
+require("catppuccin").setup({
+	flavour = "mocha", -- mocha, macchiato, frappe, latte
+	integrations = {
+		barbar = true,
+		gitsigns = true,
+		lightspeed = true,
+		mason = true,
+		cmp = true,
+		nvimtree = true,
+		treesitter_context = true,
+		treesitter = true,
+		telescope = true,
+		lsp_trouble = true,
+	},
+})
+vim.api.nvim_command("colorscheme catppuccin")
diff --git a/seth/programs/nvim/lua/getchoo/config.lua b/users/seth/programs/neovim/lua/lua/getchoo/config.lua
index a67f734..a67f734 100644
--- a/seth/programs/nvim/lua/getchoo/config.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/config.lua
diff --git a/seth/programs/nvim/lua/getchoo/ftdetect.lua b/users/seth/programs/neovim/lua/lua/getchoo/ftdetect.lua
index 5dd569d..5dd569d 100644
--- a/seth/programs/nvim/lua/getchoo/ftdetect.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/ftdetect.lua
diff --git a/seth/programs/nvim/lua/getchoo/init.lua b/users/seth/programs/neovim/lua/lua/getchoo/init.lua
index f44f622..f44f622 100644
--- a/seth/programs/nvim/lua/getchoo/init.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/init.lua
diff --git a/seth/programs/nvim/lua/getchoo/keymap.lua b/users/seth/programs/neovim/lua/lua/getchoo/keymap.lua
index 9a4484c..9a4484c 100644
--- a/seth/programs/nvim/lua/getchoo/keymap.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/keymap.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/cmp.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/cmp.lua
index 0f0f51f..0f0f51f 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/config/cmp.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/cmp.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/init.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/init.lua
index 1c928d3..1c928d3 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/config/init.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/init.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/lsp_config.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/lsp_config.lua
index 4df3fe0..4df3fe0 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/config/lsp_config.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/lsp_config.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/mason.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/mason.lua
index 6814697..6814697 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/config/mason.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/mason.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/null_ls.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/null_ls.lua
index 42cd30e..42cd30e 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/config/null_ls.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/null_ls.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/sources.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/sources.lua
index 1898870..1898870 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/config/sources.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/config/sources.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/init.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/init.lua
index aa3dde5..aa3dde5 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/init.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/init.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/keymap.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/keymap.lua
index 9f34ffa..9f34ffa 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/keymap.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/keymap.lua
diff --git a/seth/programs/nvim/lua/getchoo/lsp/server.lua b/users/seth/programs/neovim/lua/lua/getchoo/lsp/server.lua
index 325e1c7..325e1c7 100644
--- a/seth/programs/nvim/lua/getchoo/lsp/server.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/lsp/server.lua
diff --git a/seth/programs/nvim/lua/getchoo/plugins.lua b/users/seth/programs/neovim/lua/lua/getchoo/plugins.lua
index fe510d0..fe510d0 100644
--- a/seth/programs/nvim/lua/getchoo/plugins.lua
+++ b/users/seth/programs/neovim/lua/lua/getchoo/plugins.lua
diff --git a/seth/programs/npm.nix b/users/seth/programs/npm.nix
index 8f311f8..8f311f8 100644
--- a/seth/programs/npm.nix
+++ b/users/seth/programs/npm.nix
diff --git a/seth/programs/starship.nix b/users/seth/programs/starship.nix
index 03af3a7..03af3a7 100644
--- a/seth/programs/starship.nix
+++ b/users/seth/programs/starship.nix
diff --git a/users/seth/programs/vim.nix b/users/seth/programs/vim.nix
new file mode 100644
index 0000000..fc303a9
--- /dev/null
+++ b/users/seth/programs/vim.nix
@@ -0,0 +1,12 @@
+{ config, nix, ...}:
+
+{
+	programs.vim = {
+		enable = true;
+		settings = {
+			expandtab = false;
+			shiftwidth = 2;
+			tabstop = 2;
+		};
+	};
+}
diff --git a/seth/xdg.nix b/users/seth/programs/xdg.nix
index e791be4..e791be4 100644
--- a/seth/xdg.nix
+++ b/users/seth/programs/xdg.nix
diff --git a/seth/shell/bash.nix b/users/seth/shell/bash.nix
index fdfcd28..fdfcd28 100644
--- a/seth/shell/bash.nix
+++ b/users/seth/shell/bash.nix
diff --git a/seth/shell/default.nix b/users/seth/shell/default.nix
index 9d8455e..9406364 100644
--- a/seth/shell/default.nix
+++ b/users/seth/shell/default.nix
@@ -4,7 +4,7 @@
 	imports = [
 		./bash.nix
 		./fish.nix
-		./zsh.nix
+		./zsh
 	];
 
 	home.sessionVariables = {
diff --git a/seth/shell/fish.nix b/users/seth/shell/fish.nix
index a5a48a0..a5a48a0 100644
--- a/seth/shell/fish.nix
+++ b/users/seth/shell/fish.nix
diff --git a/seth/shell/zsh.nix b/users/seth/shell/zsh/default.nix
index 41a908c..d8e7bc6 100644
--- a/seth/shell/zsh.nix
+++ b/users/seth/shell/zsh/default.nix
@@ -3,17 +3,12 @@
 {
 	programs.zsh = {
 		enable = true;
-		dotDir = "${config.xdg.configHome}/zsh";
-		initExtra = ''
+    enableAutosuggestions = true;
+    enableSyntaxHighlighting = true;
+    enableVteIntegration = true;
+    completionInit = ''
+      autoload -Uz bashcompinit compinit
 			local zdump="${config.xdg.cacheHome}/zsh/zdump"
-			zmodload zsh/zutil
-			zmodload zsh/complist
-			zstyle ":completion::*" group-name ""
-			zstyle ":completion:*" menu "select"
-			zstyle ":completion:*" squeeze-slashes "true"
-			zstyle ":completion::*" use-cache "true"
-			zstyle ":completion::*" cache-path "$zdump"
-
 			bashcompinit
 			compinit -d "$zdump"
 			if [[ ! "$zdump.zwc" -nt "$zdump" ]]
@@ -21,13 +16,23 @@
 				zcompile "$zdump"
 			fi
 			unset zdump
+    '';
+    defaultKeymap = "emacs";
+		dotDir = ".config/zsh";
+		initExtra = ''
+			zmodload zsh/zutil
+			zmodload zsh/complist
+			zstyle ":completion::*" group-name ""
+			zstyle ":completion:*" menu "select"
+			zstyle ":completion:*" squeeze-slashes "true"
+			zstyle ":completion::*" use-cache "true"
+			zstyle ":completion::*" cache-path "$zdump"
 
 			unsetopt beep
 			unsetopt hist_beep
 			unsetopt ignore_braces
 			unsetopt list_beep
 			setopt always_to_end
-			setopt emacs
 			setopt inc_append_history
 			setopt prompt_subst
 			setopt share_history
@@ -71,20 +76,26 @@
 			}
 
 			{
-				name = "cattppuccin_theme-zsh-syntax-highlighting";
-				src = ./zsh-files;
-				file = "catppuccin_frappe-zsh-syntax-highlighting.zsh";
-			}
-
-			{
 				name = "zsh-syntax-highlighting";
 				src = pkgs.zsh-syntax-highlighting;
 				file = "share/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh";
 			}
 
 			{
+				name = "cattppuccin-zsh-syntax-highlighting";
+        src = pkgs.fetchFromGitHub {
+          owner = "catppuccin";
+          repo = "zsh-syntax-highlighting";
+          rev = "06d519c20798f0ebe275fc3a8101841faaeee8ea";
+          sha256 = "sha256-Q7KmwUd9fblprL55W0Sf4g7lRcemnhjh4/v+TacJSfo=";
+        };
+
+				file = "themes/catppuccin_mocha-zsh-syntax-highlighting.zsh";
+			}
+
+			{
 				name = "powerlevel10k-config";
-				src = ./zsh-files;
+				src = ./files;
 				file = ".p10k.zsh";
 			}
 		];
diff --git a/seth/shell/zsh-files/.p10k.zsh b/users/seth/shell/zsh/files/.p10k.zsh
index 0b829b5..0b829b5 100644
--- a/seth/shell/zsh-files/.p10k.zsh
+++ b/users/seth/shell/zsh/files/.p10k.zsh
diff --git a/seth/shell/zsh-files/catppuccin_frappe-zsh-syntax-highlighting.zsh b/users/seth/shell/zsh/files/catppuccin_frappe-zsh-syntax-highlighting.zsh
index 37284d0..37284d0 100644
--- a/seth/shell/zsh-files/catppuccin_frappe-zsh-syntax-highlighting.zsh
+++ b/users/seth/shell/zsh/files/catppuccin_frappe-zsh-syntax-highlighting.zsh