diff --git a/flake.lock b/flake.lock
index bd4aae6..d7de9ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1732722421,
-        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -74,6 +74,27 @@
         "type": "indirect"
       }
     },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -117,18 +138,14 @@
         "nixpkgs": [
           "neovim-nightly-overlay",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1732021966,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
         "type": "github"
       },
       "original": {
@@ -139,7 +156,7 @@
     },
     "git-ignore-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1709087332,
@@ -158,7 +175,7 @@
     },
     "git-ignore-nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1709087332,
@@ -206,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730903510,
-        "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
+        "lastModified": 1744693102,
+        "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
+        "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
         "type": "github"
       },
       "original": {
@@ -226,11 +243,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482255,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "lastModified": 1744987093,
+        "narHash": "sha256-IVioWVz5qVtHiqosesW7CJW//m/yADr7cVdgF1P4N8s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "5e6a8203cee7cc33b2e0d9a0adb7268f46447292",
         "type": "github"
       },
       "original": {
@@ -248,14 +265,15 @@
         "neovim-src": "neovim-src",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1732775233,
-        "narHash": "sha256-G9W0wi0MD9JvG3bmvWQSMVR684drSlWGY1auhCNxO8c=",
+        "lastModified": 1744960122,
+        "narHash": "sha256-9bIzs90K5+baT7C9Jy2/Q6WMfgeZ+tX5MyIwC+VHl60=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "b09ab000f85a830fac6f599947dfa268227aab31",
+        "rev": "e3bc827059b3e1606d48c8b0d492e0101b7b32ff",
         "type": "github"
       },
       "original": {
@@ -267,11 +285,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1732733768,
-        "narHash": "sha256-y3LmGebXuQhLz9w1IzkDU8b464WvMvPCbIImpVvxmcI=",
+        "lastModified": 1744932170,
+        "narHash": "sha256-XG8mE3iggeRRi5MdYYJtmXiDxuA2c4w57UgZfLLqxKQ=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "76dcc7029b200e1d85024d7ba4a34c602e730dbe",
+        "rev": "b4c759716a9e945b41439ae6d686c81107115516",
         "type": "github"
       },
       "original": {
@@ -282,11 +300,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1744932701,
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
         "type": "github"
       },
       "original": {
@@ -298,16 +316,18 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1666603677,
-        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
-        "owner": "NixOS",
+        "lastModified": 1744463964,
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs_3": {
@@ -325,10 +345,24 @@
       }
     },
     "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1666603677,
+        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
-        "path": "/nix/store/60sn02zhawl3kwn0r515zff3h6hg6ydz-source",
+        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "path": "/nix/store/frfyxcpzsdasdin76x83krbhpgkis8b0-source",
         "type": "path"
       },
       "original": {
@@ -337,12 +371,17 @@
       }
     },
     "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_2",
