From 6fde78c70759ed170eaa2a634ca0f4f3a9c6eaea Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Wed, 9 Jul 2025 03:37:23 -0400 Subject: [PATCH] Quick fixes --- flake.lock | 14 +++++++------- nixos/machines/crash/machine.nix | 2 +- nixos/machines/swarm/configuration.nix | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 4eeb4e3..3a13cb3 100644 --- a/flake.lock +++ b/flake.lock @@ -184,11 +184,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749574455, - "narHash": "sha256-fm2/8KPOYvvIAnNVtjDlTt/My00lIbZQ+LMrfQIWVzs=", + "lastModified": 1752027480, + "narHash": "sha256-IkDajRjsCgEpLrTUAlw29aYbRxO1qTqpV9ssMBpXa3g=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "917af390377c573932d84b5e31dd9f2c1b5c0f09", + "rev": "d5bf05234f5246294047dd10cb8c6e89cca0e884", "type": "github" }, "original": { @@ -247,16 +247,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749173751, - "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/nixos/machines/crash/machine.nix b/nixos/machines/crash/machine.nix index 87948e2..00d2b5a 100644 --- a/nixos/machines/crash/machine.nix +++ b/nixos/machines/crash/machine.nix @@ -39,7 +39,7 @@ # Our modules (import ../../modules/base.nix {inherit inputs;}) (import ../../modules/desktop.nix) - (import ../../modules/sway.nix) + # (import ../../modules/sway.nix) (import ./configuration.nix) (import ./hardware.nix) (import ../../modules/user.nix { diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix index e1403e7..3f5639e 100644 --- a/nixos/machines/swarm/configuration.nix +++ b/nixos/machines/swarm/configuration.nix @@ -104,7 +104,7 @@ # Enable swaywm programs.sway = { enable = true; - package = inputs'.swayfx.default; + package = inputs'.swayfx.packages.default; wrapperFeatures.gtk = true; }; # Setup bluetooth @@ -156,8 +156,8 @@ # for tpm backed encryption tpm2-tss # Podman - podman-desktop - podman-compose + # podman-desktop + # podman-compose # System tools gparted f2fs-tools