2026-01-28

home/home.nix

@@ -1,162 +1,175 @@
-{ config, pkgs, username, inputs, ...}: {
-	imports = [
-		inputs.nixvim.homeModules.nixvim
-		inputs.catppuccin.homeModules.catppuccin
-	];
+top @ {
+  config,
+  pkgs,
+  username,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.nixvim.homeModules.nixvim
+    inputs.catppuccin.homeModules.catppuccin
+    inputs.spicetify-nix.homeManagerModules.default
+    ./nixvim
+  ];
 
-	#NOTE: MUST be kept up to date with nixpkgs!
-	home.stateVersion = "25.11";
+  #NOTE: MUST be kept up to date with nixpkgs!
+  home.stateVersion = "25.11";
 
-	home.username = username;
-	home.homeDirectory = "/home/${username}";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
-	home.packages = with pkgs; [
-		mpv
-		bitwarden-desktop
-		feh
-		grim
-		slurp
-		xdg-user-dirs
-		libqalculate
-	];
+  home.packages = with pkgs; [
+    mpv
+    bitwarden-desktop
+    feh
+    grim
+    slurp
+    xdg-user-dirs
+    libqalculate
+    xfce.thunar
+    prismlauncher
+    playerctl
+  ];
 
-	programs.wofi.enable = true;
+  catppuccin.enable = true;
 
-	catppuccin.enable = true;
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    font.name = "JetBrainsMono";
+  };
 
-	wayland.windowManager.hyprland = {
-		enable = true;
-		settings = import ./hyprland/settings.nix;
-	};
+  wayland.windowManager.hyprland = {
+    enable = true;
+    settings = (import ./hyprland/settings.nix) top;
+  };
 
-	#TODO: decide on waybar
+  #TODO: decide on waybar
 
-	programs.nixvim = {
-		enable = true;
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+    nix-direnv.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;
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+    options = [
+      "--cmd cd"
+    ];
+  };
 
-		};
-		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;
-			};
-		};
-	};
+  programs.spicetify = let
+    spkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+  in {
+    enable = true;
+    enabledExtensions = with spkgs.extensions; [
+      fullAppDisplay
+      shuffle
+      aiBandBlocker
+    ];
+    enabledCustomApps = with spkgs.apps; [
+      newReleases
+    ];
+    theme = spkgs.themes.catppuccin;
+    colorScheme = "mocha";
+  };
 
-	programs.zsh = {
-		enable = true;
-		# For automatic login
-		profileExtra = ''
-			if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
-				exec hyprland > /var/log/hypr.log
-			fi
-		'';
+  programs.vesktop = {
+    enable = true;
+    vencord.useSystem = true;
+  };
 
-		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";
-				src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/";
-				file = "powerlevel10k.zsh-theme";
-			}
-			{
-				name = "p10k-config";
-				src = ./p10k;
-				file = "p10k.zsh";
-			}
-		];
+  programs.wofi.enable = true;
+  programs.zsh = {
+    enable = true;
+    # For automatic login
+    profileExtra = ''
+      if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
+      	exec hyprland
+      fi
+    '';
 
-		oh-my-zsh = {
-			enable = true;
-			plugins = [
-				"git"
-			];
-			theme = "robbyrussell";
-		};
-	};
+    autocd = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    initContent = pkgs.lib.mkBefore ''
+      		date
+      # 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";
+        src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/";
+        file = "powerlevel10k.zsh-theme";
+      }
+      {
+        name = "p10k-config";
+        src = ./p10k;
+        file = "p10k.zsh";
+      }
+    ];
 
-	programs.fzf = {
-		enable = true;
-		enableZshIntegration = true;
-	};
+    oh-my-zsh = {
+      enable = true;
+      plugins = [
+        "git"
+      ];
+      theme = "robbyrussell";
+    };
+  };
 
-	programs.kitty = {
-		enable = true;
-		enableGitIntegration = true;
-		#TODO: kitty config
-	};
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
 
