diff --git a/flake.lock b/flake.lock index 867bc83..155fe96 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1715822638, - "narHash": "sha256-Z4ZoyK8jYRmBZwMaEZLEmAilrfdpekwwwohliqC14/E=", + "lastModified": 1715756862, + "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, - "narHash": "sha256-08giWrlIb9iWDRWW1wBPq+oC6o5VE9Wov8DHkZFVzc8=", + "lastModified": 1715626852, + "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, - "narHash": "sha256-wvsg/UMM/jekzgbggH56KLZJzRmwrB9ErevaXXyWyqc=", + "lastModified": 1714663357, + "narHash": "sha256-2D2UVkXHivtNUohlJy3GjMaiE7efozJCRgnYOkBbZlY=", "owner": "Mic92", "repo": "nix-fast-build", - "rev": "cfff239d93716e92f6467f8953d8f8c12da1892a", + "rev": "071d44681486271060f938a354ef9ba82ee4f9ea", "type": "github" }, "original": { @@ -1135,11 +1060,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -1364,17 +1289,16 @@ }, "nur": { "locked": { - "lastModified": 1715146663, - "narHash": "sha256-SiCdZF3dwRBgTlHOSB5GCKBcTmkGmyDmVRwr6cHCdgE=", + "lastModified": 1715777889, + "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, - "narHash": "sha256-HGY8w2Glb5xe4/l69Auv6R1kxbAQehB1vWFGnvzvSR8=", + "lastModified": 1715609711, + "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": { diff --git a/flake.nix b/flake.nix index 6e38e0b..62908f4 100644 --- a/flake.nix +++ b/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/324a5f3b9fbfdb77336dc9fa1c0a02f33a6acf6d"; + nur.url = "github:nix-community/NUR"; 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, ...}: diff --git a/hmModules/firefox/default.nix b/hmModules/firefox/default.nix index 2e3e044..e277422 100644 --- a/hmModules/firefox/default.nix +++ b/hmModules/firefox/default.nix @@ -48,6 +48,7 @@ }; home.sessionVariables = { MOZ_ENABLE_WAYLAND = 1; + XDG_CURRENT_DESKTOP = "sway"; NIXOS_OZONE_WL = 1; }; } diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix index bc332a4..14e81c2 100644 --- a/hmModules/hyprland/default.nix +++ b/hmModules/hyprland/default.nix @@ -30,7 +30,6 @@ in { ../gammastep # ../kitty ../wezterm - ../wayvnc ]; home.packages = with pkgs; [wl-clipboard waypipe]; diff --git a/hmModules/teams/default.nix b/hmModules/teams/default.nix deleted file mode 100644 index 217685e..0000000 --- a/hmModules/teams/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - home.packages = [pkgs.teams-for-linux]; -} diff --git a/hmModules/wayvnc/default.nix b/hmModules/wayvnc/default.nix deleted file mode 100644 index 5f9e090..0000000 --- a/hmModules/wayvnc/default.nix +++ /dev/null @@ -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; - }; - }; -} diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index 98d65c3..896a801 100644 --- a/hosts/kirk/default.nix +++ b/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 = { diff --git a/hosts/module.nix b/hosts/module.nix index 8a4f3b6..507d279 100644 --- a/hosts/module.nix +++ b/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 diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index c3c2798..624d03f 100644 --- a/hosts/picard/default.nix +++ b/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 ''; }; diff --git a/modules/ccr/default.nix b/modules/ccr/default.nix index 68b5c84..6966981 100644 --- a/modules/ccr/default.nix +++ b/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; }; } ] diff --git a/modules/guix/default.nix b/modules/guix/default.nix deleted file mode 100644 index 5b8a372..0000000 --- a/modules/guix/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - services.guix = { - enable = true; - gc.enable = true; - }; -} diff --git a/modules/nix/default.nix b/modules/nix/default.nix index db4ab4f..9ee18a5 100644 --- a/modules/nix/default.nix +++ b/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®ion=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=" ]; }; diff --git a/modules/printing/default.nix b/modules/printing/default.nix index 10c1539..f53f429 100644 --- a/modules/printing/default.nix +++ b/modules/printing/default.nix @@ -1,11 +1,8 @@ {pkgs, ...}: { - services.avahi = { - 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; - openFirewall = true; - }; + services.avahi.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" + services.avahi.nssmdns4 = true; hardware.sane.enable = true; services.printing = {