fix: replace nixfmt-rfc-style with nixfmt

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773889306,
+        "lastModified": 1779135526,
-        "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=",
+        "narHash": "sha256-glCununz6lmaK5fs2X946HA3EkNxB2JagdAAvInuRYU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347",
+        "rev": "d405a179887d52b24c0ddd31e09a150bd1f66779",
         "type": "github"
       },
       "original": {
@@ -20,58 +20,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -79,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774875815,
+        "lastModified": 1779157263,
-        "narHash": "sha256-PzqwM4njoB3aznqwPZUawD4uOcJeu7N6GBTJKg81EQ4=",
+        "narHash": "sha256-VbiyZkRf8/qr7ObmlyfOHJsNAW5tyZ4MB1+cUwAwdrw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9340f51314713c83360bf72d75c8b404778ab5b1",
+        "rev": "866412a19866b4a8e32d2306a118040afa2b840c",
         "type": "github"
       },
       "original": {
@@ -132,69 +80,6 @@
         "type": "github"
       }
     },
-    "madd": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754781336,
-        "narHash": "sha256-EUavinU3psYqVDx7Cjdypsf4dUymdu1yawbwRYv6wbM=",
-        "ref": "refs/heads/master",
-        "rev": "d490b648ac5acb65aa24c8e8314c1a6fa9e2c0c1",
-        "revCount": 8,
-        "type": "git",
-        "url": "https://git.bulthuis.dev/Jan/madd"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.bulthuis.dev/Jan/madd"
-      }
-    },
-    "nix-minecraft": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751650156,
-        "narHash": "sha256-1gIPVDf159TQlcVg3WQBHMZVn8RllHOa8eT7AJPj2IE=",
-        "owner": "Jan-Bulthuis",
-        "repo": "nix-minecraft",
-        "rev": "d3b3779fd78bd55db24d25e896438b2b51cbb6cb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jan-Bulthuis",
-        "repo": "nix-minecraft",
-        "type": "github"
-      }
-    },
-    "nix-modpack": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747559249,
-        "narHash": "sha256-+ygKEGMVcXNklO4RDYSd5XzydDmQOZWcOcxYZf/PH1U=",
-        "owner": "Jan-Bulthuis",
-        "repo": "nix-modpack",
-        "rev": "a093625c2847afc3ef257513161c7fe318c6be1c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jan-Bulthuis",
-        "repo": "nix-modpack",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1768564909,
@@ -229,11 +114,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774709303,
+        "lastModified": 1778869304,
-        "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
         "type": "github"
       },
       "original": {
@@ -248,9 +133,6 @@
         "disko": "disko",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "madd": "madd",
-        "nix-minecraft": "nix-minecraft",
-        "nix-modpack": "nix-modpack",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable",
         "secrets": "secrets",
@@ -279,11 +161,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774760784,
+        "lastModified": 1777944972,
-        "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=",
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
@@ -291,36 +173,6 @@
         "repo": "sops-nix",
         "type": "github"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -19,14 +19,14 @@
     impermanence.url = "github:nix-community/impermanence";
 
     # MADD
-    madd.url = "git+https://git.bulthuis.dev/Jan/madd";
+    # madd.url = "git+https://git.bulthuis.dev/Jan/madd";
-    madd.inputs.nixpkgs.follows = "nixpkgs";
+    # madd.inputs.nixpkgs.follows = "nixpkgs";
 
     # For Minecraft VM
-    nix-minecraft.url = "github:Jan-Bulthuis/nix-minecraft";
+    # nix-minecraft.url = "github:Jan-Bulthuis/nix-minecraft";
-    nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
+    # nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
-    nix-modpack.url = "github:Jan-Bulthuis/nix-modpack";
+    # nix-modpack.url = "github:Jan-Bulthuis/nix-modpack";
-    nix-modpack.inputs.nixpkgs.follows = "nixpkgs";
+    # nix-modpack.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =

hosts/ws-think/hardware-configuration.nix

@@ -7,6 +7,9 @@
   # Set hostid (required for ZFS)
   networking.hostId = "deadbeef";
 
+  # Use thermald
+  services.thermald.ignoreCpuidCheck = true;
+
   # Hardware configuration
   hardware.enableRedistributableFirmware = true;
   boot.initrd.availableKernelModules = [
@@ -19,6 +22,7 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
+  boot.zfs.forceImportRoot = false;
   hardware.cpu.intel.updateMicrocode = true;
 
   # Filesystems

modules/home/desktop/gnome.nix

@@ -70,6 +70,7 @@ in
         mpris-label
         pip-on-top
         rounded-window-corners-reborn
+        caffeine
       ]);
 
     # Set up gnome terminal as changing the default terminal is a pain

