From 270ebded3db5290fc072b664858eba910e32b50e Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Tue, 27 May 2025 14:44:19 -0400 Subject: [PATCH] Refactor config paths & update host imports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Relocates common configurations from a user-specific directory to a global hierarchy • Adds host-specific files and updates import paths for better modularity • Introduces an experimental GNOME mutter feature --- .../common}/browsers/chromium.nix | 0 .../common}/browsers/default.nix | 0 .../common}/browsers/zen.nix | 0 .../common}/development/default.nix | 0 .../common}/development/openssh.patch | 0 .../common}/development/vscode.nix | 0 .../common}/gaming/default.nix | 0 .../common}/gaming/switch.nix | 0 .../common}/gnome/dconf.nix | 4 ++ .../common}/gnome/default.nix | 0 .../common}/gnome/programs/default.nix | 0 .../common}/gnome/programs/ghostty.nix | 0 .../common}/gnome/theme/default.nix | 0 .../common}/gnome/theme/invincible.yaml | 0 .../gnome/theme/wallpapers/invincible.jpg | Bin .../gnome/theme/wallpapers/wallpaper.jpg | Bin .../common}/vscode-server.nix | 0 .../common/optional => global/common}/xdg.nix | 0 home/{toph/common => global}/core/asdf.nix | 0 home/{toph/common => global}/core/bash.nix | 0 home/{toph/common => global}/core/bat.nix | 0 home/{toph/common => global}/core/default.nix | 0 home/{toph/common => global}/core/direnv.nix | 0 .../core/fastfetch/default.nix | 0 .../core/fastfetch/host/caenus.txt | 0 .../core/fastfetch/host/cloud.txt | 0 .../core/fastfetch/host/images/caenus.png | Bin .../core/fastfetch/host/images/cloud.png | Bin .../core/fastfetch/host/images/komodo.png | Bin .../core/fastfetch/host/images/nix.png | Bin .../core/fastfetch/host/images/proxmox.png | Bin .../core/fastfetch/host/images/proxy.png | Bin .../core/fastfetch/host/images/rune.png | Bin .../core/fastfetch/host/images/tonberry.png | Bin .../core/fastfetch/host/komodo.txt | 0 .../core/fastfetch/host/lxc.txt | 0 .../core/fastfetch/host/nix.txt | 0 .../core/fastfetch/host/proxy.txt | 0 .../core/fastfetch/host/rune.txt | 0 .../core/fastfetch/host/vm.txt | 0 .../core/fastfetch/scripts/gen.fish | 0 .../core/fastfetch/scripts/title.nix | 0 .../core/fastfetch/scripts/weather.nix | 0 .../common => global}/core/fish/default.nix | 0 .../core/fish/fish_variables | 0 .../common => global}/core/fish/init.fish | 0 home/{toph/common => global}/core/git.nix | 0 home/{toph/common => global}/core/ranger.nix | 0 home/{toph/common => global}/core/screen.nix | 0 home/{toph/common => global}/core/ssh.nix | 0 home/{toph/common => global}/core/zoxide.nix | 0 home/hosts/cloud/default.nix | 22 ++++++++++ home/{toph => hosts}/komodo/default.nix | 15 +++++-- home/hosts/lxc/default.nix | 22 ++++++++++ home/{toph => hosts}/nix/default.nix | 13 +++--- home/hosts/proxy/default.nix | 22 ++++++++++ home/{toph => hosts}/rune/config/default.nix | 0 home/{toph => hosts}/rune/config/monitors.xml | 0 home/{toph => hosts}/rune/default.nix | 20 ++++----- home/hosts/vm/default.nix | 39 ++++++++++++++++++ home/toph/cloud/default.nix | 10 ----- home/toph/lxc/default.nix | 10 ----- home/toph/proxy/default.nix | 16 ------- home/toph/vm/default.nix | 38 ----------------- home/users/cesar/config/default.nix | 7 ++++ home/users/cesar/default.nix | 12 ++++++ home/users/gio/config/default.nix | 7 ++++ home/users/gio/default.nix | 12 ++++++ home/users/toph/config/default.nix | 7 ++++ home/users/toph/default.nix | 12 ++++++ hosts/global/core/user.nix | 2 +- 71 files changed, 196 insertions(+), 94 deletions(-) rename home/{toph/common/optional => global/common}/browsers/chromium.nix (100%) rename home/{toph/common/optional => global/common}/browsers/default.nix (100%) rename home/{toph/common/optional => global/common}/browsers/zen.nix (100%) rename home/{toph/common/optional => global/common}/development/default.nix (100%) rename home/{toph/common/optional => global/common}/development/openssh.patch (100%) rename home/{toph/common/optional => global/common}/development/vscode.nix (100%) rename home/{toph/common/optional => global/common}/gaming/default.nix (100%) rename home/{toph/common/optional => global/common}/gaming/switch.nix (100%) rename home/{toph/common/optional => global/common}/gnome/dconf.nix (99%) rename home/{toph/common/optional => global/common}/gnome/default.nix (100%) rename home/{toph/common/optional => global/common}/gnome/programs/default.nix (100%) rename home/{toph/common/optional => global/common}/gnome/programs/ghostty.nix (100%) rename home/{toph/common/optional => global/common}/gnome/theme/default.nix (100%) rename home/{toph/common/optional => global/common}/gnome/theme/invincible.yaml (100%) rename home/{toph/common/optional => global/common}/gnome/theme/wallpapers/invincible.jpg (100%) rename home/{toph/common/optional => global/common}/gnome/theme/wallpapers/wallpaper.jpg (100%) rename home/{toph/common/optional => global/common}/vscode-server.nix (100%) rename home/{toph/common/optional => global/common}/xdg.nix (100%) rename home/{toph/common => global}/core/asdf.nix (100%) rename home/{toph/common => global}/core/bash.nix (100%) rename home/{toph/common => global}/core/bat.nix (100%) rename home/{toph/common => global}/core/default.nix (100%) rename home/{toph/common => global}/core/direnv.nix (100%) rename home/{toph/common => global}/core/fastfetch/default.nix (100%) rename home/{toph/common => global}/core/fastfetch/host/caenus.txt (100%) rename home/{toph/common => global}/core/fastfetch/host/cloud.txt (100%) rename home/{toph/common => global}/core/fastfetch/host/images/caenus.png (100%) rename home/{toph/common => global}/core/fastfetch/host/images/cloud.png (100%) rename home/{toph/common => global}/core/fastfetch/host/images/komodo.png (100%) rename home/{toph/common => global}/core/fastfetch/host/images/nix.png (100%) rename home/{toph/common => global}/core/fastfetch/host/images/proxmox.png (100%) rename home/{toph/common => global}/core/fastfetch/host/images/proxy.png (100%) rename home/{toph/common => global}/core/fastfetch/host/images/rune.png (100%) rename home/{toph/common => global}/core/fastfetch/host/images/tonberry.png (100%) rename home/{toph/common => global}/core/fastfetch/host/komodo.txt (100%) rename home/{toph/common => global}/core/fastfetch/host/lxc.txt (100%) rename home/{toph/common => global}/core/fastfetch/host/nix.txt (100%) rename home/{toph/common => global}/core/fastfetch/host/proxy.txt (100%) rename home/{toph/common => global}/core/fastfetch/host/rune.txt (100%) rename home/{toph/common => global}/core/fastfetch/host/vm.txt (100%) rename home/{toph/common => global}/core/fastfetch/scripts/gen.fish (100%) rename home/{toph/common => global}/core/fastfetch/scripts/title.nix (100%) rename home/{toph/common => global}/core/fastfetch/scripts/weather.nix (100%) rename home/{toph/common => global}/core/fish/default.nix (100%) rename home/{toph/common => global}/core/fish/fish_variables (100%) rename home/{toph/common => global}/core/fish/init.fish (100%) rename home/{toph/common => global}/core/git.nix (100%) rename home/{toph/common => global}/core/ranger.nix (100%) rename home/{toph/common => global}/core/screen.nix (100%) rename home/{toph/common => global}/core/ssh.nix (100%) rename home/{toph/common => global}/core/zoxide.nix (100%) create mode 100644 home/hosts/cloud/default.nix rename home/{toph => hosts}/komodo/default.nix (50%) create mode 100644 home/hosts/lxc/default.nix rename home/{toph => hosts}/nix/default.nix (51%) create mode 100644 home/hosts/proxy/default.nix rename home/{toph => hosts}/rune/config/default.nix (100%) rename home/{toph => hosts}/rune/config/monitors.xml (100%) rename home/{toph => hosts}/rune/default.nix (64%) create mode 100644 home/hosts/vm/default.nix delete mode 100644 home/toph/cloud/default.nix delete mode 100644 home/toph/lxc/default.nix delete mode 100644 home/toph/proxy/default.nix delete mode 100644 home/toph/vm/default.nix create mode 100644 home/users/cesar/config/default.nix create mode 100644 home/users/cesar/default.nix create mode 100644 home/users/gio/config/default.nix create mode 100644 home/users/gio/default.nix create mode 100644 home/users/toph/config/default.nix create mode 100644 home/users/toph/default.nix diff --git a/home/toph/common/optional/browsers/chromium.nix b/home/global/common/browsers/chromium.nix similarity index 100% rename from home/toph/common/optional/browsers/chromium.nix rename to home/global/common/browsers/chromium.nix diff --git a/home/toph/common/optional/browsers/default.nix b/home/global/common/browsers/default.nix similarity index 100% rename from home/toph/common/optional/browsers/default.nix rename to home/global/common/browsers/default.nix diff --git a/home/toph/common/optional/browsers/zen.nix b/home/global/common/browsers/zen.nix similarity index 100% rename from home/toph/common/optional/browsers/zen.nix rename to home/global/common/browsers/zen.nix diff --git a/home/toph/common/optional/development/default.nix b/home/global/common/development/default.nix similarity index 100% rename from home/toph/common/optional/development/default.nix rename to home/global/common/development/default.nix diff --git a/home/toph/common/optional/development/openssh.patch b/home/global/common/development/openssh.patch similarity index 100% rename from home/toph/common/optional/development/openssh.patch rename to home/global/common/development/openssh.patch diff --git a/home/toph/common/optional/development/vscode.nix b/home/global/common/development/vscode.nix similarity index 100% rename from home/toph/common/optional/development/vscode.nix rename to home/global/common/development/vscode.nix diff --git a/home/toph/common/optional/gaming/default.nix b/home/global/common/gaming/default.nix similarity index 100% rename from home/toph/common/optional/gaming/default.nix rename to home/global/common/gaming/default.nix diff --git a/home/toph/common/optional/gaming/switch.nix b/home/global/common/gaming/switch.nix similarity index 100% rename from home/toph/common/optional/gaming/switch.nix rename to home/global/common/gaming/switch.nix diff --git a/home/toph/common/optional/gnome/dconf.nix b/home/global/common/gnome/dconf.nix similarity index 99% rename from home/toph/common/optional/gnome/dconf.nix rename to home/global/common/gnome/dconf.nix index 621172d..bc73ca6 100644 --- a/home/toph/common/optional/gnome/dconf.nix +++ b/home/global/common/gnome/dconf.nix @@ -108,6 +108,10 @@ with lib.hm.gvariant; num-workspaces = 3; }; + "org/gnome/mutter" = { + experimental-features = [ "scale-monitor-framebuffer" ]; + }; + "org/gnome/nautilus/preferences" = { default-folder-viewer = "icon-view"; migrated-gtk-settings = true; diff --git a/home/toph/common/optional/gnome/default.nix b/home/global/common/gnome/default.nix similarity index 100% rename from home/toph/common/optional/gnome/default.nix rename to home/global/common/gnome/default.nix diff --git a/home/toph/common/optional/gnome/programs/default.nix b/home/global/common/gnome/programs/default.nix similarity index 100% rename from home/toph/common/optional/gnome/programs/default.nix rename to home/global/common/gnome/programs/default.nix diff --git a/home/toph/common/optional/gnome/programs/ghostty.nix b/home/global/common/gnome/programs/ghostty.nix similarity index 100% rename from home/toph/common/optional/gnome/programs/ghostty.nix rename to home/global/common/gnome/programs/ghostty.nix diff --git a/home/toph/common/optional/gnome/theme/default.nix b/home/global/common/gnome/theme/default.nix similarity index 100% rename from home/toph/common/optional/gnome/theme/default.nix rename to home/global/common/gnome/theme/default.nix diff --git a/home/toph/common/optional/gnome/theme/invincible.yaml b/home/global/common/gnome/theme/invincible.yaml similarity index 100% rename from home/toph/common/optional/gnome/theme/invincible.yaml rename to home/global/common/gnome/theme/invincible.yaml diff --git a/home/toph/common/optional/gnome/theme/wallpapers/invincible.jpg b/home/global/common/gnome/theme/wallpapers/invincible.jpg similarity index 100% rename from home/toph/common/optional/gnome/theme/wallpapers/invincible.jpg rename to home/global/common/gnome/theme/wallpapers/invincible.jpg diff --git a/home/toph/common/optional/gnome/theme/wallpapers/wallpaper.jpg b/home/global/common/gnome/theme/wallpapers/wallpaper.jpg similarity index 100% rename from home/toph/common/optional/gnome/theme/wallpapers/wallpaper.jpg rename to home/global/common/gnome/theme/wallpapers/wallpaper.jpg diff --git a/home/toph/common/optional/vscode-server.nix b/home/global/common/vscode-server.nix similarity index 100% rename from home/toph/common/optional/vscode-server.nix rename to home/global/common/vscode-server.nix diff --git a/home/toph/common/optional/xdg.nix b/home/global/common/xdg.nix similarity index 100% rename from home/toph/common/optional/xdg.nix rename to home/global/common/xdg.nix diff --git a/home/toph/common/core/asdf.nix b/home/global/core/asdf.nix similarity index 100% rename from home/toph/common/core/asdf.nix rename to home/global/core/asdf.nix diff --git a/home/toph/common/core/bash.nix b/home/global/core/bash.nix similarity index 100% rename from home/toph/common/core/bash.nix rename to home/global/core/bash.nix diff --git a/home/toph/common/core/bat.nix b/home/global/core/bat.nix similarity index 100% rename from home/toph/common/core/bat.nix rename to home/global/core/bat.nix diff --git a/home/toph/common/core/default.nix b/home/global/core/default.nix similarity index 100% rename from home/toph/common/core/default.nix rename to home/global/core/default.nix diff --git a/home/toph/common/core/direnv.nix b/home/global/core/direnv.nix similarity index 100% rename from home/toph/common/core/direnv.nix rename to home/global/core/direnv.nix diff --git a/home/toph/common/core/fastfetch/default.nix b/home/global/core/fastfetch/default.nix similarity index 100% rename from home/toph/common/core/fastfetch/default.nix rename to home/global/core/fastfetch/default.nix diff --git a/home/toph/common/core/fastfetch/host/caenus.txt b/home/global/core/fastfetch/host/caenus.txt similarity index 100% rename from home/toph/common/core/fastfetch/host/caenus.txt rename to home/global/core/fastfetch/host/caenus.txt diff --git a/home/toph/common/core/fastfetch/host/cloud.txt b/home/global/core/fastfetch/host/cloud.txt similarity index 100% rename from home/toph/common/core/fastfetch/host/cloud.txt rename to home/global/core/fastfetch/host/cloud.txt diff --git a/home/toph/common/core/fastfetch/host/images/caenus.png b/home/global/core/fastfetch/host/images/caenus.png similarity index 100% rename from home/toph/common/core/fastfetch/host/images/caenus.png rename to home/global/core/fastfetch/host/images/caenus.png diff --git a/home/toph/common/core/fastfetch/host/images/cloud.png b/home/global/core/fastfetch/host/images/cloud.png similarity index 100% rename from home/toph/common/core/fastfetch/host/images/cloud.png rename to home/global/core/fastfetch/host/images/cloud.png diff --git a/home/toph/common/core/fastfetch/host/images/komodo.png b/home/global/core/fastfetch/host/images/komodo.png similarity index 100% rename from home/toph/common/core/fastfetch/host/images/komodo.png rename to home/global/core/fastfetch/host/images/komodo.png diff --git a/home/toph/common/core/fastfetch/host/images/nix.png b/home/global/core/fastfetch/host/images/nix.png similarity index 100% rename from home/toph/common/core/fastfetch/host/images/nix.png rename to home/global/core/fastfetch/host/images/nix.png diff --git a/home/toph/common/core/fastfetch/host/images/proxmox.png b/home/global/core/fastfetch/host/images/proxmox.png similarity index 100% rename from home/toph/common/core/fastfetch/host/images/proxmox.png rename to home/global/core/fastfetch/host/images/proxmox.png diff --git a/home/toph/common/core/fastfetch/host/images/proxy.png b/home/global/core/fastfetch/host/images/proxy.png similarity index 100% rename from home/toph/common/core/fastfetch/host/images/proxy.png rename to home/global/core/fastfetch/host/images/proxy.png diff --git a/home/toph/common/core/fastfetch/host/images/rune.png b/home/global/core/fastfetch/host/images/rune.png similarity index 100% rename from home/toph/common/core/fastfetch/host/images/rune.png rename to home/global/core/fastfetch/host/images/rune.png diff --git a/home/toph/common/core/fastfetch/host/images/tonberry.png b/home/global/core/fastfetch/host/images/tonberry.png similarity index 100% rename from home/toph/common/core/fastfetch/host/images/tonberry.png rename to home/global/core/fastfetch/host/images/tonberry.png diff --git a/home/toph/common/core/fastfetch/host/komodo.txt b/home/global/core/fastfetch/host/komodo.txt similarity index 100% rename from home/toph/common/core/fastfetch/host/komodo.txt rename to home/global/core/fastfetch/host/komodo.txt diff --git a/home/toph/common/core/fastfetch/host/lxc.txt b/home/global/core/fastfetch/host/lxc.txt similarity index 100% rename from home/toph/common/core/fastfetch/host/lxc.txt rename to home/global/core/fastfetch/host/lxc.txt diff --git a/home/toph/common/core/fastfetch/host/nix.txt b/home/global/core/fastfetch/host/nix.txt similarity index 100% rename from home/toph/common/core/fastfetch/host/nix.txt rename to home/global/core/fastfetch/host/nix.txt diff --git a/home/toph/common/core/fastfetch/host/proxy.txt b/home/global/core/fastfetch/host/proxy.txt similarity index 100% rename from home/toph/common/core/fastfetch/host/proxy.txt rename to home/global/core/fastfetch/host/proxy.txt diff --git a/home/toph/common/core/fastfetch/host/rune.txt b/home/global/core/fastfetch/host/rune.txt similarity index 100% rename from home/toph/common/core/fastfetch/host/rune.txt rename to home/global/core/fastfetch/host/rune.txt diff --git a/home/toph/common/core/fastfetch/host/vm.txt b/home/global/core/fastfetch/host/vm.txt similarity index 100% rename from home/toph/common/core/fastfetch/host/vm.txt rename to home/global/core/fastfetch/host/vm.txt diff --git a/home/toph/common/core/fastfetch/scripts/gen.fish b/home/global/core/fastfetch/scripts/gen.fish similarity index 100% rename from home/toph/common/core/fastfetch/scripts/gen.fish rename to home/global/core/fastfetch/scripts/gen.fish diff --git a/home/toph/common/core/fastfetch/scripts/title.nix b/home/global/core/fastfetch/scripts/title.nix similarity index 100% rename from home/toph/common/core/fastfetch/scripts/title.nix rename to home/global/core/fastfetch/scripts/title.nix diff --git a/home/toph/common/core/fastfetch/scripts/weather.nix b/home/global/core/fastfetch/scripts/weather.nix similarity index 100% rename from home/toph/common/core/fastfetch/scripts/weather.nix rename to home/global/core/fastfetch/scripts/weather.nix diff --git a/home/toph/common/core/fish/default.nix b/home/global/core/fish/default.nix similarity index 100% rename from home/toph/common/core/fish/default.nix rename to home/global/core/fish/default.nix diff --git a/home/toph/common/core/fish/fish_variables b/home/global/core/fish/fish_variables similarity index 100% rename from home/toph/common/core/fish/fish_variables rename to home/global/core/fish/fish_variables diff --git a/home/toph/common/core/fish/init.fish b/home/global/core/fish/init.fish similarity index 100% rename from home/toph/common/core/fish/init.fish rename to home/global/core/fish/init.fish diff --git a/home/toph/common/core/git.nix b/home/global/core/git.nix similarity index 100% rename from home/toph/common/core/git.nix rename to home/global/core/git.nix diff --git a/home/toph/common/core/ranger.nix b/home/global/core/ranger.nix similarity index 100% rename from home/toph/common/core/ranger.nix rename to home/global/core/ranger.nix diff --git a/home/toph/common/core/screen.nix b/home/global/core/screen.nix similarity index 100% rename from home/toph/common/core/screen.nix rename to home/global/core/screen.nix diff --git a/home/toph/common/core/ssh.nix b/home/global/core/ssh.nix similarity index 100% rename from home/toph/common/core/ssh.nix rename to home/global/core/ssh.nix diff --git a/home/toph/common/core/zoxide.nix b/home/global/core/zoxide.nix similarity index 100% rename from home/toph/common/core/zoxide.nix rename to home/global/core/zoxide.nix diff --git a/home/hosts/cloud/default.nix b/home/hosts/cloud/default.nix new file mode 100644 index 0000000..ac1a2c0 --- /dev/null +++ b/home/hosts/cloud/default.nix @@ -0,0 +1,22 @@ +{ + lib, + pkgs, + ... +}: +{ + # imports = lib.flatten [ + # ## Common Imports ## + # (map lib.custom.relativeToRoot [ + # "home/global/common/development" + # ]) + + # ## Cloud Specific ## + # ./config + # ]; + + ## Packages with no needed configs ## + # home.packages = builtins.attrValues { + # inherit (pkgs) + # ; + # }; +} diff --git a/home/toph/komodo/default.nix b/home/hosts/komodo/default.nix similarity index 50% rename from home/toph/komodo/default.nix rename to home/hosts/komodo/default.nix index f9d3b59..b7351f1 100644 --- a/home/toph/komodo/default.nix +++ b/home/hosts/komodo/default.nix @@ -1,13 +1,20 @@ { + lib, pkgs, config, ... }: { - imports = [ - ## Required Configs ## - ../common/core # required - ]; + + # imports = lib.flatten [ + # ## Common Imports ## + # (map lib.custom.relativeToRoot [ + # "home/global/common/development" + # ]) + + # ## Komodo Specific ## + # ./config + # ]; home.file = { Pool.source = config.lib.file.mkOutOfStoreSymlink "/pool"; diff --git a/home/hosts/lxc/default.nix b/home/hosts/lxc/default.nix new file mode 100644 index 0000000..f2efa6f --- /dev/null +++ b/home/hosts/lxc/default.nix @@ -0,0 +1,22 @@ +{ + lib, + pkgs, + ... +}: +{ + # imports = lib.flatten [ + # ## Common Imports ## + # (map lib.custom.relativeToRoot [ + # "home/global/common/development" + # ]) + + # ## Proxy Specific ## + # ./config + # ]; + + ## Packages with no needed configs ## + # home.packages = builtins.attrValues { + # inherit (pkgs) + # ; + # }; +} diff --git a/home/toph/nix/default.nix b/home/hosts/nix/default.nix similarity index 51% rename from home/toph/nix/default.nix rename to home/hosts/nix/default.nix index 337d89c..d2dbee1 100644 --- a/home/toph/nix/default.nix +++ b/home/hosts/nix/default.nix @@ -1,14 +1,17 @@ { + lib, pkgs, ... }: { - imports = [ - ## Required Configs ## - ../common/core # required + imports = lib.flatten [ + ## Common Imports ## + (map lib.custom.relativeToRoot [ + "home/global/common/vscode-server.nix" + ]) - ## Host-specific Optional Configs ## - ../common/optional/vscode-server.nix + ## Nix Specific ## + # ./config ]; ## Packages with no needed configs ## diff --git a/home/hosts/proxy/default.nix b/home/hosts/proxy/default.nix new file mode 100644 index 0000000..f2efa6f --- /dev/null +++ b/home/hosts/proxy/default.nix @@ -0,0 +1,22 @@ +{ + lib, + pkgs, + ... +}: +{ + # imports = lib.flatten [ + # ## Common Imports ## + # (map lib.custom.relativeToRoot [ + # "home/global/common/development" + # ]) + + # ## Proxy Specific ## + # ./config + # ]; + + ## Packages with no needed configs ## + # home.packages = builtins.attrValues { + # inherit (pkgs) + # ; + # }; +} diff --git a/home/toph/rune/config/default.nix b/home/hosts/rune/config/default.nix similarity index 100% rename from home/toph/rune/config/default.nix rename to home/hosts/rune/config/default.nix diff --git a/home/toph/rune/config/monitors.xml b/home/hosts/rune/config/monitors.xml similarity index 100% rename from home/toph/rune/config/monitors.xml rename to home/hosts/rune/config/monitors.xml diff --git a/home/toph/rune/default.nix b/home/hosts/rune/default.nix similarity index 64% rename from home/toph/rune/default.nix rename to home/hosts/rune/default.nix index 1b5c125..afbf4df 100644 --- a/home/toph/rune/default.nix +++ b/home/hosts/rune/default.nix @@ -1,20 +1,20 @@ { pkgs, + lib, inputs, config, ... }: { - imports = [ - ## Required Configs ## - ../common/core # required - - ## Optional Configs ## - ../common/optional/browsers - ../common/optional/gnome - ../common/optional/development - ../common/optional/gaming - ../common/optional/xdg.nix + imports = lib.flatten [ + ## Common Imports ## + (map lib.custom.relativeToRoot [ + "home/global/common/browsers" + "home/global/common/gnome" + "home/global/common/development" + "home/global/common/gaming" + "home/global/common/xdg.nix" + ]) ## Rune Specific ## ./config diff --git a/home/hosts/vm/default.nix b/home/hosts/vm/default.nix new file mode 100644 index 0000000..3afbf1f --- /dev/null +++ b/home/hosts/vm/default.nix @@ -0,0 +1,39 @@ +{ + lib, + pkgs, + ... +}: +{ + imports = lib.flatten [ + ## Common Imports ## + (map lib.custom.relativeToRoot [ + "home/global/common/browsers" + "home/global/common/gnome" + "home/global/common/development" + "home/global/common/vscode-server.nix" + "home/global/common/xdg.nix" + ]) + + ## VM Specific ## + # ./config + ]; + + ## Packages with no needed configs ## + home.packages = builtins.attrValues { + inherit (pkgs) + ## Tools ## + inspector + foot + ; + }; + + monitors = [ + { + name = "Virtual-1"; + width = 2560; + height = 1440; + refreshRate = 60; + primary = true; + } + ]; +} diff --git a/home/toph/cloud/default.nix b/home/toph/cloud/default.nix deleted file mode 100644 index fef0923..0000000 --- a/home/toph/cloud/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - pkgs, - ... -}: -{ - imports = [ - ## Required Configs ## - ../common/core # required - ]; -} diff --git a/home/toph/lxc/default.nix b/home/toph/lxc/default.nix deleted file mode 100644 index fef0923..0000000 --- a/home/toph/lxc/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - pkgs, - ... -}: -{ - imports = [ - ## Required Configs ## - ../common/core # required - ]; -} diff --git a/home/toph/proxy/default.nix b/home/toph/proxy/default.nix deleted file mode 100644 index 1ba8200..0000000 --- a/home/toph/proxy/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - pkgs, - ... -}: -{ - imports = [ - ## Required Configs ## - ../common/core # required - ]; - - ## Packages with no needed configs ## - # home.packages = builtins.attrValues { - # inherit (pkgs) - # ; - # }; -} diff --git a/home/toph/vm/default.nix b/home/toph/vm/default.nix deleted file mode 100644 index ac8308e..0000000 --- a/home/toph/vm/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - pkgs, - ... -}: -{ - imports = [ - ## Required Configs ## - ../common/core # required - - ## Host-specific Optional Configs ## - ../common/optional/browsers - # ../common/optional/gnome - ../common/optional/hyprland - ../common/optional/development - # ../common/optional/gaming - ../common/optional/vscode-server.nix - ../common/optional/xdg.nix # file associations - ]; - - ## Packages with no needed configs ## - home.packages = builtins.attrValues { - inherit (pkgs) - ## Tools ## - inspector - foot - ; - }; - - monitors = [ - { - name = "Virtual-1"; - width = 2560; - height = 1440; - refreshRate = 60; - primary = true; - } - ]; -} diff --git a/home/users/cesar/config/default.nix b/home/users/cesar/config/default.nix new file mode 100644 index 0000000..a914702 --- /dev/null +++ b/home/users/cesar/config/default.nix @@ -0,0 +1,7 @@ +{ + lib, + ... +}: +{ + imports = lib.custom.scanPaths ./.; +} diff --git a/home/users/cesar/default.nix b/home/users/cesar/default.nix new file mode 100644 index 0000000..4153016 --- /dev/null +++ b/home/users/cesar/default.nix @@ -0,0 +1,12 @@ +{ + lib, + hostSpec, + ... +}: +{ + imports = [ + (lib.custom.relativeToRoot "home/global/core") + ./config + (lib.custom.relativeToRoot "home/hosts/${hostSpec.hostName}") + ]; +} diff --git a/home/users/gio/config/default.nix b/home/users/gio/config/default.nix new file mode 100644 index 0000000..a914702 --- /dev/null +++ b/home/users/gio/config/default.nix @@ -0,0 +1,7 @@ +{ + lib, + ... +}: +{ + imports = lib.custom.scanPaths ./.; +} diff --git a/home/users/gio/default.nix b/home/users/gio/default.nix new file mode 100644 index 0000000..4153016 --- /dev/null +++ b/home/users/gio/default.nix @@ -0,0 +1,12 @@ +{ + lib, + hostSpec, + ... +}: +{ + imports = [ + (lib.custom.relativeToRoot "home/global/core") + ./config + (lib.custom.relativeToRoot "home/hosts/${hostSpec.hostName}") + ]; +} diff --git a/home/users/toph/config/default.nix b/home/users/toph/config/default.nix new file mode 100644 index 0000000..a914702 --- /dev/null +++ b/home/users/toph/config/default.nix @@ -0,0 +1,7 @@ +{ + lib, + ... +}: +{ + imports = lib.custom.scanPaths ./.; +} diff --git a/home/users/toph/default.nix b/home/users/toph/default.nix new file mode 100644 index 0000000..4153016 --- /dev/null +++ b/home/users/toph/default.nix @@ -0,0 +1,12 @@ +{ + lib, + hostSpec, + ... +}: +{ + imports = [ + (lib.custom.relativeToRoot "home/global/core") + ./config + (lib.custom.relativeToRoot "home/hosts/${hostSpec.hostName}") + ]; +} diff --git a/hosts/global/core/user.nix b/hosts/global/core/user.nix index 608cba2..76e1a3a 100644 --- a/hosts/global/core/user.nix +++ b/hosts/global/core/user.nix @@ -88,7 +88,7 @@ in imports = [ ( { config, ... }: - import (lib.custom.relativeToRoot "home/${username}/${hostSpec.hostName}") { + import (lib.custom.relativeToRoot "home/users/${username}") { inherit config hostSpec