Update

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
2024-12-15 15:23:49 +00:00
parent 01971a5a8c
commit ed16aa5fd0
12 changed files with 109 additions and 50 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732307740,
-        "narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=",
+        "lastModified": 1734091628,
+        "narHash": "sha256-8O3i8zESjHVsGzyXb8gEpLztvANq3Ot5bwo60YKJc7k=",
        "owner": "aylur",
        "repo": "ags",
-        "rev": "81159966eb8b39b66c3efc133982fd76920c9605",
+        "rev": "27cd93147aba09142fa585fd16f13c56268b696c",
        "type": "github"
      },
      "original": {
@@ -29,11 +29,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731952585,
-        "narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=",
+        "lastModified": 1733520119,
+        "narHash": "sha256-6K07ZJTnFu1xASBCMtVc9cFTbBEauwSc7gGBmjLkLSk=",
        "owner": "aylur",
        "repo": "astal",
-        "rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609",
+        "rev": "4c19d8d06fa25cc6389f37abe8839b4d8be5c0d6",
        "type": "github"
      },
      "original": {
@@ -49,11 +49,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732491849,
-        "narHash": "sha256-Q8Ailv1RQhhlRDa4xAqvhjKam9sYNJ7Sr0G+WwARKGU=",
+        "lastModified": 1734092894,
+        "narHash": "sha256-M7nXS9YXO8gtrRU/mwYSyM40GjhuJM2lJm/P5t7vsOM=",
        "owner": "aylur",
        "repo": "astal",
-        "rev": "b7af61d770510b1c797e1c7137a4da934cdca7a2",
+        "rev": "4f47b69946dd7127ba66e6333af4945afaba15de",
        "type": "github"
      },
      "original": {
@@ -69,11 +69,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732540163,
-        "narHash": "sha256-5EYzmoTpem2IB9JWzd41sL98pz3lyyCSTiCjv08i4Uk=",
+        "lastModified": 1734088167,
+        "narHash": "sha256-OIitVU+IstPbX/NWn2jLF+/sT9dVKcO2FKeRAzlyX6c=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "2ed5e30fc7e34adf455db8b02b9151d3922a54ea",
+        "rev": "d32f2d1750d61a476a236526b725ec5a32e16342",
        "type": "github"
      },
      "original": {
@@ -85,11 +85,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@@ -98,6 +98,27 @@
        "type": "github"
      }
    },
+    "flake-parts": {
+      "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"
@@ -123,11 +144,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732554302,
-        "narHash": "sha256-qaS1xo2CDWo2IwT/otu03nTxs06BzY5ZOF4Azev7fUc=",
+        "lastModified": 1734267456,
+        "narHash": "sha256-gUE1Pj5bxRlOSph00IU4Y5i06lIKAclc1YcynQLXTOQ=",
        "owner": "karaolidis",
        "repo": "home-manager",
-        "rev": "32fe2dc4964fc14c59d42dfcd1ea7f23d2ed7949",
+        "rev": "b27691db93b0348b9b0bf151ae952a6f9f95089d",
        "type": "github"
      },
      "original": {
@@ -139,11 +160,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1732554299,
-        "narHash": "sha256-VlbdJzanpnWMMBvfj7Ge81Fe9j3EAnVMIL+EkX2BU8k=",
+        "lastModified": 1734267453,
+        "narHash": "sha256-dgFTPB2ER5akiAWRJbSpPbWar5D6n0BGD5Wcmhkt6pE=",
        "owner": "karaolidis",
        "repo": "nixpkgs",
-        "rev": "9397502b911602897f06d97708a7398f4f6fc075",
+        "rev": "59f98681ef21402ef93ccf43ae6c52547dee168e",
        "type": "github"
      },
      "original": {
@@ -153,13 +174,34 @@
        "type": "github"
      }
    },
-    "nur": {
+    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1732552240,
-        "narHash": "sha256-P0lWDHJ7OPXx+clV/F5n+WIRSWhSAmLlPYFoSDzDvPw=",
+        "lastModified": 1733940404,
+        "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1734263230,
+        "narHash": "sha256-S5N87tEKOEqsQvZ874e5aMhh2r8K51Q0530I8eh5uC0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "bdd3c9465129b14b148cdc98e152433347b9b974",
+        "rev": "2562c7e526c1e66c837106dbb99623efb88f32ce",
        "type": "github"
      },
      "original": {
@@ -188,11 +230,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732186149,
-        "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=",
+        "lastModified": 1733965552,
+        "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699",
+        "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
        "type": "github"
      },
      "original": {
@@ -209,11 +251,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1732508213,
-        "narHash": "sha256-0rfdpRO1KnesH0XHv8mAHmfsPQXnHiwiu79sN3nCy/0=",
+        "lastModified": 1734236158,
+        "narHash": "sha256-PlzILP+aSuxXyaI9zuZs9T4QSFn+/c5/eImYBxThLbg=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "4841814c6e22958aff9dd8c68fd2153237fbf15e",
+        "rev": "6a83f1889a56760dedb93539360424b64766bc81",
        "type": "github"
      },
      "original": {
@@ -236,6 +278,27 @@
        "repo": "default",
        "type": "github"
      }
+    },
+    "treefmt-nix": {
+      "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"
+      }
    }
  },
  "root": "root",
