Redid setup. I swear the commit messages will get better

home/home.nix

@@ -1,21 +1,68 @@
-{ config, pkgs, username, ...}: {
+{ config, pkgs, username, inputs, ...}: {
+	imports = [
+		inputs.nixvim.homeModules.nixvim
+	];
+
+	#NOTE: MUST be kept up to date with nixpkgs!
+	home.stateVersion = "25.11";
+
 	home.username = username;
 	home.homeDirectory = "/home/${username}";
 
 	home.packages = with pkgs; [
 		mpv
+		bitwarden-desktop
 	];
 
-	programs.kitty = {
-		enable = true;
-	};
-
 	programs.wofi.enable = true;
 
 	wayland.windowManager.hyprland = {
 		enable = true;
-		settings = {
+		settings = import ./hyprland/settings.nix;
+	};
 
+	programs.nixvim = {
+		enable = true;
+
+		clipboard.register = "unnamedplus";
+		colorschemes.catppuccin = {
+			enable = true;
+			settings.flavour = "mocha";
+		};
+		plugins.lualine.enable = true;
+		plugins.telescope = {
+			enable = true;
+			extensions.file-browser = {
+				enable = true;
+				settings = {
+					git_status = true;
+					hijack_netrw = true;
+					respect_gitignore = true;
+					fzf-native.enable = true;
+					fzf-native.settings.case_mode = "ignore_case";
+				};
+			};
+		};
+		plugins.web-devicons.enable = true;
+		plugins.treesitter = {
+			enable = true;
+			folding = true;
+
+		};
+		lsp = {
+			inlayHints.enable = true;
+			#TODO: keymaps
+			servers = {
+				"*" = {
+                   			config.capabilities.textDocument.semanticTokens.multilineTokenSupport = true;
+                     			config.root_markers = [
+                       				".git"
+                     			];
+                   		};
+				clangd. enable = true;
+				rust-analzyer.enable = true;
+				rnix.enable = true;
+			};
 		};
 	};
 
@@ -27,11 +74,19 @@
 				exec hyprland
 			fi
 		'';
+
 		autocd = true;
 		enableCompletion = true;
 		autosuggestion.enable = true;
 		syntaxHighlighting.enable = true;
-
+		initContent = pkgs.lib.mkBefore ''
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
+  source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
+fi		
+		'';
 		plugins = [
 			{
 				name = "powerlevel10k";
@@ -54,13 +109,6 @@
 		};
 	};
 
-	programs.neovim = {
-		enable = true;
-		defaultEditor = true;
-		vimdiffAlias = true;
-		#TODO: nvim config. Maybe nixvim?
-	};
-
 	programs.fzf = {
 		enable = true;
 		enableZshIntegration = true;
@@ -81,6 +129,24 @@
 		#TODO: signing
 	};
 
-	#NOTE: MUST be kept up to date with nixpkgs!
-	home.stateVersion = "25.11";
+	services.hyprpaper = {
+		enable = true;
+		settings = 
+		let
+			# TODO: this should be done more cleanly
+			wallpaper_path = "/home/weckyy702/Pictures/wallpapers/horizontal_16x9.png";
+		in
+		{
+			preload = wallpaper_path;
+			wallpaper = [
+				#TODO: this should be dynamic
+				"DP-1,${wallpaper_path}"
+				"HDMI-A-1,${wallpaper_path}"
+			];
+		};
+	};
+
+	services.hyprpolkitagent.enable = true;
+
+	#TODO: hyprsunset?
 }