From 54f3bbd94de7ef68103ef1871ed4df24e41d3e29 Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Sun, 15 Oct 2023 21:50:59 +0200
Subject: [PATCH] Various cleanups

- enable gc
- enable max boot menu entries
- fix spice usb passthrough
- update input flakes
---
 configuration.nix         |  8 ++++++--
 flake.lock                | 30 +++++++++++++++---------------
 flake.nix                 |  6 +++---
 hardware.nix              |  5 ++++-
 home-mods/dev/default.nix |  2 +-
 os-mods/virt/default.nix  |  5 +++++
 6 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 11080ed..7b6b9f1 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,14 +12,18 @@
   ];
 
   nix = {
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 2w";
+    };
+    settings.auto-optimise-store = true;
     package = pkgs.nixFlakes;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
   };
 
-  boot.plymouth.enable = true;
-
   fonts.fontDir.enable = true;
   fonts.fonts = with pkgs; [
     emacs-all-the-icons-fonts
diff --git a/flake.lock b/flake.lock
index edead1b..4d94eaf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696814493,
-        "narHash": "sha256-1qArVsJGG2RHbV2iKFpAmM5os3myvwpXMOdFy5nh54M=",
+        "lastModified": 1697073574,
+        "narHash": "sha256-Np603TUNj+fzQYmaNPS7pmsy52KHq4fpWP5GCpTJ38Y=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "32ce057c183506cecb0b84950e4eaf39f37e8c75",
+        "rev": "3c41ae36ff12afbada9396c7d8282c2c74f74e06",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1696934970,
-        "narHash": "sha256-YbBmyDeoyzTeQsx2aO+lijWvYPAOhTjbc5jtqMuH36k=",
+        "lastModified": 1697137147,
+        "narHash": "sha256-s1KYOB3t5TVxQJDlrM699O9Hx7iY/St2UG3SuKnVa4g=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "85b061aefa29e54da20356aaab9abe6a2cb824d7",
+        "rev": "bd5c5e9a9b460a275df97c7226f573cd88cb27ef",
         "type": "github"
       },
       "original": {
@@ -256,11 +256,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696697597,
-        "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
+        "lastModified": 1696983906,
+        "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
+        "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51",
         "type": "github"
       },
       "original": {
@@ -272,11 +272,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1696697597,
-        "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=",
+        "lastModified": 1696983906,
+        "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5a237aecb57296f67276ac9ab296a41c23981f56",
+        "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51",
         "type": "github"
       },
       "original": {
@@ -320,11 +320,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1696933074,
-        "narHash": "sha256-+3fj5mFSySFv0e5Ye48soZqpbE1lmCq1k9Vmn9b1RhY=",
+        "lastModified": 1697143503,
+        "narHash": "sha256-5lZLEItkQ0vxTkV/y8cjNQLUBJ/Tzoy59SIMMogivVk=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2ffd7dddfc5cfb37cfa710ebe5152b101b328a77",
+        "rev": "a2abe52ec7b548f6a1629be6436ad819d2b3985c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2a804db..5afd852 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,14 +58,13 @@
 
   outputs = inputs: let
     system = "x86_64-linux";
-    customPkgs = import inputs.nixpkgs {
+    pkgs = import inputs.nixpkgs {
       system = "${system}";
       overlays = [inputs.emacs-overlay.overlay];
       config = {
         allowUnfree = true;
       };
     };
-    pkgs = customPkgs;
   in {
     formatter = {
       ${system} = pkgs.alejandra;
@@ -104,7 +103,8 @@
           {
             _module.args.inputs = inputs;
             _module.args.system = system;
-            nixpkgs.pkgs = customPkgs;
+            nixpkgs.pkgs = pkgs;
+            nix.registry.nixpkgs.flake = inputs.nixpkgs;
             home-manager.useUserPackages = true;
             home-manager.useGlobalPkgs = true;
             home-manager.sharedModules = [
diff --git a/hardware.nix b/hardware.nix
index d8415ba..ce5f551 100644
--- a/hardware.nix
+++ b/hardware.nix
@@ -13,7 +13,10 @@
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
     loader = {
-      systemd-boot.enable = true;
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 20;
+      };
       efi.canTouchEfiVariables = true;
     };
 
diff --git a/home-mods/dev/default.nix b/home-mods/dev/default.nix
index b9dd992..a72e376 100644
--- a/home-mods/dev/default.nix
+++ b/home-mods/dev/default.nix
@@ -8,7 +8,7 @@
   doomemacsSrc = builtins.fetchGit {
     url = "https://github.com/doomemacs/doomemacs";
     ref = "master";
-    rev = "844a82c4a0cacbb5a1aa558c88675ba1a9ee80a3";
+    rev = "986398504d09e585c7d1a8d73a6394024fe6f164";
   };
 
   personalDoomConfSrc = builtins.fetchGit {
diff --git a/os-mods/virt/default.nix b/os-mods/virt/default.nix
index 9912c2f..c786e81 100644
--- a/os-mods/virt/default.nix
+++ b/os-mods/virt/default.nix
@@ -9,6 +9,7 @@
     virt-manager
     virt-viewer
     virt-top
+    spice-gtk
   ];
 
   virtualisation.docker = {
@@ -30,6 +31,10 @@
     };
   };
 
+  services.udev.extraRules = ''
+    SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664", GROUP="wheel"
+  '';
+
   # virtualisation.libvirtd.allowedBridges = [
   #   "virbr0"
   #   "testbr0"