From 722deca86d088c9a6866bdb5f521c483593f90ba Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sun, 23 Feb 2025 17:28:59 -0800
Subject: [PATCH] Update deployment_type for home-manager
---
README.md | 4 ++--
home-manager/default.nix | 4 ++--
home-manager/hosts/rdesktop/desktops/gnome/default.nix | 3 ---
home-manager/hosts/rdesktop/desktops/plasma6/default.nix | 3 ---
home-manager/hosts/rdesktop/desktops/xfce/default.nix | 3 ---
home-manager/small.nix | 4 ++--
6 files changed, 6 insertions(+), 15 deletions(-)
delete mode 100644 home-manager/hosts/rdesktop/desktops/gnome/default.nix
delete mode 100644 home-manager/hosts/rdesktop/desktops/plasma6/default.nix
delete mode 100644 home-manager/hosts/rdesktop/desktops/xfce/default.nix
diff --git a/README.md b/README.md
index 4cc7f5b1..96b6afab 100644
--- a/README.md
+++ b/README.md
@@ -147,8 +147,8 @@ Completed To Do List [here](./docs/complete.md)
# ℹ️ Troubleshooting
1. To troubleshoot disko issues, this command can come in handy:
-```
- nix eval .#nixosConfigurations.`hostname`.config.disko.devices._config
+```bash
+ nix eval .#nixosConfigurations.$(hostname).config.disko.devices._config | nixfmt
```
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 12495df6..d6353540 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, inputs, hostname, username, desktop, ... }: {
+{ lib, inputs, hostname, username, desktop, deployment_type, ... }: {
imports = [
# Common configs
./common/software/cli
@@ -18,7 +18,7 @@
]
++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages
++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop} # Machine-agnostic desktop configs
- ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop} # Machine-specific desktop configs
+ ++ lib.optional (builtins.isString desktop) ./${deployment_type}/${hostname}/desktops/${desktop} # Machine-specific desktop configs
;
news.display = "silent";
diff --git a/home-manager/hosts/rdesktop/desktops/gnome/default.nix b/home-manager/hosts/rdesktop/desktops/gnome/default.nix
deleted file mode 100644
index 077404aa..00000000
--- a/home-manager/hosts/rdesktop/desktops/gnome/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-
-}
\ No newline at end of file
diff --git a/home-manager/hosts/rdesktop/desktops/plasma6/default.nix b/home-manager/hosts/rdesktop/desktops/plasma6/default.nix
deleted file mode 100644
index 0db3279e..00000000
--- a/home-manager/hosts/rdesktop/desktops/plasma6/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-
-}
diff --git a/home-manager/hosts/rdesktop/desktops/xfce/default.nix b/home-manager/hosts/rdesktop/desktops/xfce/default.nix
deleted file mode 100644
index 0db3279e..00000000
--- a/home-manager/hosts/rdesktop/desktops/xfce/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-
-}
diff --git a/home-manager/small.nix b/home-manager/small.nix
index efe1b3b9..c9df486c 100644
--- a/home-manager/small.nix
+++ b/home-manager/small.nix
@@ -1,4 +1,4 @@
-{ lib, inputs, hostname, username, desktop, ... }: {
+{ lib, inputs, hostname, username, deployment_type, desktop, ... }: {
imports = [
# Common configs
./common/software/cli/fish.nix
@@ -27,7 +27,7 @@
]
++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages
++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop} # Machine-agnostic desktop configs
- ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop} # Machine-specific desktop configs
+ ++ lib.optional (builtins.isString desktop) ./${deployment_type}/${hostname}/desktops/${desktop} # Machine-specific desktop configs
;
news.display = "silent";