modules/home/development/git.nix

@@ -39,7 +39,7 @@ in
     programs.git = {
       enable = true;
 
-      extraConfig = {
+      settings = {
         pull = {
           rebase = false;
         };

modules/home/development/languages/nix.nix

@@ -18,7 +18,7 @@ in
     # Development packages
     home.packages = with pkgs; [
       nix-tree
-      nixfmt-rfc-style
+      nixfmt
       nixd
     ];
 

modules/nixos/graphics.nix

@@ -16,7 +16,11 @@ in
     # TODO: Add nvidia settings back in
     # TODO: Move to nvidia module
     hardware.nvidia = {
-      open = true;
+      open = false;
+      prime = {
+        intelBusId = "PCI:0@0:2:0";
+        nvidiaBusId = "PCI:1@0:0:0";
+      };
     };
   };
 }

profiles/home/gnome.nix

@@ -67,6 +67,7 @@ in
           "rounded-window-corners@fxgn"
           "media-progress@krypion17"
           "mprisLabel@moon-0xff.github.com"
+          "caffeube@patapon.info"
         ];
         last-selected-power-profile = "power-saver";
       };

profiles/home/jan.nix

@@ -33,7 +33,7 @@ in
       # pkgs-stable.winbox
       winbox4
       # whatsapp-for-linux
-      wasistlos
+      karere
       discord
       steam
       spotify
@@ -50,6 +50,10 @@ in
       vlc
       authenticator
       hotspot
+      btop
+      winboat
+      hieroglyphic
+      shortwave
 
       podman
       podman-compose
@@ -58,6 +62,14 @@ in
       gnome-logs
     ];
 
+    programs.zathura = {
+      enable = true;
+      options = {
+        synctex = true;
+        synctex-editor-command = "${pkgs.texlab}/bin/texlab inverse-search -i %{input} -l %{line}";
+      };
+    };
+
     programs.helix = {
       enable = true;
       defaultEditor = true;
@@ -68,6 +80,34 @@ in
       #     fallback = "default";
       #   };
       # };
+      settings =
+        let
+          move_line_up = [
+            "extend_to_line_bounds"
+            "delete_selection"
+            "move_line_up"
+            "paste_before"
+          ];
+          move_line_down = [
+            "extend_to_line_bounds"
+            "delete_selection"
+            "paste_after"
+          ];
+        in
+        {
+          keys.normal = {
+            "A-up" = move_line_up;
+            "A-down" = move_line_down;
+            "A-k" = move_line_up;
+            "A-j" = move_line_down;
+          };
+          keys.select = {
+            "A-up" = move_line_up;
+            "A-down" = move_line_down;
+            "A-k" = move_line_up;
+            "A-j" = move_line_down;
+          };
+        };
       extraPackages = with pkgs; [
         bash-language-server # Bash
         fish-lsp # Fish
@@ -97,7 +137,8 @@ in
         ruff # Python
         basedpyright # Python
 
-        helix-gpt # Copilot
+        #helix-gpt # Copilot
+        ltex-ls-plus # Spellchecking
 
         # texlab # Latex, Bibtex
         # bibtex-tidy # Bibtex
@@ -116,6 +157,22 @@ in
       ];
       languages = {
         language-server = {
+          ltex = {
+            command = "ltex-ls-plus";
+            config.ltex = { };
+          };
+          texlab = {
+            command = "texlab";
+            config.texlab = {
+              build.onSave = true;
+              forwardSearch.executable = "${config.programs.zathura.package}/bin/zathura";
+              forwardSearch.args = [
+                "--synctex-forward"
+                "%l:1:%f"
+                "%p"
+              ];
+            };
+          };
           basedpyright = {
             command = "basedpyright-langserver";
             args = [ "--stdio" ];
@@ -133,6 +190,16 @@ in
           };
         };
         language = [
+          {
+            name = "latex";
+            # language-servers = [
+            #   { name = "texlab"; }
+            #   { name = "ltex"; }
+            # ];
+            soft-wrap = {
+              enable = true;
+            };
+          }
           {
             name = "python";
             language-servers = [