update system

flake.lock

@@ -102,11 +102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
+        "lastModified": 1733312601,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -150,11 +150,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732021966,
+        "lastModified": 1734425854,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732025103,
+        "lastModified": 1734344598,
-        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
+        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
+        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732025103,
+        "lastModified": 1734344598,
-        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
+        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
+        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
         "type": "github"
       },
       "original": {
@@ -282,11 +282,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732016537,
+        "lastModified": 1733570843,
-        "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=",
+        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4",
+        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
         "type": "github"
       },
       "original": {
@@ -305,11 +305,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1732239366,
+        "lastModified": 1734404414,
-        "narHash": "sha256-dY2Umwn/UzKT8K56zrAqb0JC9uCKxnDJxnf+5NwcqDQ=",
+        "narHash": "sha256-c/7bsbMcVMb8c4wiLA142ZQfL08U8qYJROGf9NCkfQE=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "7201d315fc068bed90f78e8e4493d30162711458",
+        "rev": "a364e6a5e9eb93253daf93c747b150e31e09b13c",
         "type": "github"
       },
       "original": {
@@ -336,27 +336,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1731797254,
+        "lastModified": 1734083684,
-        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1732014248,
+        "lastModified": 1734424634,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -381,11 +381,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1732143099,
+        "lastModified": 1734567959,
-        "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=",
+        "narHash": "sha256-ghNQlnI/r6cnknY58x60695sFrYnI6ZUMg65bmoNGqw=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c",
+        "rev": "37608b462772e35220e02bfbd9045d0946564436",
         "type": "github"
       },
       "original": {
@@ -394,21 +394,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "locked": {
-        "lastModified": 1732285408,
-        "narHash": "sha256-+22r7TK3VgeY3LoPo2jqWywx8nZbKdM0uOIYCL5oJAg=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "72bbb83380c2c743a11f09cdfeac5b6ea64d30b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "nuschtosSearch": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -419,11 +404,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731936508,
+        "lastModified": 1733773348,
-        "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
+        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
+        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
         "type": "github"
       },
       "original": {
@@ -439,8 +424,7 @@
         "matugen": "matugen",
         "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_2",
-        "nixvim": "nixvim",
+        "nixvim": "nixvim"
-        "nur": "nur"
       }
     },
     "rust-overlay": {
@@ -451,11 +435,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732156292,
+        "lastModified": 1734316514,
-        "narHash": "sha256-XuTCME5ZausokOJ28AsIoayBVD1soscdoiKweT4VY50=",
+        "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2d484c7a0db32f2700e253160bcd2aaa6cdca3ba",
+        "rev": "83ee8ff74d6294a7657320f16814754c4594127b",
         "type": "github"
       },
       "original": {
@@ -517,11 +501,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732111664,
+        "lastModified": 1733761991,
-        "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=",
+        "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0",
+        "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,7 +1,6 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nur.url = "github:nix-community/NUR";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -24,7 +23,6 @@
   outputs =
     {
       nixpkgs,
-      nur,
       home-manager,
       nixvim,
       anyrun,
@@ -46,14 +44,12 @@
             permittedInsecurePackages = [ "nix-2.25.0pre20240807_cfe66dbe" ];
           };
           overlays = [
-            nur.overlay
             (final: prev: {
               anyrunPlugins = anyrun.packages.${prev.system};
               matugen = matugen.packages.${prev.system}.default;
               gbmonctl = prev.callPackage ./overlays/gbmonctl { };
               lpc21isp = prev.callPackage ./overlays/lpc21isp { };
               rquickshare = prev.callPackage ./overlays/rquickshare { };
-              cura = prev.callPackage ./overlays/cura { };
             })
           ];
         }

hosts/MONSTER/default.nix

@@ -89,7 +89,7 @@
       enable = true;
       default = true;
     };
-    nerdfonts.enable = true;
+    nerd-fonts.enable = true;
   };
 
   services.airprint.enable = true;

modules/home-manager/packages/default.nix

@@ -8,6 +8,7 @@
     vulnix
 
     # browsers
+    firefox
     chromium
     brave
 
@@ -29,7 +30,7 @@
 
     # office
     libreoffice
-    apostrophe # markdown editor
+    apostrophe
 
     # creative
     gimp
@@ -44,7 +45,7 @@
 
     # development
     insomnia
-    avalonia-ilspy
+    # TODO: .NET 6 avalonia-ilspy
     # ghidra
     # ida-free
 

modules/home-manager/programs/default.nix

@@ -12,7 +12,6 @@
     };
     git = import ./git.nix;
     nixvim = import ./nixvim { inherit pkgs; };
