From ca243e9d620c7b7c004fbff682eb3b5f5d623295 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Wed, 28 Aug 2024 22:15:58 +0800 Subject: [PATCH] chore(flake)!: bump inputs --- flake.lock | 42 +++++++++++++++++++-------------------- global/io/default.nix | 1 + home/catppuccin/nixos.nix | 10 ++++++---- home/gnome/impl/nixos.nix | 2 +- home/gyroflow/home.nix | 3 ++- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 4e6263a1..af7876d4 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1722997334, - "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", + "lastModified": 1724469296, + "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", "owner": "catppuccin", "repo": "nix", - "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", + "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "impermanence": { "locked": { - "lastModified": 1719091691, - "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", + "lastModified": 1724489415, + "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=", "owner": "nix-community", "repo": "impermanence", - "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", + "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", "type": "github" }, "original": { @@ -193,11 +193,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1723367191, - "narHash": "sha256-noi5tre7BLtxImN38jEHeVOtOG1Xu37sJFwHKSAPHjo=", + "lastModified": 1724837759, + "narHash": "sha256-gt1mCTlqnirTHAG8Q90IWEs91fRsTSjBqXhb6bQboe8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "91178062f365b64eece94c5dff93e09b07e87d9d", + "rev": "a679e3a0ef9d3d43639f7ba894069c43e2d39c2c", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1723483411, - "narHash": "sha256-h6F9JK9PrrTmt5WgsZChLCn7ECk+G/cYJL2CuQVY/Cc=", + "lastModified": 1724556439, + "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b3b9d4ce20d75319c20a7faada08ad9135a1f008", + "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", "type": "github" }, "original": { diff --git a/global/io/default.nix b/global/io/default.nix index cc0b1331..407a3de2 100644 --- a/global/io/default.nix +++ b/global/io/default.nix @@ -48,6 +48,7 @@ in { environment.persistence."/nix/persist/fhs".directories = [ "/var/log" + "/var/lib/nixos" "/var/lib/systemd/backlight" ] ++ optional config.networking.networkmanager.enable "/etc/NetworkManager/system-connections" ++ diff --git a/home/catppuccin/nixos.nix b/home/catppuccin/nixos.nix index c68d41ff..dbdf05cc 100644 --- a/home/catppuccin/nixos.nix +++ b/home/catppuccin/nixos.nix @@ -65,12 +65,14 @@ in { # override greetd theme programs.regreet = mkIf cfg.enable { + theme = { + inherit (cfg.gtk) name package; + }; + cursorTheme = { + inherit (cfg.cursor) name package; + }; settings = { background.path = ./solid.png; - GTK = { - theme_name = cfg.gtk.name; - cursor_theme_name = cfg.cursor.name; - }; }; }; }; diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index 28b2236f..f870a99c 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -35,7 +35,6 @@ in mkIf cfg.enable { gnome-connections gnome-font-viewer gnome-text-editor - ]) ++ (with pkgs.gnome; [ ] ++ optionals config.global.flatpak.enable [ gnome-characters gnome-clocks gnome-contacts @@ -43,6 +42,7 @@ in mkIf cfg.enable { gnome-maps gnome-music gnome-weather + ]) ++ (with pkgs.gnome; [ ] ++ optionals config.global.flatpak.enable [ ]); users.home.persist.directories = [ ".config/dconf" ]; diff --git a/home/gyroflow/home.nix b/home/gyroflow/home.nix index 5ec39359..abff2f37 100644 --- a/home/gyroflow/home.nix +++ b/home/gyroflow/home.nix @@ -4,7 +4,8 @@ , ... }: with lib; let cfg = config.passthrough.gyroflow; in mkIf cfg.enable { - home.packages = [ cfg.package ]; + # temporarily gone until regression is fixed + #home.packages = [ cfg.package ]; wayland.windowManager.sway.config.window.commands = [ { criteria.app_id = "xyz.gyroflow.gyroflow"; command = "floating enable"; }