+        "treefmt-nix": "treefmt-nix_2"
+      },
       "locked": {
-        "lastModified": 1732784817,
-        "narHash": "sha256-I37vvlS+qk4TMzMouw9kJCilahl8+fOjnCWsBJmPv+U=",
+        "lastModified": 1744987300,
+        "narHash": "sha256-C3GtrgAVItvuKzUbzRWGw8QWpKVBard5OX6JZMAVnFI=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7c412613e5ed3d49f2e198c0b0187add6b897b3d",
+        "rev": "3df1ac0aef0f9f7664acb60ea36edced26b7a161",
         "type": "github"
       },
       "original": {
@@ -427,13 +466,55 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744707583,
+        "narHash": "sha256-IPFcShGro/UUp8BmwMBkq+6KscPlWQevZi9qqIwVUWg=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49d05555ccdd2592300099d6a657cc33571f4fe0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "unstable": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1744932701,
+        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
         "type": "github"
       },
       "original": {
@@ -452,11 +533,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1732723146,
-        "narHash": "sha256-Jd/+JMMn1lgm1Oe78du6DVkFWGCWvbNuSXsIKzcCeME=",
+        "lastModified": 1744728945,
+        "narHash": "sha256-zTeJdaAaXf4aeGHY8P4EbSob9Hu/0eZ7mEaygxHX1nU=",
         "owner": "danyspin97",
         "repo": "wpaperd",
-        "rev": "459c4e9c8bdd0f8b0572751efc96b59a2dd4cc78",
+        "rev": "32377e8061578f36e4785ea15eeda2ab94f17ab6",
         "type": "github"
       },
       "original": {
@@ -469,15 +550,15 @@
       "inputs": {
         "flake-utils": "flake-utils_2",
         "git-ignore-nix": "git-ignore-nix_2",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "unstable": "unstable"
       },
       "locked": {
-        "lastModified": 1731735867,
-        "narHash": "sha256-eaC4wCtkpj/jvpc0X+7B/DI7p479lQEq1aPcf52V4EY=",
+        "lastModified": 1744559834,
+        "narHash": "sha256-4AeqylaTW3B+iIab7/JobZruTOU1AgDZ8s+wYaZKQos=",
         "owner": "xmonad",
         "repo": "xmonad",
-        "rev": "81cf71d7c6807fba14c1000aa40bfee84f7fa0e1",
+        "rev": "ebf265a84c6295d4fe15c4a5cf88cb08746f2145",
         "type": "github"
       },
       "original": {
@@ -496,11 +577,11 @@
         "xmonad": "xmonad"
       },
       "locked": {
-        "lastModified": 1732441885,
-        "narHash": "sha256-SKl/9dmpWpAs30YgQfB7jpdJuUYcPd50SqqUGGaswr0=",
+        "lastModified": 1744559846,
+        "narHash": "sha256-Cq2N2Gokz+TLz+D1TFNtc34z5OxBAuY9qmz2m6hhKpg=",
         "owner": "xmonad",
         "repo": "xmonad-contrib",
-        "rev": "0dc879698def6325352886c3923299cfc951ca8e",
+        "rev": "4b866210512b90bc532b4cd46dc5171542d0fac8",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e3bea06..7147bc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,11 +36,10 @@
         modules = [
           ./machines/configuration-laptop.nix
           ./home/services/pipewire.nix
-          nur.nixosModules.nur
+          nur.modules.nixos.default
           home-manager.nixosModules.home-manager
           {
             home-manager = {
-              useGlobalPkgs = true;
               useUserPackages = true;
               extraSpecialArgs = { inherit inputs; };
               users.elias = import ./home/default-laptop.nix;
@@ -52,7 +51,7 @@
               })
               inputs.neovim-nightly-overlay.overlays.default
               inputs.wpaperd.overlays.default
-              inputs.nur.overlay
+              inputs.nur.overlays.default
               (import overlays/minlog.nix)
               (import overlays/obsidian.nix)
             ];
@@ -64,11 +63,10 @@
         modules = [
           ./machines/configuration-desktop.nix
           ./home/services/pipewire.nix
-          nur.nixosModules.nur
+          nur.modules.nixos.default
           home-manager.nixosModules.home-manager
           {
             home-manager = {
-              useGlobalPkgs = true;
               useUserPackages = true;
               extraSpecialArgs = { inherit inputs; };
               users.elias = import ./home/default-desktop.nix;
@@ -80,7 +78,7 @@
               })
               inputs.neovim-nightly-overlay.overlays.default
               inputs.wpaperd.overlays.default
-              inputs.nur.overlay
+              inputs.nur.overlays.default
               (import overlays/minlog.nix)
               (import overlays/obsidian.nix)
             ];
diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix
index 055d344..19f0f0f 100644
--- a/home/programs/neovim/default.nix
+++ b/home/programs/neovim/default.nix
@@ -6,7 +6,12 @@ let
 in {
   home.sessionVariables = { EDITOR = "nvim"; };
 
-  home.packages = with pkgs; [ nerdfonts texliveFull clang-tools ];
+  home.packages = with pkgs; [
+    nerd-fonts.jetbrains-mono
+    texliveFull
+    clang-tools
+    vimPlugins.catppuccin-nvim
+  ];
 
   programs.neovim = {
     enable = true;
@@ -88,7 +93,7 @@ in {
       neovim-remote
       # Nix
       nixd
-      nixfmt
+      nixfmt-rfc-style
       # Rust
       rust-analyzer
       # Bash
diff --git a/home/programs/neovim/lua/plugins/conform-nvim.lua b/home/programs/neovim/lua/plugins/conform-nvim.lua
index ff49151..0f99da2 100644
--- a/home/programs/neovim/lua/plugins/conform-nvim.lua
+++ b/home/programs/neovim/lua/plugins/conform-nvim.lua
@@ -29,7 +29,7 @@ return {
           markdown = { "prettierd" },
           json = { "prettierd" },
           yaml = { "prettierd" },
-          nix = { "nixfmt" },
+          nix = { "nixfmt-rfc-style" },
           tex = { "latexindent" },
           c = { "clang_format" },
           cpp = { "clang_format" },
diff --git a/home/programs/rofi/default.nix b/home/programs/rofi/default.nix
index e46fb1a..44d7b95 100644
--- a/home/programs/rofi/default.nix
+++ b/home/programs/rofi/default.nix
@@ -1,7 +1,11 @@
 { pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ oranchelo-icon-theme nerdfonts xclip ];
+  home.packages = with pkgs; [
+    oranchelo-icon-theme
+    nerd-fonts.jetbrains-mono
+    xclip
+  ];
 
   xsession.initExtra = "setxkbmap de"; # rofi pass needs this to be set
 
diff --git a/home/programs/signal/default.nix b/home/programs/signal/default.nix
index a2a5f83..e4b7ed8 100644
--- a/home/programs/signal/default.nix
+++ b/home/programs/signal/default.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ signal-desktop ];
+  home.packages = with pkgs; [ signal-desktop-bin ];
 }
diff --git a/home/programs/vscode/default.nix b/home/programs/vscode/default.nix
index 3bb58dc..9bb2a87 100644
--- a/home/programs/vscode/default.nix
+++ b/home/programs/vscode/default.nix
@@ -3,7 +3,7 @@
 {
   programs.vscode = {
     enable = true;
-    extensions = with pkgs.vscode-extensions; [
+    profiles.default.extensions = with pkgs.vscode-extensions; [
       dracula-theme.theme-dracula
       vscodevim.vim
       yzhang.markdown-all-in-one
diff --git a/overlays/obsidian.nix b/overlays/obsidian.nix
index 735a03d..1f1b53b 100644
--- a/overlays/obsidian.nix
+++ b/overlays/obsidian.nix
@@ -3,7 +3,7 @@ final: prev: {
 
     src = prev.fetchurl {
       url = old.src.url;
-      hash = "sha256-6IHqBvZx2yxQAvADi3Ok5Le3ip2/c6qafQ3FSpPT0po=";
+      hash = "sha256-XVq0nQiyT2HvKQpzJIvhghsGgg4ye7uqZcyA1nH4O/o=";
     };
   });
 }