flake.lock: Update

Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/24a7ea390564ccd5b39b7884f597cfc8d7f6f44e' (2024-04-26)
  → 'github:ryantm/agenix/8d37c5bdeade12b6479c85acd133063ab53187a0' (2024-05-09)
• Updated input 'ccrEmacs':
    'git+https://git.aciceri.dev/aciceri/emacs.git?ref=refs/heads/master&rev=113f4faa4fe71673256558323e24e5d87b10a22e' (2024-05-01)
  → 'git+https://git.aciceri.dev/aciceri/emacs.git?ref=refs/heads/master&rev=cd9fc69f3d2dbd1799953c6a22eb679113baec93' (2024-05-11)
• Updated input 'disko':
    'github:nix-community/disko/e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d' (2024-05-06)
  → 'github:nix-community/disko/cb1d6fba694ab3887600d606106f5a044ba1712c' (2024-05-15)
• Updated input 'dream2nix':
    'github:nix-community/dream2nix/07bd44a3365efdbf4d17a14190636667e5fd3d48' (2024-05-03)
  → 'github:nix-community/dream2nix/995e831dac8c2c843f1289d15dfec526cb84afdd' (2024-05-14)
• Updated input 'dream2nix/nixpkgs':
    'github:NixOS/nixpkgs/94035b482d181af0a0f8f77823a790b256b7c3cc' (2024-05-02)
  → 'github:NixOS/nixpkgs/abd6d48f8c77bea7dc51beb2adfa6ed3950d2585' (2024-05-14)
• Updated input 'hercules-ci-agent':
    'github:hercules-ci/hercules-ci-agent/a8c035b947f0341beb621880f32ee18537ff3cf7' (2024-05-05)
  → 'github:hercules-ci/hercules-ci-agent/eb5298b1b57e8e817f7c2a05a09c17bf98ffe329' (2024-05-13)
• Updated input 'hercules-ci-agent/flake-parts':
    'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
  → 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02)
• Updated input 'hercules-ci-agent/nixpkgs':
    'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27)
  → 'github:NixOS/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05)
• Updated input 'homeManager':
    'github:nix-community/home-manager/6ebe7be2e67be7b9b54d61ce5704f6fb466c536f' (2024-05-06)
  → 'github:nix-community/home-manager/44677a1c96810a8e8c4ffaeaad10c842402647c1' (2024-05-12)
• Updated input 'nixDarwin':
    'github:LnL7/nix-darwin/230a197063de9287128e2c68a7a4b0cd7d0b50a7' (2024-04-24)
  → 'github:LnL7/nix-darwin/de8b0d60d6fd34f35abffc46adc94ebaa6996ce2' (2024-05-14)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/e148ccbecbd2fe4dc4768fba67f6db828466ad06' (2024-05-06)
  → 'github:NixOS/nixos-hardware/a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a' (2024-05-08)
• Updated input 'nixpkgsStable':
    'github:NixOS/nixpkgs/651b4702e27a388f0f18e1b970534162dec09aff' (2024-05-04)
  → 'github:NixOS/nixpkgs/9ddcaffecdf098822d944d4147dd8da30b4e6843' (2024-05-14)
• Updated input 'nixpkgsUnstable':
    'github:NixOS/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05)
  → 'github:NixOS/nixpkgs/2057814051972fa1453ddfb0d98badbea9b83c06' (2024-05-12)
• Updated input 'nur':
    'github:nix-community/NUR/ef30d0069c3c60af06abad41ddc03c1f220bae1a' (2024-05-06)
  → 'github:nix-community/NUR/2d6fba7ccd75b46ef12b797fd888f4d9ad80cbc6' (2024-05-15)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242' (2024-04-30)
  → 'github:cachix/pre-commit-hooks.nix/c182c876690380f8d3b9557c4609472ebfa1b141' (2024-05-13)

flake.lock

@@ -81,11 +81,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715822638,
+        "lastModified": 1715756862,
-        "narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=",
+        "narHash": "sha256-cNGZK/RNvb29giR2KtnbwU5lx2Kw+wWqAaeWqfYlPts=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "476eef8d85aa09389ae7baf6e6b60357f6a01432",
+        "rev": "cb1d6fba694ab3887600d606106f5a044ba1712c",
         "type": "github"
       },
       "original": {
@@ -487,24 +487,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flakeParts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_2"
@@ -523,21 +505,6 @@
         "type": "github"
       }
     },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -582,11 +549,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1715863700,