-	programs.git = {
-		enable = true;
-		settings.user = {
-			email = "weckyy702@gmail.com";
-			name = "Weckyy702";
-		};
-		#TODO: signing
-	};
+  programs.kitty = {
+    enable = true;
+    enableGitIntegration = true;
+    font = {
+      name = "JetBrains Mono";
+      size = 10;
+    };
+    shellIntegration.enableZshIntegration = true;
+    #TODO: kitty config
+  };
 
-	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}"
-			];
-		};
-	};
+  programs.git = {
+    enable = true;
+    settings.user = {
+      email = "weckyy702@gmail.com";
+      name = "Weckyy702";
+    };
+    #TODO: signing
+  };
 
-	services.hyprpolkitagent.enable = true;
+  services.hyprpaper = {
+    enable = true;
+    settings = let
+      # TODO: this should be done more cleanly
+      wallpaper_path = ./hyprland/horizontal_16x9.png;
+    in {
+      preload = toString wallpaper_path;
+      wallpaper = [
+        #TODO: this should be dynamic
+        "DP-1,${wallpaper_path}"
+        "HDMI-A-1,${wallpaper_path}"
+      ];
+    };
+  };
 
-	#TODO: hyprsunset?
+  services.hyprpolkitagent.enable = true;
+
+  services.ssh-agent = {
+    enable = true;
+    enableZshIntegration = true;
+  };
 }

home/hyprland/hyprpaper.nix

@@ -1,5 +0,0 @@
-let
-  #TODO: this needs to be modular!
-  wallpaper = "/home/weckyy702/Pictures/wallpapers/horizontal_16x9.png";
-in
-{}

home/hyprland/settings.nix

@@ -1,68 +1,82 @@
-{
-	"$mod" = "SUPER";
-	"$browser" = "zen";
-	"$term" = "kitty";
+{...}: {
+  "$mod" = "SUPER";
+  "$browser" = "zen";
+  "$term" = "kitty";
 
-	general = {
-		border_size = 2;
-		gaps_in = 5;
-		gaps_out = 10;
-		layout = "dwindle";
-		allow_tearing = false;
-		resize_on_border = true;
-	};
+  general = {
+    border_size = 2;
+    gaps_in = 5;
+    gaps_out = 10;
+    layout = "dwindle";
+    allow_tearing = false;
+    resize_on_border = true;
+  };
 
-	snap = {
+  snap = {
+  };
 
-	};
+  input = {
+    kb_layout = "de";
+    follow_mouse = 1;
+  };
 
-	input = {
-		kb_layout = "de";
-		follow_mouse = 1;
-	};
+  bind =
+    [
+      "$mod, Q, exit"
+      "$mod, Return, exec, $term"
+      "$mod, D, exec, wofi --show drun"
+      "$mod, F2, exec, $browser"
+      "$mod, c, killactive"
+      "$mod, f, fullscreen"
+      "$mod, h, movefocus, l"
+      "$mod, j, movefocus, d"
+      "$mod, k, movefocus, u"
+      "$mod, l, movefocus, r"
+      "$mod+SHIFT, h, movewindow, l"
+      "$mod+SHIFT, j, movewindow, d"
+      "$mod+SHIFT, k, movewindow, u"
+      "$mod+SHIFT, l, movewindow, r"
+      ", Print, exec, grim -g \"$(slurp)\" \"/home/weckyy702/Pictures/screenshots/$(date -Iseconds).png\""
+      "$mod+SHIFT, s, exec, hyprlock"
+    ]
+    ++
+    # Switch workspaces
+    (map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9])
+    ++ (map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspacesilent, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9]);
 