-    firefox = import ./firefox.nix { inherit pkgs; };
     gpg.enable = true;
     btop = {
       enable = true;

modules/home-manager/programs/firefox.nix

@@ -1,81 +0,0 @@
-{ pkgs }:
-{
-  enable = true;
-  package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
-    extraPolicies = {
-      CaptivePortal = false;
-      DisableFirefoxStudies = true;
-      DisablePocket = true;
-      DisableTelemetry = true;
-      DisableFirefoxAccounts = true;
-      NoDefaultBookmarks = true;
-      OfferToSaveLogins = false;
-      OfferToSaveLoginsDefault = false;
-      PasswordManagerEnabled = false;
-      FirefoxHome = {
-        Search = true;
-        Pocket = false;
-        Snippets = false;
-        TopSites = true;
-        Highlights = false;
-      };
-      UserMessaging = {
-        ExtensionRecommendations = false;
-        SkipOnboarding = true;
-      };
-    };
-  };
-  profiles.default = {
-    id = 0;
-    name = "default";
-    isDefault = true;
-    bookmarks = [
-      {
-        name = "Monkeytype";
-        url = "https://monkeytype.com/";
-      }
-      {
-        name = "YouTube";
-        url = "https://youtube.com/";
-      }
-    ];
-    search = {
-      force = true;
-      default = "Google";
-      engines = {
-        "Nix Packages" = {
-          urls = [
-            {
-              template = "https://search.nixos.org/packages";
-              params = [
-                {
-                  name = "type";
-                  value = "packages";
-                }
-                {
-                  name = "query";
-                  value = "{searchTerms}";
-                }
-              ];
-            }
-          ];
-          icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-          definedAliases = [ "@np" ];
-        };
-        "NixOS Wiki" = {
-          urls = [ { template = "https://nixos.wiki/index.php?search={searchTerms}"; } ];
-          iconUpdateURL = "https://nixos.wiki/favicon.png";
-          updateInterval = 24 * 60 * 60 * 1000;
-          definedAliases = [ "@nw" ];
-        };
-        "Wikipedia (en)".metaData.alias = "@wiki";
-      };
-    };
-    extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-      ublock-origin
-      ublacklist
-      sponsorblock
-      bitwarden
-    ];
-  };
-}

modules/home-manager/programs/nixvim/presets/base/syntax.nix

@@ -35,7 +35,7 @@ in
       };
       illuminate.enable = lib.mkDefault true;
       nvim-autopairs.enable = lib.mkDefault true;
-      nvim-colorizer.enable = lib.mkDefault true;
+      colorizer.enable = lib.mkDefault true;
       ts-autotag = {
         enable = lib.mkDefault true;
         settings.opts.enable_close_on_slash = lib.mkDefault true;

modules/nixos/default.nix

@@ -8,7 +8,7 @@
 
     ./fonts/fira-code.nix
     ./fonts/noto-sans.nix
-    ./fonts/nerdfonts.nix
+    ./fonts/nerd-fonts.nix
 
     ./hardware/hid-fanatecff.nix
     ./hardware/audio.nix

modules/nixos/fonts/fira-code.nix

@@ -36,11 +36,15 @@ in
 
   config = mkIf cfg.enable {
     fonts = {
-      packages = with pkgs; [ fira-code ];
+      packages =
-      nerdfonts.additionalFonts = [ "FiraCode" ];
+        with pkgs;
+        [
+          fira-code
+        ]
+        ++ (if (config.fonts.nerd-fonts.enable) then [ nerd-fonts.fira-code ] else [ ]);
       fontconfig = {
         defaultFonts.monospace = mkIf cfg.default [
-          (if (config.fonts.nerdfonts.enable) then "Fira Code Nerd Font" else "FiraCode")
+          (if (config.fonts.nerd-fonts.enable) then "Fira Code Nerd Font" else "FiraCode")
         ];
         localConf = ''
           <match target="font">

modules/nixos/fonts/nerd-fonts.nix

@@ -0,0 +1,24 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+
+let
+  cfg = config.fonts.nerd-fonts;
+in
+{
+  options.fonts.nerd-fonts = {
+    enable = mkEnableOption "Enable nerdfonts";
+  };
+
+  config = mkIf cfg.enable {
+    fonts = {
+      packages = with pkgs; [
+        nerd-fonts.symbols-only
+      ];
+    };
+  };
+}

modules/nixos/fonts/nerdfonts.nix

@@ -1,29 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-
-let
-  cfg = config.fonts.nerdfonts;
-in
-{
-  options.fonts.nerdfonts = {
-    enable = mkEnableOption "Enable nerdfonts";
-    additionalFonts = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      description = "Additional fonts to include in the nerdfonts package";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    fonts = {
-      packages = with pkgs; [
-        (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ] ++ cfg.additionalFonts; })
-      ];
-    };
-  };
-}

modules/nixos/fonts/noto-sans.nix

@@ -21,15 +21,17 @@ in
 
   config = mkIf cfg.enable {
     fonts = {
-      packages = with pkgs; [
+      packages =
+        with pkgs;
+        [
           noto-fonts
           noto-fonts-cjk-sans
           noto-fonts-emoji
-      ];
+        ]
-      nerdfonts.additionalFonts = [ "Noto" ];
+        ++ (if (config.fonts.nerd-fonts.enable) then [ nerd-fonts.noto ] else [ ]);
       fontconfig = {
         defaultFonts.sansSerif = mkIf cfg.default [
-          (if (config.fonts.nerdfonts.enable) then "Noto Sans Nerd Font" else "Noto Sans")
+          (if (config.fonts.nerd-fonts.enable) then "Noto Sans Nerd Font" else "Noto Sans")
         ];
       };
     };

modules/nixos/usecases/3d-printing.nix

@@ -19,7 +19,6 @@ in
     environment.systemPackages = with pkgs; [
       lpc21isp
       dfu-util
-      cura
       openscad
       bambu-studio
       (orca-slicer.overrideAttrs (

modules/nixos/usecases/gaming.nix

@@ -35,7 +35,7 @@ in
           pkgs: with pkgs; [
             libgudev
             libvdpau
-            libsoup
+            libsoup_2_4
           ];
       })
       rpcs3

overlays/cura/default.nix

@@ -1,13 +0,0 @@
-{
-  lib,
-  appimageTools,
-  fetchurl,
-}:
-appimageTools.wrapType2 rec {
-  name = "cura";
-  version = "5.8.0";
-  src = fetchurl {
-    url = "https://github.com/Ultimaker/Cura/releases/download/${version}/UltiMaker-Cura-${version}-linux-X64.AppImage";
-    hash = "sha256-EojVAe+o43W80ES5BY3QgGRTxztwS+B6kIOfJOtULOg=";
-  };
-}