+        "lastModified": 1715626852,
-        "narHash": "sha256-08giWrlIb9iWDRWW1wBPq+oC6o5VE9Wov8DHkZFVzc8=",
+        "narHash": "sha256-ig33Osi+Kp36TyGS1S4eu1K9FEXJXCh5CdU+eHekTPI=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-agent",
-        "rev": "728945aa73ddc9896b6dc0c2bb4660887fc241bb",
+        "rev": "eb5298b1b57e8e817f7c2a05a09c17bf98ffe329",
         "type": "github"
       },
       "original": {
@@ -752,48 +719,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1714955862,
-        "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
-        "ref": "refs/tags/2.90-beta.1",
-        "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
-        "revCount": 15501,
-        "type": "git",
-        "url": "https://git@git.lix.systems/lix-project/lix"
-      },
-      "original": {
-        "ref": "refs/tags/2.90-beta.1",
-        "type": "git",
-        "url": "https://git@git.lix.systems/lix-project/lix"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "flakey-profile": "flakey-profile",
-        "lix": [
-          "lix"
-        ],
-        "nixpkgs": [
-          "nixpkgsUnstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1715863402,
-        "narHash": "sha256-WbNIHMe+NPRtn7AwFhIDYwMWwgTNJ5pVUXfcdhxv8ek=",
-        "ref": "refs/heads/main",
-        "rev": "36dbb9dbfbac2b72c431a3a934258079931d0065",
-        "revCount": 80,
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      }
-    },
     "nix-fast-build": {
       "inputs": {
         "flake-parts": "flake-parts_5",
@@ -803,11 +728,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1715803356,
+        "lastModified": 1714663357,
-        "narHash": "sha256-wvsg/UMM/jekzgbggH56KLZJzRmwrB9ErevaXXyWyqc=",
+        "narHash": "sha256-2D2UVkXHivtNUohlJy3GjMaiE7efozJCRgnYOkBbZlY=",
         "owner": "Mic92",
         "repo": "nix-fast-build",
-        "rev": "cfff239d93716e92f6467f8953d8f8c12da1892a",
+        "rev": "071d44681486271060f938a354ef9ba82ee4f9ea",
         "type": "github"
       },
       "original": {
@@ -1135,11 +1060,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1715787315,
+        "lastModified": 1715534503,
-        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
+        "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
+        "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
         "type": "github"
       },
       "original": {
@@ -1364,17 +1289,16 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1715146663,
+        "lastModified": 1715777889,
-        "narHash": "sha256-SiCdZF3dwRBgTlHOSB5GCKBcTmkGmyDmVRwr6cHCdgE=",
+        "narHash": "sha256-Ano+4M2xb91QjQ8Ymx4aAIZ1XjhPULSpwd/S2yEvDds=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "324a5f3b9fbfdb77336dc9fa1c0a02f33a6acf6d",
+        "rev": "2d6fba7ccd75b46ef12b797fd888f4d9ad80cbc6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "324a5f3b9fbfdb77336dc9fa1c0a02f33a6acf6d",
         "type": "github"
       }
     },
@@ -1413,7 +1337,7 @@
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgsUnstable"
@@ -1423,11 +1347,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715850717,
+        "lastModified": 1715609711,
-        "narHash": "sha256-HGY8w2Glb5xe4/l69Auv6R1kxbAQehB1vWFGnvzvSR8=",
+        "narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "963646978438e31c0925e16c4eca089fda69bac2",
+        "rev": "c182c876690380f8d3b9557c4609472ebfa1b141",
         "type": "github"
       },
       "original": {
@@ -1511,8 +1435,6 @@
         "hercules-ci-effects": "hercules-ci-effects_2",
         "homeManager": "homeManager",
         "homeManagerGitWorkspace": "homeManagerGitWorkspace",
-        "lix": "lix",
-        "lix-module": "lix-module",
         "nix-fast-build": "nix-fast-build",
         "nix-on-droid": "nix-on-droid",
         "nixDarwin": "nixDarwin",
@@ -1611,21 +1533,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tow-boot": {
       "flake": false,
       "locked": {

flake.nix

@@ -27,8 +27,7 @@
         nixpkgs-stable.follows = "nixpkgsStable";
       };
     };
-    # FIXME go back to master after nltch's repository is re-added
+    nur.url = "github:nix-community/NUR";
-    nur.url = "github:nix-community/NUR/324a5f3b9fbfdb77336dc9fa1c0a02f33a6acf6d";
     agenix.url = "github:ryantm/agenix";
     rock5b.url = "github:aciceri/rock5b-nixos";
     ccrEmacs.url = "git+https://git.aciceri.dev/aciceri/emacs.git";
@@ -53,15 +52,6 @@
     };
     nix-on-droid.url = "github:nix-community/nix-on-droid";
     nixd.url = "github:nix-community/nixd";
-    lix = {
-      url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
-      flake = false;
-    };
-    lix-module = {
-      url = "git+https://git.lix.systems/lix-project/nixos-module";
-      inputs.lix.follows = "lix";
-      inputs.nixpkgs.follows = "nixpkgsUnstable";
-    };
   };
 
   outputs = inputs @ {flakeParts, ...}:

hmModules/firefox/default.nix

@@ -48,6 +48,7 @@
   };
   home.sessionVariables = {
     MOZ_ENABLE_WAYLAND = 1;
+    XDG_CURRENT_DESKTOP = "sway";
     NIXOS_OZONE_WL = 1;
   };
 }

hmModules/hyprland/default.nix

