feat: update to newest NixOS stable

flake.nix

@@ -2,10 +2,10 @@
   description = "Who needs a working system anyways, me smash state";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs.url = "nixpkgs/nixos-25.11";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";

home/default.nix

@@ -19,9 +19,9 @@ in
   home.homeDirectory = "/home/jgero";
 
   home.packages = with pkgs; [
-    bitwarden
+    bitwarden-desktop
     signal-desktop
-    firefox-wayland
+    firefox
     thunderbird
     libreoffice
     gimp

home/git.nix

@@ -1,9 +1,11 @@
 { osConfig, ... }: {
   programs.git = {
     enable = true;
-    userName = "Johannes Gerold";
-    userEmail = osConfig.jgero.user.email;
-    extraConfig = {
+    settings = {
+      user = {
+        name = "Johannes Gerold";
+        email = osConfig.jgero.user.email;
+      };
       init = { defaultBranch = "main"; };
     };
   };

modules/sway.nix

@@ -39,7 +39,7 @@
       enable = true;
       settings = {
         default_session = {
-          command = "${pkgs.greetd.greetd}/bin/agreety --cmd sway";
+          command = "${pkgs.greetd}/bin/agreety --cmd sway";
         };
       };
     };

pkgs/neovim/lib/mkPack.nix

@@ -14,6 +14,6 @@ pkgs.stdenv.mkDerivation (rec {
   installPhase = ''
     mkdir -p $out/lua/${pname}
     cp $init $out/lua/${pname}/init.lua
-    ${if (def ? sources) then "cp $src/* $out/lua/${pname}/" else ""}
+    ${if (def ? sources) then "cp $src/*.lua $out/lua/${pname}/" else ""}
   '';
 } // (if (def ? sources) then { src = def.sources; } else { }))

pkgs/neovim/partials/builtins/options.lua

@@ -37,7 +37,7 @@ vim.o.undodir = vim.fn.stdpath("data") .. "/undodir"
 -- visuals
 vim.o.termguicolors = true -- is also set automatically by some themes
 vim.o.signcolumn = "yes:5" -- give plenty of space for signs
-vim.o.cmdheight = 0
+vim.o.cmdheight = 4
 vim.o.scrolloff = 8 -- don't let cursor get too close to the edge
 -- performance
 vim.o.updatetime = 50

pkgs/neovim/partials/default.nix

@@ -53,9 +53,11 @@ map mkPack
         cmp_luasnip
         friendly-snippets
         lsp_lines-nvim
+
+        helm-ls-nvim
       ];
       sources = ./languages;
-      init = (requireAllModules name sources) + (import ./languages/nvim-lspconfig.lua.nix { inherit pkgs pkgs-unstable; });
+      init = (requireAllModules name sources) + (import ./lsp-config { inherit pkgs pkgs-unstable; });
     }
     rec {
       name = withPrefix "git";
@@ -115,7 +117,9 @@ map mkPack
       name = withPrefix "ui";
       order = 1;
       plugins = [ plugins.fidget-nvim ];
-      init = ''require("fidget").setup({})'';
+      init = ''
+        require("fidget").setup({ notification = { override_vim_notify = true } })
+      '';
     }
     {
       name = withPrefix "testing-debugging";

pkgs/neovim/partials/languages/cmp.lua

@@ -40,6 +40,10 @@ vim.keymap.set({ "i", "s" }, "<C-L>", function()
 	ls.jump(1)
 end, { silent = true, desc = "jump forwards in snippet" })
 
+vim.keymap.set({ "i", "s" }, "<C-H>", function()
+	ls.jump(-1)
+end, { silent = true, desc = "jump backwards in snippet" })
+
 local s = ls.snippet
 local t = ls.text_node
 local i = ls.insert_node

pkgs/neovim/partials/languages/misc.lua

@@ -0,0 +1 @@
+require("helm-ls").setup()

pkgs/neovim/partials/lsp-config/default.nix

@@ -0,0 +1,70 @@
+{ pkgs, pkgs-unstable, ... }:
+let
+  genLspConfig = name: cmd: extraConfig: ''
+    vim.lsp.config("${name}", {
+      cmd = use_exec_or_fallback("${builtins.baseNameOf (builtins.elemAt cmd 0)}", ${
+        builtins.concatStringsSep ", " (map (v: ''"${v}"'') cmd)
+      }),
+      ${extraConfig}
+    })
+    vim.lsp.enable("${name}")
+  '';
+in
+(
+  (builtins.readFile ./lsp-config.lua)
+    + (builtins.concatStringsSep "\n" ([
+    (genLspConfig "nil_ls" [ "${pkgs.nil}/bin/nil" ] "")
+    (genLspConfig "lua_ls" [ "${pkgs.lua-language-server}/bin/lua-language-server" ] ''
+      	settings = {
+      		Lua = {
+      			workspace = {
+      				checkThirdParty = false,
+      				library = {
+      					vim.env.VIMRUNTIME
+      				},
+      			},
+      			telemetry = { enable = false },
+      		},
+      	},
+    '')
+    (genLspConfig "bashls" [ "${pkgs.bash-language-server}/bin/bash-language-server" "start" ] "")
+    (genLspConfig "clangd" [ "${pkgs.clang-tools}/bin/clangd" ] "")
+    (genLspConfig "html" [
+      "${pkgs.vscode-langservers-extracted}/bin/vscode-html-language-server"
+      "--stdio"
+    ] "")
+    (genLspConfig "cssls" [
+      "${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server"
+      "--stdio"
+    ] "")
+    (genLspConfig "jsonls" [
+      "${pkgs.vscode-langservers-extracted}/bin/vscode-json-language-server"
+      "--stdio"
+    ] "")
+    (genLspConfig "ts_ls" [
+      "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server"
+      "--stdio"
+    ] "")
+    (genLspConfig "rust_analyzer" [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ] ''
+      	settings = {
+      		['rust-analyzer'] = {
+      			cargo = {
+      				features = "all"
+      			}
+      		}
+      	},
+    '')
+    (genLspConfig "gopls" [ "${pkgs.gopls}/bin/gopls" ] "")
+    (genLspConfig "templ" [ "${pkgs.templ}/bin/templ" "lsp" ] "")
+    (genLspConfig "golangci_lint_ls" [
+      "${pkgs-unstable.golangci-lint-langserver}/bin/golangci-lint-langserver"
+    ] "")
+    (genLspConfig "postgres_lsp" [
+      "${pkgs-unstable.postgres-language-server}/bin/postgres-language-server"
+      "lsp-proxy"
+    ] "")
+    (genLspConfig "helm_ls" [ "${pkgs.helm-ls}/bin/helm_ls" "serve" ] "")
+    (genLspConfig "terraformls" [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ] "")
+    (genLspConfig "yamlls" [ "${pkgs.yaml-language-server}/bin/yaml-language-server" "--stdio" ] "")
+  ]))
+)