From c4bd6777c50d1c21d31a185c237cf43f1a87d9af Mon Sep 17 00:00:00 2001 From: Zuckerberg Date: Sat, 1 Jun 2024 19:58:52 -0600 Subject: [PATCH] Update to NixOS 24.05 --- common/pc/default.nix | 5 ++--- common/pc/kde.nix | 11 +++-------- common/pc/spotify.nix | 1 - common/pc/touchpad.nix | 4 ++-- common/server/samba.nix | 2 +- flake.lock | 39 +++++++++++++-------------------------- flake.nix | 7 +------ machines/howl/default.nix | 5 ----- patches/esphome.patch | 19 ------------------- patches/gamepadui.patch | 4 ++-- 10 files changed, 24 insertions(+), 73 deletions(-) delete mode 100644 patches/esphome.patch 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/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..e076c39 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": { @@ -171,11 +171,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,16 +202,16 @@ }, "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" } @@ -247,18 +247,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 +298,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" diff --git a/flake.nix b/flake.nix index c25840b..f0d7d02 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"; @@ -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/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 =