diff --git a/hosts/flynode/default.nix b/hosts/flynode/default.nix index 7ff9cda..555a992 100644 --- a/hosts/flynode/default.nix +++ b/hosts/flynode/default.nix @@ -5,7 +5,6 @@ { imports = [ ./hardware-configuration.nix - ../../roles/laptop.nix ../../roles/zfs.nix ../../base.nix ../../users/root.nix @@ -15,7 +14,7 @@ ../../roles/nix-ld.nix ../../roles/tailscale.nix ../../roles/podman.nix - ../../roles/mate.nix + ../../roles/gnome.nix ../../roles/flatpak.nix ../../roles/games.nix ]; diff --git a/roles/gnome.nix b/roles/gnome.nix index 5fcf467..634f2ff 100644 --- a/roles/gnome.nix +++ b/roles/gnome.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { - imports = [ ./gui.nix ]; @@ -16,4 +15,6 @@ gnome-console gnome-tour ]; + + environment.systemPackages = with pkgs; [ gnome-tweaks ]; } diff --git a/roles/gui.nix b/roles/gui.nix index ee1f73e..ddec6dc 100644 --- a/roles/gui.nix +++ b/roles/gui.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { - imports = [ ./pipewire.nix ./non-virtual.nix diff --git a/roles/mate.nix b/roles/mate.nix index 2e376fc..11fd8d7 100644 --- a/roles/mate.nix +++ b/roles/mate.nix @@ -1,7 +1,6 @@ { pkgs, ... }: { - imports = [ ./gui.nix ]; diff --git a/roles/laptop.nix b/roles/tlp.nix similarity index 100% rename from roles/laptop.nix rename to roles/tlp.nix diff --git a/users/nolan/desktop.nix b/users/nolan/desktop.nix index 19435b6..d12585b 100644 --- a/users/nolan/desktop.nix +++ b/users/nolan/desktop.nix @@ -8,6 +8,7 @@ keepassxc podman-desktop devpod + gjs unstable.fractal element-desktop discord