-	bind = [
-		"$mod, Q, exit"
-		"$mod, Return, exec, $term"
-		"$mod, D, exec, wofi --show drun"
-		"$mod, F2, exec, $browser"
-		"$mod, c, killactive"
-		"$mod, f, fullscreen"
-		"$mod, h, movefocus, l"
-		"$mod, j, movefocus, d"
-		"$mod, k, movefocus, u"
-		"$mod, l, movefocus, r"
-		"$mod+SHIFT, h, movewindow, l"
-		"$mod+SHIFT, j, movewindow, d"
-		"$mod+SHIFT, k, movewindow, u"
-		"$mod+SHIFT, l, movewindow, r"
-		", Print, exec, grim -g \"$(slurp)\" \"/home/weckyy702/Pictures/screenshots/$(date -Iseconds).png\""
-		"$mod+SHIFT, s, exec, hyprlock"
-	] 
-	++ 
-	# Switch workspaces
-	(map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9])
-	++
-	(map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspacesilent, ${builtins.toString i}") [1 2 3 4 5 6 7 8 9]);
+  bindm = [
+    "$mod, mouse:272, movewindow"
+  ];
 
-	bindm = [
-		"$mod, mouse:272, movewindow"
-	];
+  bindel = [
+    ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
+    ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+  ];
 
-	decoration = {
-		shadow.enabled = false;
-		blur.enabled = true;
-		active_opacity = 0.8;
-		inactive_opacity = 0.8;
-	};
+  bindl = [
+    ", XF86AudioNext, exec, playerctl position 5+"
+    ", XF86AudioPrev, exec, playerctl position 5-"
+    ", XF86AudioPlay, exec, playerctl play-pause"
+  ];
 
-	animations.enabled = false;
+  bindo = [
+    ", XF86AudioNext, exec, playerctl next"
+    ", XF86AudioPrev, exec, playerctl previous"
+  ];
 
-	misc.disable_hyprland_logo = true;
+  decoration = {
+    shadow.enabled = false;
+    blur.enabled = true;
+    active_opacity = 0.8;
+    inactive_opacity = 0.8;
+  };
 
-	cursor.inactive_timeout = 5;
+  animations.enabled = false;
 
-	ecosystem.no_update_news = true;
-	ecosystem.no_donation_nag = true;
+  misc.disable_hyprland_logo = true;
 
+  cursor.inactive_timeout = 3;
+
+  ecosystem.no_update_news = true;
+  ecosystem.no_donation_nag = true;
 }

home/nixvim/default.nix

@@ -0,0 +1,23 @@
+{...}: {
+  imports = [
+    ./keymaps.nix
+    ./options.nix
+    ./plugins
+  ];
+
+  programs.nixvim = {
+    enable = true;
+
+    clipboard.register = "unnamedplus";
+
+    colorschemes.catppuccin = {
+      enable = true;
+      settings.flavour = "mocha";
+      settings.integrations = {
+        gitsigns = true;
+        treesitter = true;
+        cmp = true;
+      };
+    };
+  };
+}

home/nixvim/keymaps.nix

@@ -0,0 +1,25 @@
+{...}: {
+  programs.nixvim.globals.mapleader = " ";
+
+  programs.nixvim.keymaps = [
+    {
+      key = "<esc>";
+      action = ":noh<CR>";
+      mode = "n";
+      options = {
+        silent = true;
+        desc = "Clear search highlight";
+      };
+    }
+    {
+      key = "j";
+      action = "gj";
+      mode = "n";
+    }
+    {
+      key = "k";
+      action = "gk";
+      mode = "n";
+    }
+  ];
+}

home/nixvim/options.nix

@@ -0,0 +1,50 @@
+{...}: {
+  programs.nixvim.opts = {
+    # Expand tabs to 4 spaces
+    shiftwidth = 4;
+    softtabstop = 4;
+    expandtab = true;
+
+    signcolumn = "yes:3";
+
+    # automatically indent and try to be smart about it
+    autoindent = true;
+    smartindent = true;
+
+    # Relative line numbers
+    number = true;
+    relativenumber = true;
+
+    # See search result as you type
+    inccommand = "split";
+
+    # Visualize whitespace
+    list = true;
+    listchars = {
+      tab = "» ";
+      trail = "·";
+      nbsp = "␣";
+    };
+
+    # Show which line the cursor is on
+    cursorline = true;
+
+    # Keep the cursor somewhat centered on the screen
+    scrolloff = 25;
+
+    # Ask if operations would fail due to unsaved buffers
+    confirm = true;
+
+    # ignore case in search unless multiple capital case letter have been typed
+    smartcase = true;
+    ignorecase = true;
+
+    completeopt = "menu,menuone,noselect";
+
+    # Persistent undos :)
+    undofile = true;
+
+    # enable resize by mouse
+    mouse = "n";
+  };
+}