@@ -30,7 +30,6 @@ in {
     ../gammastep
     # ../kitty
     ../wezterm
-    ../wayvnc
   ];
 
   home.packages = with pkgs; [wl-clipboard waypipe];

hmModules/teams/default.nix

@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.teams-for-linux];
-}

hmModules/wayvnc/default.nix

@@ -1,22 +0,0 @@
-{
-  pkgs,
-  lib,
-  vpn,
-  hostname,
-  ...
-}: {
-  systemd.user.services.wayvnc = {
-    Install.WantedBy = ["graphical-session.target"];
-
-    Unit = {
-      Description = "WayVNC";
-      PartOf = ["graphical-session.target"];
-    };
-
-    Service = {
-      ExecStart = "${lib.getExe' pkgs.wayvnc "wayvnc"} ${vpn.${hostname}.ip} 5900";
-      Restart = "on-failure";
-      RestartSec = 3;
-    };
-  };
-}

hosts/kirk/default.nix

@@ -2,7 +2,6 @@
   fleetModules,
   lib,
   pkgs,
-  config,
   ...
 }: {
   imports =
@@ -63,8 +62,6 @@
       "email"
       "digikam"
       "discord"
-      "remmina"
-      "zulip"
     ];
     extraGroups = [];
     backupPaths = [];
@@ -81,7 +78,7 @@
     "kvm-intel"
   ];
 
-  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_7;
 
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot = {

hosts/module.nix

@@ -206,7 +206,6 @@ in {
                 nixpkgs.overlays = config.overlays;
               })
               "${self.outPath}/hosts/${hostname}"
-              inputs.lix-module.nixosModules.default
             ]
             ++ (lib.optionals (config.secrets != []) [
               inputs.agenix.nixosModules.default

hosts/picard/default.nix

@@ -40,7 +40,6 @@
       # "sunshine"
       "mount-rock5b"
       "adb"
-      "guix"
     ]
     ++ [
       ./disko.nix
@@ -76,8 +75,6 @@
       "kicad"
       "monero"
       "zulip"
-      "teams"
-      "obs-studio"
     ];
     extraGroups = [];
     backupPaths = [];
@@ -94,16 +91,27 @@
   ];
   boot.kernelModules = [
     "kvm-amd"
-    "ddcci"
+    "ddci"
     "ddcci-backlight"
-    "i2c-dev" # needed?
   ];
 
-  boot.extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
+  # fix to support linux 6.8
+  # FIXME check https://github.com/NixOS/nixpkgs/pull/297430
+  boot.extraModulePackages = let
+    ddci-driver = config.boot.kernelPackages.ddcci-driver.overrideAttrs (_: {
+      patches = [
+        (pkgs.fetchpatch {
+          url = "https://gitlab.com/Sweenu/ddcci-driver-linux/-/commit/7f851f5fb8fbcd7b3a93aaedff90b27124e17a7e.patch";
+          sha256 = "sha256-Y1ktYaJTd9DtT/mwDqtjt/YasW9cVm0wI43wsQhl7Bg=";
+        })
+      ];
+    });
+  in [ddci-driver];
 
   systemd.services.ddcci = {
     serviceConfig.Type = "oneshot";
     script = ''
+      sleep 20
       echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
     '';
   };

modules/ccr/default.nix

@@ -4,7 +4,6 @@
   pkgs,
   fleetHmModules,
   fleetFlake,
-  vpn,
   ...
 }: let
   cfg = config.ccr;
@@ -101,8 +100,6 @@ in {
             _module.args = {
               inherit (config.age) secrets;
               inherit (cfg) username;
-              inherit vpn;
-              hostname = config.networking.hostName;
             };
           }
         ]

modules/guix/default.nix

@@ -1,6 +0,0 @@
-{
-  services.guix = {
-    enable = true;
-    gc.enable = true;
-  };
-}

modules/nix/default.nix

@@ -8,8 +8,7 @@
   nix = {
     optimise.automatic = true;
 
-    # Commented out otherwise Lix is not set
+    package = pkgs.nixVersions.latest;
-    # package = pkgs.nixVersions.latest;
 
     settings = {
       auto-optimise-store = true;
@@ -22,12 +21,10 @@
       substituters = [
         #   "s3://cache?profile=default&region=eu-south-1&scheme=https&endpoint=cache.aciceri.dev"
         "https://cache.iog.io"
-        "https://cache.lix.systems"
       ];
       trusted-public-keys = [
         #   "cache.aciceri.dev~1:nJMfcBnYieY2WMbYDG0s9S5qUhU+V4RPL+X9zcxXxZY="
         "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
-        "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
       ];
     };
 

modules/printing/default.nix

@@ -1,11 +1,8 @@
 {pkgs, ...}: {
-  services.avahi = {
+  services.avahi.enable = true;
-    enable = true;
   # Important to resolve .local domains of printers, otherwise you get an error
   # like  "Impossible to connect to XXX.local: Name or service not known"
-    nssmdns4 = true;
+  services.avahi.nssmdns4 = true;
-    openFirewall = true;
-  };
   hardware.sane.enable = true;
 
   services.printing = {