From ce0c194761b9c1c487a31057c546af5dbd31eac1 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sat, 1 Jun 2024 14:30:35 +0100 Subject: [PATCH] Update all inputs (JackOS 24.06 "Carbrain") --- flake.lock | 66 +++++++++---------- home-manager/modules/gui/default.nix | 18 ++--- home-manager/modules/gui/waybar.nix | 6 +- home-manager/modules/swaync.nix | 4 +- lib/default.nix | 4 +- .../kelder/containers/spoder/default.nix | 2 +- nixos/boxes/tower/default.nix | 7 +- nixos/modules/tmproot.nix | 3 +- 8 files changed, 55 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 154f4fb..4734661 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1707922053, - "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", + "lastModified": 1711742460, + "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", "owner": "zhaofengli", "repo": "attic", - "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", + "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "utils": "utils" }, "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": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1710156081, - "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -480,11 +480,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1710888565, - "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "lastModified": 1716729592, + "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1712212014, - "narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=", + "lastModified": 1717097707, + "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b", + "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "type": "github" }, "original": { @@ -592,11 +592,11 @@ ] }, "locked": { - "lastModified": 1685908677, - "narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=", + "lastModified": 1713543440, + "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", "owner": "nix-community", "repo": "nixGL", - "rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5", + "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", "type": "github" }, "original": { @@ -623,11 +623,11 @@ }, "nixpkgs-mine": { "locked": { - "lastModified": 1713016718, - "narHash": "sha256-0fdD78wL7qLQ0XX1QBtzZqKtDORY4DqnHS5rerXiVgw=", + "lastModified": 1717245190, + "narHash": "sha256-UFuJkXgNQ2JbD6P9EJCzelUQ73wzxzGrybfkO3o/LGU=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "994688e64f2446e248744d48078eeb3ee45bd8b8", + "rev": "9b78c3a4c5800e1998d330d06d662598b21ac0d1", "type": "github" }, "original": { @@ -639,11 +639,11 @@ }, "nixpkgs-mine-stable": { "locked": { - "lastModified": 1712253482, - "narHash": "sha256-J6mDXmq50EdOtT9PJhOnlw64hFgi+iF9uqOWrJ7qgdI=", + "lastModified": 1717245305, + "narHash": "sha256-LrIS3+Aa4F2VmuJPQOASRd3W+uToj878PoUKSLVw/vE=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "4d7f762c2a06b2fa24be9555532b42dd533e3398", + "rev": "17a50249712512f600eced89bebcc3252b5f630f", "type": "github" }, "original": { @@ -655,11 +655,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1712168706, - "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", + "lastModified": 1716991068, + "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", + "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { diff --git a/home-manager/modules/gui/default.nix b/home-manager/modules/gui/default.nix index 7c1c19c..1bf267c 100644 --- a/home-manager/modules/gui/default.nix +++ b/home-manager/modules/gui/default.nix @@ -210,17 +210,10 @@ in }; qt = { enable = true; - platformTheme = "gtk"; + platformTheme.name = "gtk"; }; services = { - swaync = { - enable = true; - settings = { - widgets = [ "title" "dnd" "mpris" "notifications" ]; - }; - }; - playerctld.enable = true; spotifyd = { enable = false; @@ -297,6 +290,15 @@ in ] (_: "chromium-browser.desktop"); }; }; + + my = { + swaync = { + enable = true; + settings = { + widgets = [ "title" "dnd" "mpris" "notifications" ]; + }; + }; + }; }) (mkIf (cfg.standalone && !pkgs.stdenv.isDarwin) { diff --git a/home-manager/modules/gui/waybar.nix b/home-manager/modules/gui/waybar.nix index b5af542..52f0913 100644 --- a/home-manager/modules/gui/waybar.nix +++ b/home-manager/modules/gui/waybar.nix @@ -146,9 +146,9 @@ in dnd-none = ""; }; return-type = "json"; - exec = "${config.services.swaync.package}/bin/swaync-client -swb"; - on-click = "${config.services.swaync.package}/bin/swaync-client -t -sw"; - on-click-right = "${config.services.swaync.package}/bin/swaync-client -d -sw"; + exec = "${config.my.swaync.package}/bin/swaync-client -swb"; + on-click = "${config.my.swaync.package}/bin/swaync-client -t -sw"; + on-click-right = "${config.my.swaync.package}/bin/swaync-client -d -sw"; escape = true; }; }; diff --git a/home-manager/modules/swaync.nix b/home-manager/modules/swaync.nix index 7a35e09..e96e996 100644 --- a/home-manager/modules/swaync.nix +++ b/home-manager/modules/swaync.nix @@ -19,10 +19,10 @@ let }; }; - cfg = config.services.swaync; + cfg = config.my.swaync; in { - options.services.swaync = with lib.types; { + options.my.swaync = with lib.types; { enable = mkEnableOption "Sway Notification Center"; package = mkOption { type = package; diff --git a/lib/default.nix b/lib/default.nix index 37568fd..90f7876 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -248,8 +248,8 @@ rec { in { trivial = prev.trivial // { - release = "24.03:u-${prev.trivial.release}"; - codeName = "Bruh"; + release = "24.06:u-${prev.trivial.release}"; + codeName = "Carbrain"; revisionWithDefault = default: self.rev or default; versionSuffix = ".${date}.${revCode self}:u-${revCode pkgsFlake}"; }; diff --git a/nixos/boxes/kelder/containers/spoder/default.nix b/nixos/boxes/kelder/containers/spoder/default.nix index 8bc2fcd..887addd 100644 --- a/nixos/boxes/kelder/containers/spoder/default.nix +++ b/nixos/boxes/kelder/containers/spoder/default.nix @@ -92,7 +92,7 @@ in nextcloud = { enable = true; - package = pkgs.nextcloud28; + package = pkgs.nextcloud29; datadir = "/mnt/storage/nextcloud"; hostName = "cloud.${domain}"; https = true; diff --git a/nixos/boxes/tower/default.nix b/nixos/boxes/tower/default.nix index c4d5e7c..e16ac28 100644 --- a/nixos/boxes/tower/default.nix +++ b/nixos/boxes/tower/default.nix @@ -129,10 +129,9 @@ wifi = { backend = "wpa_supplicant"; }; - extraConfig = '' - [main] - no-auto-default=* - ''; + settings = { + main.no-auto-default = "*"; + }; }; }; diff --git a/nixos/modules/tmproot.nix b/nixos/modules/tmproot.nix index 367ac40..382a560 100644 --- a/nixos/modules/tmproot.nix +++ b/nixos/modules/tmproot.nix @@ -492,8 +492,7 @@ in } ]; }) - # TODO: Wastebin is not in 23.11, remove check when 24.04 is released - (mkIf (config.services ? "wastebin" && config.services.wastebin.enable) { + (mkIf config.services.wastebin.enable { my.tmproot.persistence.config.directories = [ "/var/lib/private/wastebin" ]; }) (mkIf config.services.photoprism.enable {