home/nixvim/plugins/cmp/default.nix

@@ -0,0 +1,40 @@
+{...}: {
+  programs.nixvim.plugins = {
+    lspkind.enable = true;
+
+    blink-cmp.enable = true;
+
+    # cmp-nvim-lsp-signature-help.enable = true;
+    #
+    # cmp = {
+    #   enable = true;
+    #   autoEnableSources = true;
+    #   autoLoad = true;
+    #
+    #   settings.sources = [
+    #     { name = "nvim_lsp"; }
+    #     { name = "nvim_lsp_signature_help"; }
+    #     { name = "path"; }
+    #   ];
+    #
+    #   settings.mapping = {
+    #     "<Tab>" = "cmp.mapping.select_next_item()";
+    #     "<S-Tab>" = "cmp.mapping.select_prev_item()";
+    #     "<C-Space>" = "cmp.mapping.complete()";
+    #     "<C-S-Space>" = "cmp.mapping.close()";
+    #     "<CR>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })";
+    #   };
+    # };
+    #
+    # lsp-format.enable = true;
+    #
+    # none-ls = {
+    #   enable = true;
+    #   enableLspFormat = true;
+    #   sources.formatting = {
+    #     alejandra.enable = true;
+    #     nixpkgs_fmt.enable = true;
+    #   };
+    # };
+  };
+}

home/nixvim/plugins/default.nix

@@ -0,0 +1,25 @@
+{...}: {
+  imports = [
+    ./lsp.nix
+    ./telescope
+    ./cmp
+  ];
+
+  programs.nixvim.plugins = {
+    lualine.enable = true;
+
+    web-devicons.enable = true;
+
+    treesitter = {
+      enable = true;
+      folding = true;
+      autoLoad = true;
+    };
+
+    gitsigns.enable = true;
+
+    which-key.enable = true;
+
+    glow.enable = true;
+  };
+}

home/nixvim/plugins/lsp.nix

@@ -0,0 +1,30 @@
+{...}: {
+  programs.nixvim = {
+    dependencies.rust-analyzer.enable = true;
+
+    lsp = {
+      inlayHints.enable = true;
+      servers = {
+        "*" = {
+          config.capabilities.textDocument.semanticTokens.multilineTokenSupport = true;
+          config.root_markers = [
+            ".git"
+          ];
+        };
+        clangd = {
+          enable = true;
+          config.root_markers = [
+            "compile_commands.json"
+          ];
+        };
+        rust_analyzer = {
+          enable = true;
+        };
+        rnix.enable = true;
+      };
+    };
+
+    plugins.lspconfig.enable = true;
+    plugins.clangd-extensions.enable = true;
+  };
+}

home/nixvim/plugins/telescope/default.nix

@@ -0,0 +1,20 @@
+{...}: {
+  imports = [
+    ./keymaps.nix
+  ];
+  programs.nixvim.dependencies.ripgrep.enable = true;
+
+  programs.nixvim.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";
+      };
+    };
+  };
+}

home/nixvim/plugins/telescope/keymaps.nix

@@ -0,0 +1,19 @@
+{...}: {
+  programs.nixvim.keymaps = [
+    {
+      key = "<leader>sf";
+      action = "<cmd>Telescope find_files<CR>";
+      options.desc = "[S]earch [F]iles";
+    }
+    {
+      key = "<leader>sg";
+      action = "<cmd>Telescope live_grep<CR>";
+      options.desc = "[S]earch by [G]rep";
+    }
+    {
+      key = "<leader>sw";
+      action = "<cmd>Telescope grep_string<CR>";
+      options.desc = "[S]earch current [W]ord";
+    }
+  ];
+}