--- a/hosts/common/system/configs/boot/default.nix
+++ b/hosts/common/system/configs/boot/default.nix
@@ -11,9 +11,7 @@
      efi.canTouchEfiVariables = true;
    };
    initrd.systemd.enable = true;
-    # FIXME: https://github.com/NixOS/nixpkgs/issues/357643
-    # kernelPackages = pkgs.linuxPackages_latest;
-    kernelPackages = pkgs.linuxKernel.packages.linux_6_11;
+    kernelPackages = pkgs.linuxPackages_latest;
    supportedFilesystems = [
      "btrfs"
      "ntfs"
--- a/hosts/common/system/configs/nixpkgs/default.nix
+++ b/hosts/common/system/configs/nixpkgs/default.nix
@@ -1,6 +1,6 @@
 { inputs, ... }:
 {
-  imports = [ inputs.nur.nixosModules.nur ];
+  imports = [ inputs.nur.modules.nixos.default ];

  nixpkgs.config.allowUnfree = true;
 }
--- a/hosts/common/system/scripts/cleanup/cleanup.sh
+++ b/hosts/common/system/scripts/cleanup/cleanup.sh
@@ -1,5 +1,5 @@
 if [[ "$(id -u)" -ne 0 ]]; then
-  echo "This script must be run as root or with sudo privileges."
+  echo "This script must be run as root."
  exit 1
 fi

--- a/hosts/common/user/configs/console/nixpkgs/default.nix
+++ b/hosts/common/user/configs/console/nixpkgs/default.nix
@@ -5,6 +5,6 @@
 { inputs, ... }:
 {
  home-manager.users.${user} = {
-    imports = [ inputs.nur.hmModules.nur ];
+    imports = [ inputs.nur.modules.homeManager.default ];
  };
 }
--- a/hosts/common/user/configs/gui/darktable/default.nix
+++ b/hosts/common/user/configs/gui/darktable/default.nix
@@ -44,7 +44,8 @@
          "plugins/lighttable/overlays/1/2" = 3;
          "plugins/darkroom/modulegroups/last_preset" = "modules: all";
          "session/base_directory_pattern" = "${home}/Pictures/Darktable";
-          "session/filename_pattern" = "$(EXIF.YEAR)-$(EXIF.MONTH)-$(EXIF.DAY)_$(EXIF.HOUR)-$(EXIF.MINUTE)-$(EXIF.SECOND)_$(CONFLICT_PADDING).$(FILE_EXTENSION)";
+          "session/filename_pattern" =
+            "$(EXIF.YEAR)-$(EXIF.MONTH)-$(EXIF.DAY)_$(EXIF.HOUR)-$(EXIF.MINUTE)-$(EXIF.SECOND)_$(CONFLICT_PADDING).$(FILE_EXTENSION)";
          "session/sub_directory_pattern" = "";
          "setup_import_directory" = true;
        };
--- a/hosts/common/user/configs/gui/firefox/default.nix
+++ b/hosts/common/user/configs/gui/firefox/default.nix
@@ -2,12 +2,7 @@
  user ? throw "user argument is required",
  home ? throw "home argument is required",
 }:
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ lib, pkgs, ... }:
 {
  environment.persistence = {
    "/persist"."${home}/.mozilla" = { };
@@ -44,7 +39,7 @@
      profiles.default = {
        settings."extensions.autoDisableScopes" = 0;

-        extensions = with config.nur.repos.rycee.firefox-addons; [
+        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
          languagetool
          bitwarden
          darkreader
--- a/hosts/common/user/configs/gui/theme/options.nix
+++ b/hosts/common/user/configs/gui/theme/options.nix
@@ -348,7 +348,7 @@ in

          packages = mkOption {
            type = listOf package;
-            default = with pkgs; [ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ];
+            default = with pkgs; [ nerd-fonts.jetbrains-mono ];
            description = "The monospace font packages.";
          };
        };
--- a/hosts/common/user/configs/gui/vscode/default.nix
+++ b/hosts/common/user/configs/gui/vscode/default.nix
@@ -95,7 +95,8 @@ in
        "terminal.external.linuxExec" = "kitty";
        "terminal.integrated.confirmOnExit" = "hasChildProcesses";
        "terminal.integrated.copyOnSelection" = true;
-        "terminal.integrated.fontFamily" = builtins.concatStringsSep ", " hmConfig.theme.font.monospace.names;
+        "terminal.integrated.fontFamily" =
+          builtins.concatStringsSep ", " hmConfig.theme.font.monospace.names;
        "terminal.integrated.fontSize" = hmConfig.theme.font.size;
        "update.mode" = "none";
        "window.autoDetectHighContrast" = false;
--- a/hosts/eirene/users/nick.nix
+++ b/hosts/eirene/users/nick.nix
@@ -117,6 +117,7 @@ in
      };
    };

-    home.file."Documents/Obsidian/.stignore".source = ../../common/user/configs/gui/obsidian/config/.stignore;
+    home.file."Documents/Obsidian/.stignore".source =
+      ../../common/user/configs/gui/obsidian/config/.stignore;
  };
 }
--- a/submodules/home-manager
+++ b/submodules/home-manager
--- a/submodules/nixpkgs
+++ b/submodules/nixpkgs