diff --git a/.gitea/workflows/check-flake.yaml b/.gitea/workflows/check-flake.yaml index ab7da57..a073f32 100644 --- a/.gitea/workflows/check-flake.yaml +++ b/.gitea/workflows/check-flake.yaml @@ -16,4 +16,4 @@ jobs: fetch-depth: 0 - name: Check Flake - run: nix flake check --print-build-logs --log-format raw --show-trace \ No newline at end of file + run: nix flake check --all-systems --print-build-logs --log-format raw --show-trace \ No newline at end of file diff --git a/common/pc/default.nix b/common/pc/default.nix index 69001a2..5c53b81 100644 --- a/common/pc/default.nix +++ b/common/pc/default.nix @@ -6,7 +6,7 @@ in { imports = [ ./kde.nix - ./xfce.nix + # ./xfce.nix ./yubikey.nix ./chromium.nix # ./firefox.nix @@ -41,7 +41,6 @@ in mpv nextcloud-client signal-desktop - minecraft gparted libreoffice-fresh thunderbird @@ -70,7 +69,7 @@ in ]; # Printer discovery services.avahi.enable = true; - services.avahi.nssmdns = true; + services.avahi.nssmdns4 = true; programs.file-roller.enable = true; diff --git a/common/pc/kde.nix b/common/pc/kde.nix index 2fefddc..05cbe11 100644 --- a/common/pc/kde.nix +++ b/common/pc/kde.nix @@ -5,12 +5,9 @@ let in { config = lib.mkIf cfg.enable { - # kde plasma - services.xserver = { - enable = true; - desktopManager.plasma5.enable = true; - displayManager.sddm.enable = true; - }; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.desktopManager.plasma6.enable = true; # kde apps nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; @@ -20,7 +17,5 @@ in # plasma5Packages.kmail-account-wizard kate ]; - - services.xserver.desktopManager.plasma5.useQtScaling = true; }; } diff --git a/common/pc/spotify.nix b/common/pc/spotify.nix index 83c52cf..2e6b310 100644 --- a/common/pc/spotify.nix +++ b/common/pc/spotify.nix @@ -43,7 +43,6 @@ in services.spotifyd.users = [ "googlebot" ]; users.users.googlebot.packages = with pkgs; [ spotify - spotify-tui ]; users.groups.spotifyd = { diff --git a/common/pc/touchpad.nix b/common/pc/touchpad.nix index 1e61976..7e9f3cc 100644 --- a/common/pc/touchpad.nix +++ b/common/pc/touchpad.nix @@ -9,7 +9,7 @@ in }; config = lib.mkIf cfg.enable { - services.xserver.libinput.enable = true; - services.xserver.libinput.touchpad.naturalScrolling = true; + services.libinput.enable = true; + services.libinput.touchpad.naturalScrolling = true; }; } diff --git a/common/server/mailserver.nix b/common/server/mailserver.nix index 9e33332..a311c28 100644 --- a/common/server/mailserver.nix +++ b/common/server/mailserver.nix @@ -63,7 +63,7 @@ in "cris@runyan.org" ]; }; - certificateScheme = 3; # use let's encrypt for certs + certificateScheme = "acme-nginx"; # use let's encrypt for certs }; age.secrets.hashed-email-pw.file = ../../secrets/hashed-email-pw.age; age.secrets.cris-hashed-email-pw.file = ../../secrets/cris-hashed-email-pw.age; diff --git a/common/server/nextcloud.nix b/common/server/nextcloud.nix index 742bc2a..6d4500c 100644 --- a/common/server/nextcloud.nix +++ b/common/server/nextcloud.nix @@ -8,7 +8,7 @@ in config = lib.mkIf cfg.enable { services.nextcloud = { https = true; - package = pkgs.nextcloud28; + package = pkgs.nextcloud29; hostName = "neet.cloud"; config.dbtype = "sqlite"; config.adminuser = "jeremy"; diff --git a/common/server/samba.nix b/common/server/samba.nix index 344235b..ba73424 100644 --- a/common/server/samba.nix +++ b/common/server/samba.nix @@ -97,7 +97,7 @@ # Printer discovery # (is this needed?) services.avahi.enable = true; - services.avahi.nssmdns = true; + services.avahi.nssmdns4 = true; # printer sharing systemd.tmpfiles.rules = [ diff --git a/flake.lock b/flake.lock index d21fd8c..f7b9a49 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1708091384, - "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=", + "lastModified": 1715699772, + "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", "owner": "serokell", "repo": "deploy-rs", - "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790", + "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", "type": "github" }, "original": { @@ -125,6 +125,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -171,11 +187,11 @@ ] }, "locked": { - "lastModified": 1710120787, - "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", + "lastModified": 1716772633, + "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", + "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "type": "github" }, "original": { @@ -202,35 +218,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710420202, - "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1654936503, - "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dab6df51387c3878cdea09f43589a15729cae9f4", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.05", - "type": "indirect" - } - }, "nixpkgs-frigate": { "locked": { "lastModified": 1695825837, @@ -247,18 +248,6 @@ "type": "github" } }, - "nixpkgs-xone-fix": { - "flake": false, - "locked": { - "narHash": "sha256-nP+aGV0wrdRcOSlxlr2XaUczHeAHtLVpn2pefn5nhQE=", - "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/296470.diff" - }, - "original": { - "type": "file", - "url": "https://github.com/NixOS/nixpkgs/pull/296470.diff" - } - }, "radio": { "inputs": { "flake-utils": [ @@ -310,7 +299,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-frigate": "nixpkgs-frigate", - "nixpkgs-xone-fix": "nixpkgs-xone-fix", "radio": "radio", "radio-web": "radio-web", "simple-nixos-mailserver": "simple-nixos-mailserver" @@ -319,23 +307,23 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05", "utils": "utils" }, "locked": { - "lastModified": 1655930346, - "narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=", + "lastModified": 1714720456, + "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d", + "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-22.05", + "ref": "master", "repo": "nixos-mailserver", "type": "gitlab" } diff --git a/flake.nix b/flake.nix index c25840b..34517d3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-frigate.url = "github:NixOS/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e"; flake-utils.url = "github:numtide/flake-utils"; @@ -8,7 +8,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # mail server - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs"; # agenix @@ -35,9 +35,6 @@ # prebuilt nix-index database nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - - nixpkgs-xone-fix.url = "https://github.com/NixOS/nixpkgs/pull/296470.diff"; - nixpkgs-xone-fix.flake = false; }; outputs = { self, nixpkgs, ... }@inputs: @@ -85,8 +82,6 @@ src = nixpkgs; patches = [ ./patches/gamepadui.patch - ./patches/esphome.patch - inputs.nixpkgs-xone-fix ]; }; patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; }); diff --git a/machines/howl/default.nix b/machines/howl/default.nix index ced8e8b..de6be86 100644 --- a/machines/howl/default.nix +++ b/machines/howl/default.nix @@ -60,11 +60,6 @@ programs.adb.enable = true; - # thunderbolt - users.users.googlebot.packages = with pkgs; [ - kdePackages.plasma-thunderbolt - ]; - services.fwupd.enable = true; # fingerprint reader has initially shown to be more of a nuisance than a help diff --git a/machines/phil/properties.nix b/machines/phil/properties.nix index 622ac97..7355c3c 100644 --- a/machines/phil/properties.nix +++ b/machines/phil/properties.nix @@ -9,7 +9,6 @@ systemRoles = [ "server" "nix-builder" - "gitea-actions-runner" ]; hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlgRPpuUkZqe8/lHugRPm/m2vcN9psYhh5tENHZt9I2"; diff --git a/machines/storage/s0/home-automation.nix b/machines/storage/s0/home-automation.nix index 183dc56..b57c9f4 100644 --- a/machines/storage/s0/home-automation.nix +++ b/machines/storage/s0/home-automation.nix @@ -146,7 +146,8 @@ in }; }; - services.oauth2_proxy = + # TODO need services.oauth2-proxy.cookie.domain ? + services.oauth2-proxy = let nextcloudServer = "https://neet.cloud/"; in @@ -155,9 +156,10 @@ in httpAddress = "http://0.0.0.0:4180"; - nginx.virtualHosts = [ - frigateHostname - ]; + nginx.domain = frigateHostname; + # nginx.virtualHosts = [ + # frigateHostname + # ]; email.domains = [ "*" ]; diff --git a/machines/zoidberg/default.nix b/machines/zoidberg/default.nix index 17de6e1..186eb18 100644 --- a/machines/zoidberg/default.nix +++ b/machines/zoidberg/default.nix @@ -63,7 +63,7 @@ }; # Login into X11 plasma so barrier works well - services.xserver.displayManager.defaultSession = "plasma"; + services.displayManager.defaultSession = "plasma"; users.users.cris = { isNormalUser = true; @@ -83,7 +83,7 @@ }; # Auto login into Plasma in john zoidberg account - services.xserver.displayManager.sddm.settings = { + services.displayManager.sddm.settings = { Autologin = { Session = "plasma"; User = "john"; diff --git a/overlays/kernel-modules/gasket.nix b/overlays/kernel-modules/gasket.nix index 88444b4..ff59a59 100644 --- a/overlays/kernel-modules/gasket.nix +++ b/overlays/kernel-modules/gasket.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "gasket"; - version = "1.0-18"; + version = "1.0-18-unstable-2023-09-05"; src = fetchFromGitHub { owner = "google"; repo = "gasket-driver"; - rev = "09385d485812088e04a98a6e1227bf92663e0b59"; - sha256 = "fcnqCBh04e+w8g079JyuyY2RPu34M+/X+Q8ObE+42i4="; + rev = "5815ee3908a46a415aac616ac7b9aedcb98a504c"; + sha256 = "sha256-O17+msok1fY5tdX1DvqYVw6plkUDF25i8sqwd6mxYf8="; }; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(PWD)" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ lib.maintainers.kylehendricks ]; platforms = platforms.linux; + broken = versionOlder kernel.version "5.15"; }; } diff --git a/patches/esphome.patch b/patches/esphome.patch deleted file mode 100644 index aa6282f..0000000 --- a/patches/esphome.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix -index a8ab91f8f329..81bf135a023f 100644 ---- a/pkgs/tools/misc/esphome/default.nix -+++ b/pkgs/tools/misc/esphome/default.nix -@@ -5,6 +5,7 @@ - , platformio - , esptool - , git -+, stdenv - }: - - let -@@ -76,6 +77,7 @@ python.pkgs.buildPythonApplication rec { - # git is used in esphomeyaml/writer.py - "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" - "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages -+ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" - "--set ESPHOME_USE_SUBPROCESS ''" - ]; diff --git a/patches/gamepadui.patch b/patches/gamepadui.patch index 66917ed..915faaa 100644 --- a/patches/gamepadui.patch +++ b/patches/gamepadui.patch @@ -6,8 +6,8 @@ index 29c449c16946..f6c728eb7f0c 100644 in pkgs.writeShellScriptBin "steam-gamescope" '' ${builtins.concatStringsSep "\n" exports} -- gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf -+ gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog +- gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf ++ gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog ''; gamescopeSessionFile =