From 98ce77421043f923b36989d82a385fb5762a32aa Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Sat, 21 Dec 2024 23:32:29 +0200 Subject: [PATCH] Reorganize imports Signed-off-by: Nikolaos Karaolidis --- README.md | 19 +-- flake.nix | 8 +- .../system}/bluetooth/default.nix | 0 .../system}/boot/default.nix | 0 .../system}/brightnessctl/default.nix | 0 .../system}/btop/default.nix | 0 .../system}/btrfs/default.nix | 0 .../system}/cpu/default.nix | 0 .../system}/cpu/options.nix | 0 .../system}/docker/default.nix | 0 .../system}/fastfetch/default.nix | 0 .../system}/getty/default.nix | 0 .../system}/git/default.nix | 0 .../system}/gpg-agent/default.nix | 0 .../system}/impermanence/default.nix | 0 .../system}/impermanence/options.nix | 0 .../system}/impermanence/scripts/start.sh | 0 .../system}/impermanence/scripts/stop.sh | 0 .../system}/impermanence/scripts/wipe.sh | 0 .../system}/libvirt/default.nix | 0 .../system}/lsof/default.nix | 0 .../system}/ncdu/default.nix | 0 .../system}/neovim/default.nix | 0 .../system}/networking/default.nix | 0 .../system}/nix-cleanup/cleanup.sh | 0 .../system}/nix-cleanup/default.nix | 0 .../system}/nix-ld/default.nix | 0 .../system}/nix/default.nix | 0 .../system}/nixpkgs/default.nix | 0 .../system}/ntp/default.nix | 0 .../system}/pipewire/default.nix | 0 .../system}/plymouth/default.nix | 0 .../system}/powertop/default.nix | 0 .../system}/printing/default.nix | 0 .../system}/ranger/default.nix | 0 .../system}/sops/default.nix | 0 .../system}/ssh/default.nix | 0 .../system}/system/default.nix | 0 .../system}/timezone/default.nix | 0 .../system}/timezone/timezone.sh | 0 .../system}/tlp/default.nix | 0 .../system}/tmux/default.nix | 0 .../system}/tree/default.nix | 0 .../system}/users/default.nix | 0 .../system}/wget/default.nix | 0 .../system}/zsh/default.nix | 0 .../user}/console/android/default.nix | 0 .../console/android/env-var-user-home.patch | 0 .../user}/console/bashmount/default.nix | 0 .../user}/console/bluetooth/default.nix | 0 .../user}/console/brightnessctl/default.nix | 0 .../user}/console/btop/default.nix | 0 .../user}/console/docker/default.nix | 0 .../user}/console/fastfetch/default.nix | 0 .../user}/console/ffmpeg/default.nix | 0 .../user}/console/git/commit-msg.sh | 0 .../user}/console/git/default.nix | 0 .../user}/console/gpg-agent/default.nix | 0 .../console/gpg-agent/import-gpg-keys.sh | 0 .../user}/console/home-manager/default.nix | 0 .../user}/console/imagemagick/default.nix | 0 .../user}/console/libvirt/default.nix | 0 .../user}/console/ncdu/default.nix | 0 .../user}/console/neovim/default.nix | 0 .../user}/console/nix-develop/default.nix | 0 .../user}/console/nix-direnv/default.nix | 0 .../user}/console/nixpkgs/default.nix | 0 .../user}/console/pipewire/default.nix | 0 .../user}/console/ranger/default.nix | 0 .../user}/console/sops/default.nix | 0 .../user}/console/ssh/default.nix | 0 .../user}/console/syncthing/default.nix | 0 .../user}/console/tmux/default.nix | 0 .../user}/console/tree/default.nix | 0 .../user}/console/wget/default.nix | 0 .../user}/console/xdg/default.nix | 0 .../user}/console/xdg/options.nix | 0 .../user}/console/yt-dlp/default.nix | 0 .../user}/console/zsh/.p10k.zsh | 0 .../user}/console/zsh/default.nix | 0 .../user}/gui/astal/config/.gitignore | 0 .../user}/gui/astal/config/app.ts | 0 .../user}/gui/astal/config/env.d.ts | 0 .../user}/gui/astal/config/lib.ts | 0 .../user}/gui/astal/config/tsconfig.json | 0 .../user}/gui/astal/config/widget/Bar.tsx | 0 .../astal/config/widget/components/Date.tsx | 0 .../config/widget/components/Launcher.tsx | 0 .../astal/config/widget/components/Tray.tsx | 0 .../config/widget/components/Workspaces.tsx | 0 .../user}/gui/astal/default.nix | 0 .../user}/gui/astal/theme.sass | 0 .../user}/gui/bluetooth/default.nix | 0 .../user}/gui/brightnessctl/default.nix | 0 .../user}/gui/btop/default.nix | 0 .../user}/gui/btop/theme.theme | 0 .../user}/gui/cbatticon/default.nix | 0 .../user}/gui/chromium/default.nix | 0 .../user}/gui/cliphist/default.nix | 0 .../user}/gui/cliphist/rofi.nix | 0 .../user}/gui/cliphist/scripts/copy.sh | 0 .../user}/gui/cliphist/scripts/delete.sh | 0 .../darktable/better-copy-and-import.patch | 0 .../user}/gui/darktable/default.nix | 0 .../user}/gui/discord/default.nix | 0 .../user}/gui/discord/readonly-fix.patch | 0 .../user}/gui/discord/theme.css | 0 .../user}/gui/emoji/default.nix | 0 .../user}/gui/firefox/default.nix | 0 .../user}/gui/gaming/default.nix | 0 .../user}/gui/gaming/scripts/steam-ln.sh | 0 .../user}/gui/gtk/default.nix | 0 .../user}/gui/gtk/theme.css | 0 .../user}/gui/hyprland/default.nix | 0 .../user}/gui/hyprland/options.nix | 0 .../user}/gui/hyprland/theme.conf | 0 .../user}/gui/hyprshot/default.nix | 0 .../user}/gui/kitty/default.nix | 0 .../user}/gui/kitty/theme.conf | 0 .../user}/gui/libreoffice/default.nix | 0 .../user}/gui/networking/default.nix | 0 .../user}/gui/obs/default.nix | 0 .../user}/gui/obs/options.nix | 0 .../user}/gui/obsidian/config/.stignore | 0 .../plugins/better-word-count/default.nix | 0 .../better-word-count/package-lock.patch | 0 .../config/plugins/custom-sort/default.nix | 0 .../config/plugins/dataview/default.nix | 0 .../plugins/dataview/package-lock.patch | 0 .../config/plugins/excalidraw/default.nix | 0 .../config/plugins/folder-note/default.nix | 0 .../config/plugins/kanban/default.nix | 0 .../config/plugins/languagetool/default.nix | 0 .../languagetool/settings-notification.patch | 0 .../config/plugins/linter/default.nix | 0 .../config/plugins/map-view/default.nix | 0 .../plugins/minimal-settings/default.nix | 0 .../config/plugins/outliner/default.nix | 0 .../config/plugins/read-it-later/default.nix | 0 .../config/plugins/style-settings/default.nix | 0 .../obsidian/config/plugins/tasks/default.nix | 0 .../plugins/url-into-selection/default.nix | 0 .../snippets/file-explorer-separators.css | 0 .../config/themes/minimal/default.nix | 0 .../user}/gui/obsidian/default.nix | 0 .../user}/gui/obsidian/options.nix | 0 .../user}/gui/obsidian/theme.json | 0 .../user}/gui/openlens/default.nix | 0 .../user}/gui/openlens/package.nix | 0 .../user}/gui/pipewire/default.nix | 0 .../user}/gui/qalculate/default.nix | 0 .../user}/gui/qt/KvAdwQt/KvAdwQt.kvconfig | 0 .../user}/gui/qt/KvAdwQt/KvAdwQt.svg | 0 .../user}/gui/qt/default.nix | 0 .../user}/gui/rofi/default.nix | 0 .../user}/gui/spicetify/colors.css | 0 .../user}/gui/spicetify/config/prefs | 0 .../user}/gui/spicetify/config/prefs-user | 0 .../user}/gui/spicetify/default.nix | 0 .../user}/gui/spicetify/user-colors.patch | 0 .../user}/gui/swww/default.nix | 0 .../user}/gui/theme/default.nix | 0 .../user}/gui/theme/options.nix | 0 .../user}/gui/theme/theme.sh | 0 .../user}/gui/transmission/default.nix | 0 .../user}/gui/vscode/default.nix | 0 .../user}/gui/vscode/langs/c/default.nix | 0 .../user}/gui/vscode/langs/nix/default.nix | 0 .../user}/gui/vscode/langs/python/default.nix | 0 .../user}/gui/vscode/langs/svelte/default.nix | 0 .../user}/gui/wev/default.nix | 0 .../user}/gui/x11/default.nix | 0 .../user}/gui/xdg/default.nix | 0 .../configs => configs/user}/options.nix | 0 .../{system => }/shells/bun/default.nix | 0 .../{system => }/shells/nix/default.nix | 0 .../{system => }/shells/nodejs/default.nix | 0 .../{system => }/shells/python/default.nix | 0 .../{ => configs}/system/scripts/card.sh | 0 .../{ => configs}/system/scripts/mouse.sh | 0 hosts/eirene/default.nix | 74 +++++------ hosts/eirene/hardware.nix | 4 +- hosts/eirene/users/nick/default.nix | 124 +++++++++--------- hosts/elara/default.nix | 72 +++++----- hosts/elara/users/nikara/default.nix | 110 ++++++++-------- hosts/installer/default.nix | 54 ++++---- hosts/installer/users/nick/default.nix | 40 +++--- lib/scripts/add-host.sh | 4 +- lib/scripts/remove-host.sh | 4 +- 189 files changed, 253 insertions(+), 260 deletions(-) rename hosts/common/{system/configs => configs/system}/bluetooth/default.nix (100%) rename hosts/common/{system/configs => configs/system}/boot/default.nix (100%) rename hosts/common/{system/configs => configs/system}/brightnessctl/default.nix (100%) rename hosts/common/{system/configs => configs/system}/btop/default.nix (100%) rename hosts/common/{system/configs => configs/system}/btrfs/default.nix (100%) rename hosts/common/{system/configs => configs/system}/cpu/default.nix (100%) rename hosts/common/{system/configs => configs/system}/cpu/options.nix (100%) rename hosts/common/{system/configs => configs/system}/docker/default.nix (100%) rename hosts/common/{system/configs => configs/system}/fastfetch/default.nix (100%) rename hosts/common/{system/configs => configs/system}/getty/default.nix (100%) rename hosts/common/{system/configs => configs/system}/git/default.nix (100%) rename hosts/common/{system/configs => configs/system}/gpg-agent/default.nix (100%) rename hosts/common/{system/configs => configs/system}/impermanence/default.nix (100%) rename hosts/common/{system/configs => configs/system}/impermanence/options.nix (100%) rename hosts/common/{system/configs => configs/system}/impermanence/scripts/start.sh (100%) rename hosts/common/{system/configs => configs/system}/impermanence/scripts/stop.sh (100%) rename hosts/common/{system/configs => configs/system}/impermanence/scripts/wipe.sh (100%) rename hosts/common/{system/configs => configs/system}/libvirt/default.nix (100%) rename hosts/common/{system/configs => configs/system}/lsof/default.nix (100%) rename hosts/common/{system/configs => configs/system}/ncdu/default.nix (100%) rename hosts/common/{system/configs => configs/system}/neovim/default.nix (100%) rename hosts/common/{system/configs => configs/system}/networking/default.nix (100%) rename hosts/common/{system/configs => configs/system}/nix-cleanup/cleanup.sh (100%) rename hosts/common/{system/configs => configs/system}/nix-cleanup/default.nix (100%) rename hosts/common/{system/configs => configs/system}/nix-ld/default.nix (100%) rename hosts/common/{system/configs => configs/system}/nix/default.nix (100%) rename hosts/common/{system/configs => configs/system}/nixpkgs/default.nix (100%) rename hosts/common/{system/configs => configs/system}/ntp/default.nix (100%) rename hosts/common/{system/configs => configs/system}/pipewire/default.nix (100%) rename hosts/common/{system/configs => configs/system}/plymouth/default.nix (100%) rename hosts/common/{system/configs => configs/system}/powertop/default.nix (100%) rename hosts/common/{system/configs => configs/system}/printing/default.nix (100%) rename hosts/common/{system/configs => configs/system}/ranger/default.nix (100%) rename hosts/common/{system/configs => configs/system}/sops/default.nix (100%) rename hosts/common/{system/configs => configs/system}/ssh/default.nix (100%) rename hosts/common/{system/configs => configs/system}/system/default.nix (100%) rename hosts/common/{system/configs => configs/system}/timezone/default.nix (100%) rename hosts/common/{system/configs => configs/system}/timezone/timezone.sh (100%) rename hosts/common/{system/configs => configs/system}/tlp/default.nix (100%) rename hosts/common/{system/configs => configs/system}/tmux/default.nix (100%) rename hosts/common/{system/configs => configs/system}/tree/default.nix (100%) rename hosts/common/{system/configs => configs/system}/users/default.nix (100%) rename hosts/common/{system/configs => configs/system}/wget/default.nix (100%) rename hosts/common/{system/configs => configs/system}/zsh/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/android/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/android/env-var-user-home.patch (100%) rename hosts/common/{user/configs => configs/user}/console/bashmount/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/bluetooth/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/brightnessctl/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/btop/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/docker/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/fastfetch/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/ffmpeg/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/git/commit-msg.sh (100%) rename hosts/common/{user/configs => configs/user}/console/git/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/gpg-agent/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/gpg-agent/import-gpg-keys.sh (100%) rename hosts/common/{user/configs => configs/user}/console/home-manager/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/imagemagick/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/libvirt/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/ncdu/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/neovim/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/nix-develop/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/nix-direnv/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/nixpkgs/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/pipewire/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/ranger/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/sops/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/ssh/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/syncthing/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/tmux/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/tree/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/wget/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/xdg/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/xdg/options.nix (100%) rename hosts/common/{user/configs => configs/user}/console/yt-dlp/default.nix (100%) rename hosts/common/{user/configs => configs/user}/console/zsh/.p10k.zsh (100%) rename hosts/common/{user/configs => configs/user}/console/zsh/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/.gitignore (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/app.ts (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/env.d.ts (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/lib.ts (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/tsconfig.json (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/widget/Bar.tsx (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/widget/components/Date.tsx (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/widget/components/Launcher.tsx (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/widget/components/Tray.tsx (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/config/widget/components/Workspaces.tsx (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/astal/theme.sass (100%) rename hosts/common/{user/configs => configs/user}/gui/bluetooth/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/brightnessctl/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/btop/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/btop/theme.theme (100%) rename hosts/common/{user/configs => configs/user}/gui/cbatticon/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/chromium/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/cliphist/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/cliphist/rofi.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/cliphist/scripts/copy.sh (100%) rename hosts/common/{user/configs => configs/user}/gui/cliphist/scripts/delete.sh (100%) rename hosts/common/{user/configs => configs/user}/gui/darktable/better-copy-and-import.patch (100%) rename hosts/common/{user/configs => configs/user}/gui/darktable/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/discord/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/discord/readonly-fix.patch (100%) rename hosts/common/{user/configs => configs/user}/gui/discord/theme.css (100%) rename hosts/common/{user/configs => configs/user}/gui/emoji/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/firefox/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/gaming/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/gaming/scripts/steam-ln.sh (100%) rename hosts/common/{user/configs => configs/user}/gui/gtk/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/gtk/theme.css (100%) rename hosts/common/{user/configs => configs/user}/gui/hyprland/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/hyprland/options.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/hyprland/theme.conf (100%) rename hosts/common/{user/configs => configs/user}/gui/hyprshot/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/kitty/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/kitty/theme.conf (100%) rename hosts/common/{user/configs => configs/user}/gui/libreoffice/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/networking/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obs/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obs/options.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/.stignore (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/better-word-count/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/better-word-count/package-lock.patch (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/custom-sort/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/dataview/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/dataview/package-lock.patch (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/excalidraw/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/folder-note/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/kanban/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/languagetool/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/languagetool/settings-notification.patch (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/linter/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/map-view/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/minimal-settings/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/outliner/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/read-it-later/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/style-settings/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/tasks/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/plugins/url-into-selection/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/snippets/file-explorer-separators.css (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/config/themes/minimal/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/options.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/obsidian/theme.json (100%) rename hosts/common/{user/configs => configs/user}/gui/openlens/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/openlens/package.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/pipewire/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/qalculate/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/qt/KvAdwQt/KvAdwQt.kvconfig (100%) rename hosts/common/{user/configs => configs/user}/gui/qt/KvAdwQt/KvAdwQt.svg (100%) rename hosts/common/{user/configs => configs/user}/gui/qt/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/rofi/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/spicetify/colors.css (100%) rename hosts/common/{user/configs => configs/user}/gui/spicetify/config/prefs (100%) rename hosts/common/{user/configs => configs/user}/gui/spicetify/config/prefs-user (100%) rename hosts/common/{user/configs => configs/user}/gui/spicetify/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/spicetify/user-colors.patch (100%) rename hosts/common/{user/configs => configs/user}/gui/swww/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/theme/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/theme/options.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/theme/theme.sh (100%) rename hosts/common/{user/configs => configs/user}/gui/transmission/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/vscode/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/vscode/langs/c/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/vscode/langs/nix/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/vscode/langs/python/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/vscode/langs/svelte/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/wev/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/x11/default.nix (100%) rename hosts/common/{user/configs => configs/user}/gui/xdg/default.nix (100%) rename hosts/common/{user/configs => configs/user}/options.nix (100%) rename hosts/common/{system => }/shells/bun/default.nix (100%) rename hosts/common/{system => }/shells/nix/default.nix (100%) rename hosts/common/{system => }/shells/nodejs/default.nix (100%) rename hosts/common/{system => }/shells/python/default.nix (100%) rename hosts/eirene/{ => configs}/system/scripts/card.sh (100%) rename hosts/eirene/{ => configs}/system/scripts/mouse.sh (100%) diff --git a/README.md b/README.md index 096c122..f1f781e 100644 --- a/README.md +++ b/README.md @@ -8,20 +8,13 @@ NixOS dotfiles and configuration for various hosts and users. - [`hosts/`](./hosts): All host-specific configurations. - [`common/`](./hosts/common): Shared configuration definitions. - - [`system/`](./hosts/common/system): System-level configurations and scripts. - - [`configs/`](./hosts/common/system/configs): System configurations applicable to all hosts. - - [`scripts/`](./hosts/common/system/scripts): Utility scripts, such as `nix-cleanup`. - - [`shells/`](./hosts/common/system/shells): Nix dev shells. - - [`user/`](./hosts/common/user): Per-user options. - - [`configs/`](./hosts/common/user/configs): User configurations, split into: - - [`console/`](./hosts/common/user/configs/console): Console-related settings. - - [`gui/`](./hosts/common/user/configs/gui): GUI-related settings. - - [`scripts/`](./hosts/common/user/scripts): User-specific scripts and utilities. + - [`shells/`](./hosts/common/shells): Nix dev shells. + - [`configs/`](./hosts/common/configs): System configurations applicable to all hosts. + - [`system/`](./hosts/common/configs/system): System-level configurations and scripts. + - [`user/`](./hosts/common/configs/user): Per-user options. + - [`console/`](./hosts/common/configs/user/console): Console-related settings. + - [`gui/`](./hosts/common/configs/user/gui): GUI-related settings. - `/`: Individual host configurations. - - `scripts/`: Host-specific scripts. - - `secrets/`: Host-specific secrets, such as `machineId`. - - `users/`: User-specific settings for the host. - - `format.nix`: Disk layout definition using [`disko`](https://github.com/nix-community/disko). - `secrets//`: Global secrets for individual namespaces that apply across all hosts. diff --git a/flake.nix b/flake.nix index 787d775..a6b356a 100644 --- a/flake.nix +++ b/flake.nix @@ -101,10 +101,10 @@ in { devShells = { - bun = import ./hosts/common/system/shells/bun { inherit pkgs; }; - nix = import ./hosts/common/system/shells/nix { inherit pkgs; }; - nodejs = import ./hosts/common/system/shells/nodejs { inherit pkgs; }; - python = import ./hosts/common/system/shells/python { inherit pkgs; }; + bun = import ./hosts/common/shells/bun { inherit pkgs; }; + nix = import ./hosts/common/shells/nix { inherit pkgs; }; + nodejs = import ./hosts/common/shells/nodejs { inherit pkgs; }; + python = import ./hosts/common/shells/python { inherit pkgs; }; }; formatter = pkgs.nixfmt-rfc-style; diff --git a/hosts/common/system/configs/bluetooth/default.nix b/hosts/common/configs/system/bluetooth/default.nix similarity index 100% rename from hosts/common/system/configs/bluetooth/default.nix rename to hosts/common/configs/system/bluetooth/default.nix diff --git a/hosts/common/system/configs/boot/default.nix b/hosts/common/configs/system/boot/default.nix similarity index 100% rename from hosts/common/system/configs/boot/default.nix rename to hosts/common/configs/system/boot/default.nix diff --git a/hosts/common/system/configs/brightnessctl/default.nix b/hosts/common/configs/system/brightnessctl/default.nix similarity index 100% rename from hosts/common/system/configs/brightnessctl/default.nix rename to hosts/common/configs/system/brightnessctl/default.nix diff --git a/hosts/common/system/configs/btop/default.nix b/hosts/common/configs/system/btop/default.nix similarity index 100% rename from hosts/common/system/configs/btop/default.nix rename to hosts/common/configs/system/btop/default.nix diff --git a/hosts/common/system/configs/btrfs/default.nix b/hosts/common/configs/system/btrfs/default.nix similarity index 100% rename from hosts/common/system/configs/btrfs/default.nix rename to hosts/common/configs/system/btrfs/default.nix diff --git a/hosts/common/system/configs/cpu/default.nix b/hosts/common/configs/system/cpu/default.nix similarity index 100% rename from hosts/common/system/configs/cpu/default.nix rename to hosts/common/configs/system/cpu/default.nix diff --git a/hosts/common/system/configs/cpu/options.nix b/hosts/common/configs/system/cpu/options.nix similarity index 100% rename from hosts/common/system/configs/cpu/options.nix rename to hosts/common/configs/system/cpu/options.nix diff --git a/hosts/common/system/configs/docker/default.nix b/hosts/common/configs/system/docker/default.nix similarity index 100% rename from hosts/common/system/configs/docker/default.nix rename to hosts/common/configs/system/docker/default.nix diff --git a/hosts/common/system/configs/fastfetch/default.nix b/hosts/common/configs/system/fastfetch/default.nix similarity index 100% rename from hosts/common/system/configs/fastfetch/default.nix rename to hosts/common/configs/system/fastfetch/default.nix diff --git a/hosts/common/system/configs/getty/default.nix b/hosts/common/configs/system/getty/default.nix similarity index 100% rename from hosts/common/system/configs/getty/default.nix rename to hosts/common/configs/system/getty/default.nix diff --git a/hosts/common/system/configs/git/default.nix b/hosts/common/configs/system/git/default.nix similarity index 100% rename from hosts/common/system/configs/git/default.nix rename to hosts/common/configs/system/git/default.nix diff --git a/hosts/common/system/configs/gpg-agent/default.nix b/hosts/common/configs/system/gpg-agent/default.nix similarity index 100% rename from hosts/common/system/configs/gpg-agent/default.nix rename to hosts/common/configs/system/gpg-agent/default.nix diff --git a/hosts/common/system/configs/impermanence/default.nix b/hosts/common/configs/system/impermanence/default.nix similarity index 100% rename from hosts/common/system/configs/impermanence/default.nix rename to hosts/common/configs/system/impermanence/default.nix diff --git a/hosts/common/system/configs/impermanence/options.nix b/hosts/common/configs/system/impermanence/options.nix similarity index 100% rename from hosts/common/system/configs/impermanence/options.nix rename to hosts/common/configs/system/impermanence/options.nix diff --git a/hosts/common/system/configs/impermanence/scripts/start.sh b/hosts/common/configs/system/impermanence/scripts/start.sh similarity index 100% rename from hosts/common/system/configs/impermanence/scripts/start.sh rename to hosts/common/configs/system/impermanence/scripts/start.sh diff --git a/hosts/common/system/configs/impermanence/scripts/stop.sh b/hosts/common/configs/system/impermanence/scripts/stop.sh similarity index 100% rename from hosts/common/system/configs/impermanence/scripts/stop.sh rename to hosts/common/configs/system/impermanence/scripts/stop.sh diff --git a/hosts/common/system/configs/impermanence/scripts/wipe.sh b/hosts/common/configs/system/impermanence/scripts/wipe.sh similarity index 100% rename from hosts/common/system/configs/impermanence/scripts/wipe.sh rename to hosts/common/configs/system/impermanence/scripts/wipe.sh diff --git a/hosts/common/system/configs/libvirt/default.nix b/hosts/common/configs/system/libvirt/default.nix similarity index 100% rename from hosts/common/system/configs/libvirt/default.nix rename to hosts/common/configs/system/libvirt/default.nix diff --git a/hosts/common/system/configs/lsof/default.nix b/hosts/common/configs/system/lsof/default.nix similarity index 100% rename from hosts/common/system/configs/lsof/default.nix rename to hosts/common/configs/system/lsof/default.nix diff --git a/hosts/common/system/configs/ncdu/default.nix b/hosts/common/configs/system/ncdu/default.nix similarity index 100% rename from hosts/common/system/configs/ncdu/default.nix rename to hosts/common/configs/system/ncdu/default.nix diff --git a/hosts/common/system/configs/neovim/default.nix b/hosts/common/configs/system/neovim/default.nix similarity index 100% rename from hosts/common/system/configs/neovim/default.nix rename to hosts/common/configs/system/neovim/default.nix diff --git a/hosts/common/system/configs/networking/default.nix b/hosts/common/configs/system/networking/default.nix similarity index 100% rename from hosts/common/system/configs/networking/default.nix rename to hosts/common/configs/system/networking/default.nix diff --git a/hosts/common/system/configs/nix-cleanup/cleanup.sh b/hosts/common/configs/system/nix-cleanup/cleanup.sh similarity index 100% rename from hosts/common/system/configs/nix-cleanup/cleanup.sh rename to hosts/common/configs/system/nix-cleanup/cleanup.sh diff --git a/hosts/common/system/configs/nix-cleanup/default.nix b/hosts/common/configs/system/nix-cleanup/default.nix similarity index 100% rename from hosts/common/system/configs/nix-cleanup/default.nix rename to hosts/common/configs/system/nix-cleanup/default.nix diff --git a/hosts/common/system/configs/nix-ld/default.nix b/hosts/common/configs/system/nix-ld/default.nix similarity index 100% rename from hosts/common/system/configs/nix-ld/default.nix rename to hosts/common/configs/system/nix-ld/default.nix diff --git a/hosts/common/system/configs/nix/default.nix b/hosts/common/configs/system/nix/default.nix similarity index 100% rename from hosts/common/system/configs/nix/default.nix rename to hosts/common/configs/system/nix/default.nix diff --git a/hosts/common/system/configs/nixpkgs/default.nix b/hosts/common/configs/system/nixpkgs/default.nix similarity index 100% rename from hosts/common/system/configs/nixpkgs/default.nix rename to hosts/common/configs/system/nixpkgs/default.nix diff --git a/hosts/common/system/configs/ntp/default.nix b/hosts/common/configs/system/ntp/default.nix similarity index 100% rename from hosts/common/system/configs/ntp/default.nix rename to hosts/common/configs/system/ntp/default.nix diff --git a/hosts/common/system/configs/pipewire/default.nix b/hosts/common/configs/system/pipewire/default.nix similarity index 100% rename from hosts/common/system/configs/pipewire/default.nix rename to hosts/common/configs/system/pipewire/default.nix diff --git a/hosts/common/system/configs/plymouth/default.nix b/hosts/common/configs/system/plymouth/default.nix similarity index 100% rename from hosts/common/system/configs/plymouth/default.nix rename to hosts/common/configs/system/plymouth/default.nix diff --git a/hosts/common/system/configs/powertop/default.nix b/hosts/common/configs/system/powertop/default.nix similarity index 100% rename from hosts/common/system/configs/powertop/default.nix rename to hosts/common/configs/system/powertop/default.nix diff --git a/hosts/common/system/configs/printing/default.nix b/hosts/common/configs/system/printing/default.nix similarity index 100% rename from hosts/common/system/configs/printing/default.nix rename to hosts/common/configs/system/printing/default.nix diff --git a/hosts/common/system/configs/ranger/default.nix b/hosts/common/configs/system/ranger/default.nix similarity index 100% rename from hosts/common/system/configs/ranger/default.nix rename to hosts/common/configs/system/ranger/default.nix diff --git a/hosts/common/system/configs/sops/default.nix b/hosts/common/configs/system/sops/default.nix similarity index 100% rename from hosts/common/system/configs/sops/default.nix rename to hosts/common/configs/system/sops/default.nix diff --git a/hosts/common/system/configs/ssh/default.nix b/hosts/common/configs/system/ssh/default.nix similarity index 100% rename from hosts/common/system/configs/ssh/default.nix rename to hosts/common/configs/system/ssh/default.nix diff --git a/hosts/common/system/configs/system/default.nix b/hosts/common/configs/system/system/default.nix similarity index 100% rename from hosts/common/system/configs/system/default.nix rename to hosts/common/configs/system/system/default.nix diff --git a/hosts/common/system/configs/timezone/default.nix b/hosts/common/configs/system/timezone/default.nix similarity index 100% rename from hosts/common/system/configs/timezone/default.nix rename to hosts/common/configs/system/timezone/default.nix diff --git a/hosts/common/system/configs/timezone/timezone.sh b/hosts/common/configs/system/timezone/timezone.sh similarity index 100% rename from hosts/common/system/configs/timezone/timezone.sh rename to hosts/common/configs/system/timezone/timezone.sh diff --git a/hosts/common/system/configs/tlp/default.nix b/hosts/common/configs/system/tlp/default.nix similarity index 100% rename from hosts/common/system/configs/tlp/default.nix rename to hosts/common/configs/system/tlp/default.nix diff --git a/hosts/common/system/configs/tmux/default.nix b/hosts/common/configs/system/tmux/default.nix similarity index 100% rename from hosts/common/system/configs/tmux/default.nix rename to hosts/common/configs/system/tmux/default.nix diff --git a/hosts/common/system/configs/tree/default.nix b/hosts/common/configs/system/tree/default.nix similarity index 100% rename from hosts/common/system/configs/tree/default.nix rename to hosts/common/configs/system/tree/default.nix diff --git a/hosts/common/system/configs/users/default.nix b/hosts/common/configs/system/users/default.nix similarity index 100% rename from hosts/common/system/configs/users/default.nix rename to hosts/common/configs/system/users/default.nix diff --git a/hosts/common/system/configs/wget/default.nix b/hosts/common/configs/system/wget/default.nix similarity index 100% rename from hosts/common/system/configs/wget/default.nix rename to hosts/common/configs/system/wget/default.nix diff --git a/hosts/common/system/configs/zsh/default.nix b/hosts/common/configs/system/zsh/default.nix similarity index 100% rename from hosts/common/system/configs/zsh/default.nix rename to hosts/common/configs/system/zsh/default.nix diff --git a/hosts/common/user/configs/console/android/default.nix b/hosts/common/configs/user/console/android/default.nix similarity index 100% rename from hosts/common/user/configs/console/android/default.nix rename to hosts/common/configs/user/console/android/default.nix diff --git a/hosts/common/user/configs/console/android/env-var-user-home.patch b/hosts/common/configs/user/console/android/env-var-user-home.patch similarity index 100% rename from hosts/common/user/configs/console/android/env-var-user-home.patch rename to hosts/common/configs/user/console/android/env-var-user-home.patch diff --git a/hosts/common/user/configs/console/bashmount/default.nix b/hosts/common/configs/user/console/bashmount/default.nix similarity index 100% rename from hosts/common/user/configs/console/bashmount/default.nix rename to hosts/common/configs/user/console/bashmount/default.nix diff --git a/hosts/common/user/configs/console/bluetooth/default.nix b/hosts/common/configs/user/console/bluetooth/default.nix similarity index 100% rename from hosts/common/user/configs/console/bluetooth/default.nix rename to hosts/common/configs/user/console/bluetooth/default.nix diff --git a/hosts/common/user/configs/console/brightnessctl/default.nix b/hosts/common/configs/user/console/brightnessctl/default.nix similarity index 100% rename from hosts/common/user/configs/console/brightnessctl/default.nix rename to hosts/common/configs/user/console/brightnessctl/default.nix diff --git a/hosts/common/user/configs/console/btop/default.nix b/hosts/common/configs/user/console/btop/default.nix similarity index 100% rename from hosts/common/user/configs/console/btop/default.nix rename to hosts/common/configs/user/console/btop/default.nix diff --git a/hosts/common/user/configs/console/docker/default.nix b/hosts/common/configs/user/console/docker/default.nix similarity index 100% rename from hosts/common/user/configs/console/docker/default.nix rename to hosts/common/configs/user/console/docker/default.nix diff --git a/hosts/common/user/configs/console/fastfetch/default.nix b/hosts/common/configs/user/console/fastfetch/default.nix similarity index 100% rename from hosts/common/user/configs/console/fastfetch/default.nix rename to hosts/common/configs/user/console/fastfetch/default.nix diff --git a/hosts/common/user/configs/console/ffmpeg/default.nix b/hosts/common/configs/user/console/ffmpeg/default.nix similarity index 100% rename from hosts/common/user/configs/console/ffmpeg/default.nix rename to hosts/common/configs/user/console/ffmpeg/default.nix diff --git a/hosts/common/user/configs/console/git/commit-msg.sh b/hosts/common/configs/user/console/git/commit-msg.sh similarity index 100% rename from hosts/common/user/configs/console/git/commit-msg.sh rename to hosts/common/configs/user/console/git/commit-msg.sh diff --git a/hosts/common/user/configs/console/git/default.nix b/hosts/common/configs/user/console/git/default.nix similarity index 100% rename from hosts/common/user/configs/console/git/default.nix rename to hosts/common/configs/user/console/git/default.nix diff --git a/hosts/common/user/configs/console/gpg-agent/default.nix b/hosts/common/configs/user/console/gpg-agent/default.nix similarity index 100% rename from hosts/common/user/configs/console/gpg-agent/default.nix rename to hosts/common/configs/user/console/gpg-agent/default.nix diff --git a/hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh b/hosts/common/configs/user/console/gpg-agent/import-gpg-keys.sh similarity index 100% rename from hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh rename to hosts/common/configs/user/console/gpg-agent/import-gpg-keys.sh diff --git a/hosts/common/user/configs/console/home-manager/default.nix b/hosts/common/configs/user/console/home-manager/default.nix similarity index 100% rename from hosts/common/user/configs/console/home-manager/default.nix rename to hosts/common/configs/user/console/home-manager/default.nix diff --git a/hosts/common/user/configs/console/imagemagick/default.nix b/hosts/common/configs/user/console/imagemagick/default.nix similarity index 100% rename from hosts/common/user/configs/console/imagemagick/default.nix rename to hosts/common/configs/user/console/imagemagick/default.nix diff --git a/hosts/common/user/configs/console/libvirt/default.nix b/hosts/common/configs/user/console/libvirt/default.nix similarity index 100% rename from hosts/common/user/configs/console/libvirt/default.nix rename to hosts/common/configs/user/console/libvirt/default.nix diff --git a/hosts/common/user/configs/console/ncdu/default.nix b/hosts/common/configs/user/console/ncdu/default.nix similarity index 100% rename from hosts/common/user/configs/console/ncdu/default.nix rename to hosts/common/configs/user/console/ncdu/default.nix diff --git a/hosts/common/user/configs/console/neovim/default.nix b/hosts/common/configs/user/console/neovim/default.nix similarity index 100% rename from hosts/common/user/configs/console/neovim/default.nix rename to hosts/common/configs/user/console/neovim/default.nix diff --git a/hosts/common/user/configs/console/nix-develop/default.nix b/hosts/common/configs/user/console/nix-develop/default.nix similarity index 100% rename from hosts/common/user/configs/console/nix-develop/default.nix rename to hosts/common/configs/user/console/nix-develop/default.nix diff --git a/hosts/common/user/configs/console/nix-direnv/default.nix b/hosts/common/configs/user/console/nix-direnv/default.nix similarity index 100% rename from hosts/common/user/configs/console/nix-direnv/default.nix rename to hosts/common/configs/user/console/nix-direnv/default.nix diff --git a/hosts/common/user/configs/console/nixpkgs/default.nix b/hosts/common/configs/user/console/nixpkgs/default.nix similarity index 100% rename from hosts/common/user/configs/console/nixpkgs/default.nix rename to hosts/common/configs/user/console/nixpkgs/default.nix diff --git a/hosts/common/user/configs/console/pipewire/default.nix b/hosts/common/configs/user/console/pipewire/default.nix similarity index 100% rename from hosts/common/user/configs/console/pipewire/default.nix rename to hosts/common/configs/user/console/pipewire/default.nix diff --git a/hosts/common/user/configs/console/ranger/default.nix b/hosts/common/configs/user/console/ranger/default.nix similarity index 100% rename from hosts/common/user/configs/console/ranger/default.nix rename to hosts/common/configs/user/console/ranger/default.nix diff --git a/hosts/common/user/configs/console/sops/default.nix b/hosts/common/configs/user/console/sops/default.nix similarity index 100% rename from hosts/common/user/configs/console/sops/default.nix rename to hosts/common/configs/user/console/sops/default.nix diff --git a/hosts/common/user/configs/console/ssh/default.nix b/hosts/common/configs/user/console/ssh/default.nix similarity index 100% rename from hosts/common/user/configs/console/ssh/default.nix rename to hosts/common/configs/user/console/ssh/default.nix diff --git a/hosts/common/user/configs/console/syncthing/default.nix b/hosts/common/configs/user/console/syncthing/default.nix similarity index 100% rename from hosts/common/user/configs/console/syncthing/default.nix rename to hosts/common/configs/user/console/syncthing/default.nix diff --git a/hosts/common/user/configs/console/tmux/default.nix b/hosts/common/configs/user/console/tmux/default.nix similarity index 100% rename from hosts/common/user/configs/console/tmux/default.nix rename to hosts/common/configs/user/console/tmux/default.nix diff --git a/hosts/common/user/configs/console/tree/default.nix b/hosts/common/configs/user/console/tree/default.nix similarity index 100% rename from hosts/common/user/configs/console/tree/default.nix rename to hosts/common/configs/user/console/tree/default.nix diff --git a/hosts/common/user/configs/console/wget/default.nix b/hosts/common/configs/user/console/wget/default.nix similarity index 100% rename from hosts/common/user/configs/console/wget/default.nix rename to hosts/common/configs/user/console/wget/default.nix diff --git a/hosts/common/user/configs/console/xdg/default.nix b/hosts/common/configs/user/console/xdg/default.nix similarity index 100% rename from hosts/common/user/configs/console/xdg/default.nix rename to hosts/common/configs/user/console/xdg/default.nix diff --git a/hosts/common/user/configs/console/xdg/options.nix b/hosts/common/configs/user/console/xdg/options.nix similarity index 100% rename from hosts/common/user/configs/console/xdg/options.nix rename to hosts/common/configs/user/console/xdg/options.nix diff --git a/hosts/common/user/configs/console/yt-dlp/default.nix b/hosts/common/configs/user/console/yt-dlp/default.nix similarity index 100% rename from hosts/common/user/configs/console/yt-dlp/default.nix rename to hosts/common/configs/user/console/yt-dlp/default.nix diff --git a/hosts/common/user/configs/console/zsh/.p10k.zsh b/hosts/common/configs/user/console/zsh/.p10k.zsh similarity index 100% rename from hosts/common/user/configs/console/zsh/.p10k.zsh rename to hosts/common/configs/user/console/zsh/.p10k.zsh diff --git a/hosts/common/user/configs/console/zsh/default.nix b/hosts/common/configs/user/console/zsh/default.nix similarity index 100% rename from hosts/common/user/configs/console/zsh/default.nix rename to hosts/common/configs/user/console/zsh/default.nix diff --git a/hosts/common/user/configs/gui/astal/config/.gitignore b/hosts/common/configs/user/gui/astal/config/.gitignore similarity index 100% rename from hosts/common/user/configs/gui/astal/config/.gitignore rename to hosts/common/configs/user/gui/astal/config/.gitignore diff --git a/hosts/common/user/configs/gui/astal/config/app.ts b/hosts/common/configs/user/gui/astal/config/app.ts similarity index 100% rename from hosts/common/user/configs/gui/astal/config/app.ts rename to hosts/common/configs/user/gui/astal/config/app.ts diff --git a/hosts/common/user/configs/gui/astal/config/env.d.ts b/hosts/common/configs/user/gui/astal/config/env.d.ts similarity index 100% rename from hosts/common/user/configs/gui/astal/config/env.d.ts rename to hosts/common/configs/user/gui/astal/config/env.d.ts diff --git a/hosts/common/user/configs/gui/astal/config/lib.ts b/hosts/common/configs/user/gui/astal/config/lib.ts similarity index 100% rename from hosts/common/user/configs/gui/astal/config/lib.ts rename to hosts/common/configs/user/gui/astal/config/lib.ts diff --git a/hosts/common/user/configs/gui/astal/config/tsconfig.json b/hosts/common/configs/user/gui/astal/config/tsconfig.json similarity index 100% rename from hosts/common/user/configs/gui/astal/config/tsconfig.json rename to hosts/common/configs/user/gui/astal/config/tsconfig.json diff --git a/hosts/common/user/configs/gui/astal/config/widget/Bar.tsx b/hosts/common/configs/user/gui/astal/config/widget/Bar.tsx similarity index 100% rename from hosts/common/user/configs/gui/astal/config/widget/Bar.tsx rename to hosts/common/configs/user/gui/astal/config/widget/Bar.tsx diff --git a/hosts/common/user/configs/gui/astal/config/widget/components/Date.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Date.tsx similarity index 100% rename from hosts/common/user/configs/gui/astal/config/widget/components/Date.tsx rename to hosts/common/configs/user/gui/astal/config/widget/components/Date.tsx diff --git a/hosts/common/user/configs/gui/astal/config/widget/components/Launcher.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Launcher.tsx similarity index 100% rename from hosts/common/user/configs/gui/astal/config/widget/components/Launcher.tsx rename to hosts/common/configs/user/gui/astal/config/widget/components/Launcher.tsx diff --git a/hosts/common/user/configs/gui/astal/config/widget/components/Tray.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Tray.tsx similarity index 100% rename from hosts/common/user/configs/gui/astal/config/widget/components/Tray.tsx rename to hosts/common/configs/user/gui/astal/config/widget/components/Tray.tsx diff --git a/hosts/common/user/configs/gui/astal/config/widget/components/Workspaces.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Workspaces.tsx similarity index 100% rename from hosts/common/user/configs/gui/astal/config/widget/components/Workspaces.tsx rename to hosts/common/configs/user/gui/astal/config/widget/components/Workspaces.tsx diff --git a/hosts/common/user/configs/gui/astal/default.nix b/hosts/common/configs/user/gui/astal/default.nix similarity index 100% rename from hosts/common/user/configs/gui/astal/default.nix rename to hosts/common/configs/user/gui/astal/default.nix diff --git a/hosts/common/user/configs/gui/astal/theme.sass b/hosts/common/configs/user/gui/astal/theme.sass similarity index 100% rename from hosts/common/user/configs/gui/astal/theme.sass rename to hosts/common/configs/user/gui/astal/theme.sass diff --git a/hosts/common/user/configs/gui/bluetooth/default.nix b/hosts/common/configs/user/gui/bluetooth/default.nix similarity index 100% rename from hosts/common/user/configs/gui/bluetooth/default.nix rename to hosts/common/configs/user/gui/bluetooth/default.nix diff --git a/hosts/common/user/configs/gui/brightnessctl/default.nix b/hosts/common/configs/user/gui/brightnessctl/default.nix similarity index 100% rename from hosts/common/user/configs/gui/brightnessctl/default.nix rename to hosts/common/configs/user/gui/brightnessctl/default.nix diff --git a/hosts/common/user/configs/gui/btop/default.nix b/hosts/common/configs/user/gui/btop/default.nix similarity index 100% rename from hosts/common/user/configs/gui/btop/default.nix rename to hosts/common/configs/user/gui/btop/default.nix diff --git a/hosts/common/user/configs/gui/btop/theme.theme b/hosts/common/configs/user/gui/btop/theme.theme similarity index 100% rename from hosts/common/user/configs/gui/btop/theme.theme rename to hosts/common/configs/user/gui/btop/theme.theme diff --git a/hosts/common/user/configs/gui/cbatticon/default.nix b/hosts/common/configs/user/gui/cbatticon/default.nix similarity index 100% rename from hosts/common/user/configs/gui/cbatticon/default.nix rename to hosts/common/configs/user/gui/cbatticon/default.nix diff --git a/hosts/common/user/configs/gui/chromium/default.nix b/hosts/common/configs/user/gui/chromium/default.nix similarity index 100% rename from hosts/common/user/configs/gui/chromium/default.nix rename to hosts/common/configs/user/gui/chromium/default.nix diff --git a/hosts/common/user/configs/gui/cliphist/default.nix b/hosts/common/configs/user/gui/cliphist/default.nix similarity index 100% rename from hosts/common/user/configs/gui/cliphist/default.nix rename to hosts/common/configs/user/gui/cliphist/default.nix diff --git a/hosts/common/user/configs/gui/cliphist/rofi.nix b/hosts/common/configs/user/gui/cliphist/rofi.nix similarity index 100% rename from hosts/common/user/configs/gui/cliphist/rofi.nix rename to hosts/common/configs/user/gui/cliphist/rofi.nix diff --git a/hosts/common/user/configs/gui/cliphist/scripts/copy.sh b/hosts/common/configs/user/gui/cliphist/scripts/copy.sh similarity index 100% rename from hosts/common/user/configs/gui/cliphist/scripts/copy.sh rename to hosts/common/configs/user/gui/cliphist/scripts/copy.sh diff --git a/hosts/common/user/configs/gui/cliphist/scripts/delete.sh b/hosts/common/configs/user/gui/cliphist/scripts/delete.sh similarity index 100% rename from hosts/common/user/configs/gui/cliphist/scripts/delete.sh rename to hosts/common/configs/user/gui/cliphist/scripts/delete.sh diff --git a/hosts/common/user/configs/gui/darktable/better-copy-and-import.patch b/hosts/common/configs/user/gui/darktable/better-copy-and-import.patch similarity index 100% rename from hosts/common/user/configs/gui/darktable/better-copy-and-import.patch rename to hosts/common/configs/user/gui/darktable/better-copy-and-import.patch diff --git a/hosts/common/user/configs/gui/darktable/default.nix b/hosts/common/configs/user/gui/darktable/default.nix similarity index 100% rename from hosts/common/user/configs/gui/darktable/default.nix rename to hosts/common/configs/user/gui/darktable/default.nix diff --git a/hosts/common/user/configs/gui/discord/default.nix b/hosts/common/configs/user/gui/discord/default.nix similarity index 100% rename from hosts/common/user/configs/gui/discord/default.nix rename to hosts/common/configs/user/gui/discord/default.nix diff --git a/hosts/common/user/configs/gui/discord/readonly-fix.patch b/hosts/common/configs/user/gui/discord/readonly-fix.patch similarity index 100% rename from hosts/common/user/configs/gui/discord/readonly-fix.patch rename to hosts/common/configs/user/gui/discord/readonly-fix.patch diff --git a/hosts/common/user/configs/gui/discord/theme.css b/hosts/common/configs/user/gui/discord/theme.css similarity index 100% rename from hosts/common/user/configs/gui/discord/theme.css rename to hosts/common/configs/user/gui/discord/theme.css diff --git a/hosts/common/user/configs/gui/emoji/default.nix b/hosts/common/configs/user/gui/emoji/default.nix similarity index 100% rename from hosts/common/user/configs/gui/emoji/default.nix rename to hosts/common/configs/user/gui/emoji/default.nix diff --git a/hosts/common/user/configs/gui/firefox/default.nix b/hosts/common/configs/user/gui/firefox/default.nix similarity index 100% rename from hosts/common/user/configs/gui/firefox/default.nix rename to hosts/common/configs/user/gui/firefox/default.nix diff --git a/hosts/common/user/configs/gui/gaming/default.nix b/hosts/common/configs/user/gui/gaming/default.nix similarity index 100% rename from hosts/common/user/configs/gui/gaming/default.nix rename to hosts/common/configs/user/gui/gaming/default.nix diff --git a/hosts/common/user/configs/gui/gaming/scripts/steam-ln.sh b/hosts/common/configs/user/gui/gaming/scripts/steam-ln.sh similarity index 100% rename from hosts/common/user/configs/gui/gaming/scripts/steam-ln.sh rename to hosts/common/configs/user/gui/gaming/scripts/steam-ln.sh diff --git a/hosts/common/user/configs/gui/gtk/default.nix b/hosts/common/configs/user/gui/gtk/default.nix similarity index 100% rename from hosts/common/user/configs/gui/gtk/default.nix rename to hosts/common/configs/user/gui/gtk/default.nix diff --git a/hosts/common/user/configs/gui/gtk/theme.css b/hosts/common/configs/user/gui/gtk/theme.css similarity index 100% rename from hosts/common/user/configs/gui/gtk/theme.css rename to hosts/common/configs/user/gui/gtk/theme.css diff --git a/hosts/common/user/configs/gui/hyprland/default.nix b/hosts/common/configs/user/gui/hyprland/default.nix similarity index 100% rename from hosts/common/user/configs/gui/hyprland/default.nix rename to hosts/common/configs/user/gui/hyprland/default.nix diff --git a/hosts/common/user/configs/gui/hyprland/options.nix b/hosts/common/configs/user/gui/hyprland/options.nix similarity index 100% rename from hosts/common/user/configs/gui/hyprland/options.nix rename to hosts/common/configs/user/gui/hyprland/options.nix diff --git a/hosts/common/user/configs/gui/hyprland/theme.conf b/hosts/common/configs/user/gui/hyprland/theme.conf similarity index 100% rename from hosts/common/user/configs/gui/hyprland/theme.conf rename to hosts/common/configs/user/gui/hyprland/theme.conf diff --git a/hosts/common/user/configs/gui/hyprshot/default.nix b/hosts/common/configs/user/gui/hyprshot/default.nix similarity index 100% rename from hosts/common/user/configs/gui/hyprshot/default.nix rename to hosts/common/configs/user/gui/hyprshot/default.nix diff --git a/hosts/common/user/configs/gui/kitty/default.nix b/hosts/common/configs/user/gui/kitty/default.nix similarity index 100% rename from hosts/common/user/configs/gui/kitty/default.nix rename to hosts/common/configs/user/gui/kitty/default.nix diff --git a/hosts/common/user/configs/gui/kitty/theme.conf b/hosts/common/configs/user/gui/kitty/theme.conf similarity index 100% rename from hosts/common/user/configs/gui/kitty/theme.conf rename to hosts/common/configs/user/gui/kitty/theme.conf diff --git a/hosts/common/user/configs/gui/libreoffice/default.nix b/hosts/common/configs/user/gui/libreoffice/default.nix similarity index 100% rename from hosts/common/user/configs/gui/libreoffice/default.nix rename to hosts/common/configs/user/gui/libreoffice/default.nix diff --git a/hosts/common/user/configs/gui/networking/default.nix b/hosts/common/configs/user/gui/networking/default.nix similarity index 100% rename from hosts/common/user/configs/gui/networking/default.nix rename to hosts/common/configs/user/gui/networking/default.nix diff --git a/hosts/common/user/configs/gui/obs/default.nix b/hosts/common/configs/user/gui/obs/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obs/default.nix rename to hosts/common/configs/user/gui/obs/default.nix diff --git a/hosts/common/user/configs/gui/obs/options.nix b/hosts/common/configs/user/gui/obs/options.nix similarity index 100% rename from hosts/common/user/configs/gui/obs/options.nix rename to hosts/common/configs/user/gui/obs/options.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/.stignore b/hosts/common/configs/user/gui/obsidian/config/.stignore similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/.stignore rename to hosts/common/configs/user/gui/obsidian/config/.stignore diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/better-word-count/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/better-word-count/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/better-word-count/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/better-word-count/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/better-word-count/package-lock.patch b/hosts/common/configs/user/gui/obsidian/config/plugins/better-word-count/package-lock.patch similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/better-word-count/package-lock.patch rename to hosts/common/configs/user/gui/obsidian/config/plugins/better-word-count/package-lock.patch diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/custom-sort/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/custom-sort/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/custom-sort/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/dataview/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/dataview/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/dataview/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/dataview/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/dataview/package-lock.patch b/hosts/common/configs/user/gui/obsidian/config/plugins/dataview/package-lock.patch similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/dataview/package-lock.patch rename to hosts/common/configs/user/gui/obsidian/config/plugins/dataview/package-lock.patch diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/excalidraw/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/excalidraw/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/excalidraw/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/excalidraw/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/folder-note/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/folder-note/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/folder-note/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/folder-note/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/kanban/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/kanban/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/kanban/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/kanban/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/languagetool/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/languagetool/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/languagetool/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/languagetool/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/languagetool/settings-notification.patch b/hosts/common/configs/user/gui/obsidian/config/plugins/languagetool/settings-notification.patch similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/languagetool/settings-notification.patch rename to hosts/common/configs/user/gui/obsidian/config/plugins/languagetool/settings-notification.patch diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/linter/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/linter/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/linter/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/linter/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/map-view/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/map-view/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/map-view/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/map-view/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/minimal-settings/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/minimal-settings/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/minimal-settings/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/minimal-settings/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/outliner/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/outliner/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/outliner/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/outliner/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/read-it-later/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/read-it-later/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/read-it-later/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/read-it-later/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/style-settings/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/style-settings/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/style-settings/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/style-settings/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/tasks/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/tasks/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/tasks/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/tasks/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/plugins/url-into-selection/default.nix b/hosts/common/configs/user/gui/obsidian/config/plugins/url-into-selection/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/plugins/url-into-selection/default.nix rename to hosts/common/configs/user/gui/obsidian/config/plugins/url-into-selection/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/config/snippets/file-explorer-separators.css b/hosts/common/configs/user/gui/obsidian/config/snippets/file-explorer-separators.css similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/snippets/file-explorer-separators.css rename to hosts/common/configs/user/gui/obsidian/config/snippets/file-explorer-separators.css diff --git a/hosts/common/user/configs/gui/obsidian/config/themes/minimal/default.nix b/hosts/common/configs/user/gui/obsidian/config/themes/minimal/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/config/themes/minimal/default.nix rename to hosts/common/configs/user/gui/obsidian/config/themes/minimal/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/default.nix b/hosts/common/configs/user/gui/obsidian/default.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/default.nix rename to hosts/common/configs/user/gui/obsidian/default.nix diff --git a/hosts/common/user/configs/gui/obsidian/options.nix b/hosts/common/configs/user/gui/obsidian/options.nix similarity index 100% rename from hosts/common/user/configs/gui/obsidian/options.nix rename to hosts/common/configs/user/gui/obsidian/options.nix diff --git a/hosts/common/user/configs/gui/obsidian/theme.json b/hosts/common/configs/user/gui/obsidian/theme.json similarity index 100% rename from hosts/common/user/configs/gui/obsidian/theme.json rename to hosts/common/configs/user/gui/obsidian/theme.json diff --git a/hosts/common/user/configs/gui/openlens/default.nix b/hosts/common/configs/user/gui/openlens/default.nix similarity index 100% rename from hosts/common/user/configs/gui/openlens/default.nix rename to hosts/common/configs/user/gui/openlens/default.nix diff --git a/hosts/common/user/configs/gui/openlens/package.nix b/hosts/common/configs/user/gui/openlens/package.nix similarity index 100% rename from hosts/common/user/configs/gui/openlens/package.nix rename to hosts/common/configs/user/gui/openlens/package.nix diff --git a/hosts/common/user/configs/gui/pipewire/default.nix b/hosts/common/configs/user/gui/pipewire/default.nix similarity index 100% rename from hosts/common/user/configs/gui/pipewire/default.nix rename to hosts/common/configs/user/gui/pipewire/default.nix diff --git a/hosts/common/user/configs/gui/qalculate/default.nix b/hosts/common/configs/user/gui/qalculate/default.nix similarity index 100% rename from hosts/common/user/configs/gui/qalculate/default.nix rename to hosts/common/configs/user/gui/qalculate/default.nix diff --git a/hosts/common/user/configs/gui/qt/KvAdwQt/KvAdwQt.kvconfig b/hosts/common/configs/user/gui/qt/KvAdwQt/KvAdwQt.kvconfig similarity index 100% rename from hosts/common/user/configs/gui/qt/KvAdwQt/KvAdwQt.kvconfig rename to hosts/common/configs/user/gui/qt/KvAdwQt/KvAdwQt.kvconfig diff --git a/hosts/common/user/configs/gui/qt/KvAdwQt/KvAdwQt.svg b/hosts/common/configs/user/gui/qt/KvAdwQt/KvAdwQt.svg similarity index 100% rename from hosts/common/user/configs/gui/qt/KvAdwQt/KvAdwQt.svg rename to hosts/common/configs/user/gui/qt/KvAdwQt/KvAdwQt.svg diff --git a/hosts/common/user/configs/gui/qt/default.nix b/hosts/common/configs/user/gui/qt/default.nix similarity index 100% rename from hosts/common/user/configs/gui/qt/default.nix rename to hosts/common/configs/user/gui/qt/default.nix diff --git a/hosts/common/user/configs/gui/rofi/default.nix b/hosts/common/configs/user/gui/rofi/default.nix similarity index 100% rename from hosts/common/user/configs/gui/rofi/default.nix rename to hosts/common/configs/user/gui/rofi/default.nix diff --git a/hosts/common/user/configs/gui/spicetify/colors.css b/hosts/common/configs/user/gui/spicetify/colors.css similarity index 100% rename from hosts/common/user/configs/gui/spicetify/colors.css rename to hosts/common/configs/user/gui/spicetify/colors.css diff --git a/hosts/common/user/configs/gui/spicetify/config/prefs b/hosts/common/configs/user/gui/spicetify/config/prefs similarity index 100% rename from hosts/common/user/configs/gui/spicetify/config/prefs rename to hosts/common/configs/user/gui/spicetify/config/prefs diff --git a/hosts/common/user/configs/gui/spicetify/config/prefs-user b/hosts/common/configs/user/gui/spicetify/config/prefs-user similarity index 100% rename from hosts/common/user/configs/gui/spicetify/config/prefs-user rename to hosts/common/configs/user/gui/spicetify/config/prefs-user diff --git a/hosts/common/user/configs/gui/spicetify/default.nix b/hosts/common/configs/user/gui/spicetify/default.nix similarity index 100% rename from hosts/common/user/configs/gui/spicetify/default.nix rename to hosts/common/configs/user/gui/spicetify/default.nix diff --git a/hosts/common/user/configs/gui/spicetify/user-colors.patch b/hosts/common/configs/user/gui/spicetify/user-colors.patch similarity index 100% rename from hosts/common/user/configs/gui/spicetify/user-colors.patch rename to hosts/common/configs/user/gui/spicetify/user-colors.patch diff --git a/hosts/common/user/configs/gui/swww/default.nix b/hosts/common/configs/user/gui/swww/default.nix similarity index 100% rename from hosts/common/user/configs/gui/swww/default.nix rename to hosts/common/configs/user/gui/swww/default.nix diff --git a/hosts/common/user/configs/gui/theme/default.nix b/hosts/common/configs/user/gui/theme/default.nix similarity index 100% rename from hosts/common/user/configs/gui/theme/default.nix rename to hosts/common/configs/user/gui/theme/default.nix diff --git a/hosts/common/user/configs/gui/theme/options.nix b/hosts/common/configs/user/gui/theme/options.nix similarity index 100% rename from hosts/common/user/configs/gui/theme/options.nix rename to hosts/common/configs/user/gui/theme/options.nix diff --git a/hosts/common/user/configs/gui/theme/theme.sh b/hosts/common/configs/user/gui/theme/theme.sh similarity index 100% rename from hosts/common/user/configs/gui/theme/theme.sh rename to hosts/common/configs/user/gui/theme/theme.sh diff --git a/hosts/common/user/configs/gui/transmission/default.nix b/hosts/common/configs/user/gui/transmission/default.nix similarity index 100% rename from hosts/common/user/configs/gui/transmission/default.nix rename to hosts/common/configs/user/gui/transmission/default.nix diff --git a/hosts/common/user/configs/gui/vscode/default.nix b/hosts/common/configs/user/gui/vscode/default.nix similarity index 100% rename from hosts/common/user/configs/gui/vscode/default.nix rename to hosts/common/configs/user/gui/vscode/default.nix diff --git a/hosts/common/user/configs/gui/vscode/langs/c/default.nix b/hosts/common/configs/user/gui/vscode/langs/c/default.nix similarity index 100% rename from hosts/common/user/configs/gui/vscode/langs/c/default.nix rename to hosts/common/configs/user/gui/vscode/langs/c/default.nix diff --git a/hosts/common/user/configs/gui/vscode/langs/nix/default.nix b/hosts/common/configs/user/gui/vscode/langs/nix/default.nix similarity index 100% rename from hosts/common/user/configs/gui/vscode/langs/nix/default.nix rename to hosts/common/configs/user/gui/vscode/langs/nix/default.nix diff --git a/hosts/common/user/configs/gui/vscode/langs/python/default.nix b/hosts/common/configs/user/gui/vscode/langs/python/default.nix similarity index 100% rename from hosts/common/user/configs/gui/vscode/langs/python/default.nix rename to hosts/common/configs/user/gui/vscode/langs/python/default.nix diff --git a/hosts/common/user/configs/gui/vscode/langs/svelte/default.nix b/hosts/common/configs/user/gui/vscode/langs/svelte/default.nix similarity index 100% rename from hosts/common/user/configs/gui/vscode/langs/svelte/default.nix rename to hosts/common/configs/user/gui/vscode/langs/svelte/default.nix diff --git a/hosts/common/user/configs/gui/wev/default.nix b/hosts/common/configs/user/gui/wev/default.nix similarity index 100% rename from hosts/common/user/configs/gui/wev/default.nix rename to hosts/common/configs/user/gui/wev/default.nix diff --git a/hosts/common/user/configs/gui/x11/default.nix b/hosts/common/configs/user/gui/x11/default.nix similarity index 100% rename from hosts/common/user/configs/gui/x11/default.nix rename to hosts/common/configs/user/gui/x11/default.nix diff --git a/hosts/common/user/configs/gui/xdg/default.nix b/hosts/common/configs/user/gui/xdg/default.nix similarity index 100% rename from hosts/common/user/configs/gui/xdg/default.nix rename to hosts/common/configs/user/gui/xdg/default.nix diff --git a/hosts/common/user/configs/options.nix b/hosts/common/configs/user/options.nix similarity index 100% rename from hosts/common/user/configs/options.nix rename to hosts/common/configs/user/options.nix diff --git a/hosts/common/system/shells/bun/default.nix b/hosts/common/shells/bun/default.nix similarity index 100% rename from hosts/common/system/shells/bun/default.nix rename to hosts/common/shells/bun/default.nix diff --git a/hosts/common/system/shells/nix/default.nix b/hosts/common/shells/nix/default.nix similarity index 100% rename from hosts/common/system/shells/nix/default.nix rename to hosts/common/shells/nix/default.nix diff --git a/hosts/common/system/shells/nodejs/default.nix b/hosts/common/shells/nodejs/default.nix similarity index 100% rename from hosts/common/system/shells/nodejs/default.nix rename to hosts/common/shells/nodejs/default.nix diff --git a/hosts/common/system/shells/python/default.nix b/hosts/common/shells/python/default.nix similarity index 100% rename from hosts/common/system/shells/python/default.nix rename to hosts/common/shells/python/default.nix diff --git a/hosts/eirene/system/scripts/card.sh b/hosts/eirene/configs/system/scripts/card.sh similarity index 100% rename from hosts/eirene/system/scripts/card.sh rename to hosts/eirene/configs/system/scripts/card.sh diff --git a/hosts/eirene/system/scripts/mouse.sh b/hosts/eirene/configs/system/scripts/mouse.sh similarity index 100% rename from hosts/eirene/system/scripts/mouse.sh rename to hosts/eirene/configs/system/scripts/mouse.sh diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix index 5515d5f..9548057 100644 --- a/hosts/eirene/default.nix +++ b/hosts/eirene/default.nix @@ -6,43 +6,43 @@ (import ./format.nix { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762"; }) ./hardware.nix ./display.nix - ../common/system/configs/bluetooth - ../common/system/configs/boot - ../common/system/configs/brightnessctl - ../common/system/configs/btop - ../common/system/configs/btrfs - ../common/system/configs/cpu - ../common/system/configs/docker - ../common/system/configs/fastfetch - ../common/system/configs/getty - ../common/system/configs/git - ../common/system/configs/gpg-agent - ../common/system/configs/impermanence - ../common/system/configs/libvirt - ../common/system/configs/lsof - ../common/system/configs/ncdu - ../common/system/configs/neovim - ../common/system/configs/networking - ../common/system/configs/nix - ../common/system/configs/nix-cleanup - ../common/system/configs/nix-ld - ../common/system/configs/nixpkgs - ../common/system/configs/ntp - ../common/system/configs/pipewire - ../common/system/configs/plymouth - ../common/system/configs/powertop - ../common/system/configs/printing - ../common/system/configs/ranger - ../common/system/configs/sops - ../common/system/configs/ssh - ../common/system/configs/system - ../common/system/configs/timezone - ../common/system/configs/tlp - ../common/system/configs/tmux - ../common/system/configs/tree - ../common/system/configs/users - ../common/system/configs/wget - ../common/system/configs/zsh + ../common/configs/system/bluetooth + ../common/configs/system/boot + ../common/configs/system/brightnessctl + ../common/configs/system/btop + ../common/configs/system/btrfs + ../common/configs/system/cpu + ../common/configs/system/docker + ../common/configs/system/fastfetch + ../common/configs/system/getty + ../common/configs/system/git + ../common/configs/system/gpg-agent + ../common/configs/system/impermanence + ../common/configs/system/libvirt + ../common/configs/system/lsof + ../common/configs/system/ncdu + ../common/configs/system/neovim + ../common/configs/system/networking + ../common/configs/system/nix + ../common/configs/system/nix-cleanup + ../common/configs/system/nix-ld + ../common/configs/system/nixpkgs + ../common/configs/system/ntp + ../common/configs/system/pipewire + ../common/configs/system/plymouth + ../common/configs/system/powertop + ../common/configs/system/printing + ../common/configs/system/ranger + ../common/configs/system/sops + ../common/configs/system/ssh + ../common/configs/system/system + ../common/configs/system/timezone + ../common/configs/system/tlp + ../common/configs/system/tmux + ../common/configs/system/tree + ../common/configs/system/users + ../common/configs/system/wget + ../common/configs/system/zsh ./users/nick ]; diff --git a/hosts/eirene/hardware.nix b/hosts/eirene/hardware.nix index 7fb084f..c980609 100644 --- a/hosts/eirene/hardware.nix +++ b/hosts/eirene/hardware.nix @@ -58,7 +58,7 @@ powerManagement.enable = true; - systemd.services.powertop.postStart = builtins.readFile ./system/scripts/mouse.sh; + systemd.services.powertop.postStart = builtins.readFile ./configs/system/scripts/mouse.sh; services = { xserver.videoDrivers = [ "nvidia" ]; @@ -85,7 +85,7 @@ gestures.workspace_swipe_distance = 600; }; - programs.zsh.loginExtra = lib.mkBefore (builtins.readFile ./system/scripts/card.sh); + programs.zsh.loginExtra = lib.mkBefore (builtins.readFile ./configs/system/scripts/card.sh); } ]; } diff --git a/hosts/eirene/users/nick/default.nix b/hosts/eirene/users/nick/default.nix index 7f2c9dd..fc21e9f 100644 --- a/hosts/eirene/users/nick/default.nix +++ b/hosts/eirene/users/nick/default.nix @@ -7,67 +7,67 @@ let in { imports = [ - ../../../common/user/configs/options.nix - (import ../../../common/user/configs/console/android { inherit user home; }) - (import ../../../common/user/configs/console/bashmount { inherit user home; }) - (import ../../../common/user/configs/console/bluetooth { inherit user home; }) - (import ../../../common/user/configs/console/brightnessctl { inherit user home; }) - (import ../../../common/user/configs/console/btop { inherit user home; }) - (import ../../../common/user/configs/console/docker { inherit user home; }) - (import ../../../common/user/configs/console/fastfetch { inherit user home; }) - (import ../../../common/user/configs/console/ffmpeg { inherit user home; }) - (import ../../../common/user/configs/console/git { inherit user home; }) - (import ../../../common/user/configs/console/gpg-agent { inherit user home; }) - (import ../../../common/user/configs/console/home-manager { inherit user home; }) - (import ../../../common/user/configs/console/imagemagick { inherit user home; }) - (import ../../../common/user/configs/console/libvirt { inherit user home; }) - (import ../../../common/user/configs/console/ncdu { inherit user home; }) - (import ../../../common/user/configs/console/neovim { inherit user home; }) - (import ../../../common/user/configs/console/nix-develop { inherit user home; }) - (import ../../../common/user/configs/console/nix-direnv { inherit user home; }) - (import ../../../common/user/configs/console/nixpkgs { inherit user home; }) - (import ../../../common/user/configs/console/pipewire { inherit user home; }) - (import ../../../common/user/configs/console/ranger { inherit user home; }) - (import ../../../common/user/configs/console/sops { inherit user home; }) - (import ../../../common/user/configs/console/ssh { inherit user home; }) - (import ../../../common/user/configs/console/syncthing { inherit user home; }) - (import ../../../common/user/configs/console/tmux { inherit user home; }) - (import ../../../common/user/configs/console/tree { inherit user home; }) - (import ../../../common/user/configs/console/wget { inherit user home; }) - (import ../../../common/user/configs/console/xdg { inherit user home; }) - (import ../../../common/user/configs/console/yt-dlp { inherit user home; }) - (import ../../../common/user/configs/console/zsh { inherit user home; }) - (import ../../../common/user/configs/gui/astal { inherit user home; }) - (import ../../../common/user/configs/gui/bluetooth { inherit user home; }) - (import ../../../common/user/configs/gui/brightnessctl { inherit user home; }) - (import ../../../common/user/configs/gui/btop { inherit user home; }) - (import ../../../common/user/configs/gui/chromium { inherit user home; }) - (import ../../../common/user/configs/gui/cliphist { inherit user home; }) - (import ../../../common/user/configs/gui/darktable { inherit user home; }) - (import ../../../common/user/configs/gui/discord { inherit user home; }) - (import ../../../common/user/configs/gui/emoji { inherit user home; }) - (import ../../../common/user/configs/gui/firefox { inherit user home; }) - (import ../../../common/user/configs/gui/gaming { inherit user home; }) - (import ../../../common/user/configs/gui/gtk { inherit user home; }) - (import ../../../common/user/configs/gui/hyprland { inherit user home; }) - (import ../../../common/user/configs/gui/hyprshot { inherit user home; }) - (import ../../../common/user/configs/gui/kitty { inherit user home; }) - (import ../../../common/user/configs/gui/libreoffice { inherit user home; }) - (import ../../../common/user/configs/gui/networking { inherit user home; }) - (import ../../../common/user/configs/gui/obs { inherit user home; }) - (import ../../../common/user/configs/gui/obsidian { inherit user home; }) - (import ../../../common/user/configs/gui/pipewire { inherit user home; }) - (import ../../../common/user/configs/gui/qalculate { inherit user home; }) - (import ../../../common/user/configs/gui/qt { inherit user home; }) - (import ../../../common/user/configs/gui/rofi { inherit user home; }) - (import ../../../common/user/configs/gui/spicetify { inherit user home; }) - (import ../../../common/user/configs/gui/swww { inherit user home; }) - (import ../../../common/user/configs/gui/theme { inherit user home; }) - (import ../../../common/user/configs/gui/transmission { inherit user home; }) - (import ../../../common/user/configs/gui/vscode { inherit user home; }) - (import ../../../common/user/configs/gui/wev { inherit user home; }) - (import ../../../common/user/configs/gui/x11 { inherit user home; }) - (import ../../../common/user/configs/gui/xdg { inherit user home; }) + ../../../common/configs/user/options.nix + (import ../../../common/configs/user/console/android { inherit user home; }) + (import ../../../common/configs/user/console/bashmount { inherit user home; }) + (import ../../../common/configs/user/console/bluetooth { inherit user home; }) + (import ../../../common/configs/user/console/brightnessctl { inherit user home; }) + (import ../../../common/configs/user/console/btop { inherit user home; }) + (import ../../../common/configs/user/console/docker { inherit user home; }) + (import ../../../common/configs/user/console/fastfetch { inherit user home; }) + (import ../../../common/configs/user/console/ffmpeg { inherit user home; }) + (import ../../../common/configs/user/console/git { inherit user home; }) + (import ../../../common/configs/user/console/gpg-agent { inherit user home; }) + (import ../../../common/configs/user/console/home-manager { inherit user home; }) + (import ../../../common/configs/user/console/imagemagick { inherit user home; }) + (import ../../../common/configs/user/console/libvirt { inherit user home; }) + (import ../../../common/configs/user/console/ncdu { inherit user home; }) + (import ../../../common/configs/user/console/neovim { inherit user home; }) + (import ../../../common/configs/user/console/nix-develop { inherit user home; }) + (import ../../../common/configs/user/console/nix-direnv { inherit user home; }) + (import ../../../common/configs/user/console/nixpkgs { inherit user home; }) + (import ../../../common/configs/user/console/pipewire { inherit user home; }) + (import ../../../common/configs/user/console/ranger { inherit user home; }) + (import ../../../common/configs/user/console/sops { inherit user home; }) + (import ../../../common/configs/user/console/ssh { inherit user home; }) + (import ../../../common/configs/user/console/syncthing { inherit user home; }) + (import ../../../common/configs/user/console/tmux { inherit user home; }) + (import ../../../common/configs/user/console/tree { inherit user home; }) + (import ../../../common/configs/user/console/wget { inherit user home; }) + (import ../../../common/configs/user/console/xdg { inherit user home; }) + (import ../../../common/configs/user/console/yt-dlp { inherit user home; }) + (import ../../../common/configs/user/console/zsh { inherit user home; }) + (import ../../../common/configs/user/gui/astal { inherit user home; }) + (import ../../../common/configs/user/gui/bluetooth { inherit user home; }) + (import ../../../common/configs/user/gui/brightnessctl { inherit user home; }) + (import ../../../common/configs/user/gui/btop { inherit user home; }) + (import ../../../common/configs/user/gui/chromium { inherit user home; }) + (import ../../../common/configs/user/gui/cliphist { inherit user home; }) + (import ../../../common/configs/user/gui/darktable { inherit user home; }) + (import ../../../common/configs/user/gui/discord { inherit user home; }) + (import ../../../common/configs/user/gui/emoji { inherit user home; }) + (import ../../../common/configs/user/gui/firefox { inherit user home; }) + (import ../../../common/configs/user/gui/gaming { inherit user home; }) + (import ../../../common/configs/user/gui/gtk { inherit user home; }) + (import ../../../common/configs/user/gui/hyprland { inherit user home; }) + (import ../../../common/configs/user/gui/hyprshot { inherit user home; }) + (import ../../../common/configs/user/gui/kitty { inherit user home; }) + (import ../../../common/configs/user/gui/libreoffice { inherit user home; }) + (import ../../../common/configs/user/gui/networking { inherit user home; }) + (import ../../../common/configs/user/gui/obs { inherit user home; }) + (import ../../../common/configs/user/gui/obsidian { inherit user home; }) + (import ../../../common/configs/user/gui/pipewire { inherit user home; }) + (import ../../../common/configs/user/gui/qalculate { inherit user home; }) + (import ../../../common/configs/user/gui/qt { inherit user home; }) + (import ../../../common/configs/user/gui/rofi { inherit user home; }) + (import ../../../common/configs/user/gui/spicetify { inherit user home; }) + (import ../../../common/configs/user/gui/swww { inherit user home; }) + (import ../../../common/configs/user/gui/theme { inherit user home; }) + (import ../../../common/configs/user/gui/transmission { inherit user home; }) + (import ../../../common/configs/user/gui/vscode { inherit user home; }) + (import ../../../common/configs/user/gui/wev { inherit user home; }) + (import ../../../common/configs/user/gui/x11 { inherit user home; }) + (import ../../../common/configs/user/gui/xdg { inherit user home; }) ]; # echo "password" | mkpasswd -s @@ -150,6 +150,6 @@ in }; home.file."Documents/Obsidian/.stignore".source = - ../../../common/user/configs/gui/obsidian/config/.stignore; + ../../../common/configs/user/gui/obsidian/config/.stignore; }; } diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix index fea58a5..08752eb 100644 --- a/hosts/elara/default.nix +++ b/hosts/elara/default.nix @@ -10,42 +10,42 @@ # elara runs on an external drive on eirene ../eirene/hardware.nix ../eirene/display.nix - ../common/system/configs/bluetooth - ../common/system/configs/boot - ../common/system/configs/brightnessctl - ../common/system/configs/btop - ../common/system/configs/btrfs - ../common/system/configs/cpu - ../common/system/configs/docker - ../common/system/configs/fastfetch - ../common/system/configs/getty - ../common/system/configs/git - ../common/system/configs/gpg-agent - ../common/system/configs/impermanence - ../common/system/configs/lsof - ../common/system/configs/ncdu - ../common/system/configs/neovim - ../common/system/configs/networking - ../common/system/configs/nix - ../common/system/configs/nix-cleanup - ../common/system/configs/nix-ld - ../common/system/configs/nixpkgs - ../common/system/configs/ntp - ../common/system/configs/pipewire - ../common/system/configs/plymouth - ../common/system/configs/powertop - ../common/system/configs/printing - ../common/system/configs/ranger - ../common/system/configs/sops - ../common/system/configs/ssh - ../common/system/configs/system - ../common/system/configs/timezone - ../common/system/configs/tlp - ../common/system/configs/tmux - ../common/system/configs/tree - ../common/system/configs/users - ../common/system/configs/wget - ../common/system/configs/zsh + ../common/configs/system/bluetooth + ../common/configs/system/boot + ../common/configs/system/brightnessctl + ../common/configs/system/btop + ../common/configs/system/btrfs + ../common/configs/system/cpu + ../common/configs/system/docker + ../common/configs/system/fastfetch + ../common/configs/system/getty + ../common/configs/system/git + ../common/configs/system/gpg-agent + ../common/configs/system/impermanence + ../common/configs/system/lsof + ../common/configs/system/ncdu + ../common/configs/system/neovim + ../common/configs/system/networking + ../common/configs/system/nix + ../common/configs/system/nix-cleanup + ../common/configs/system/nix-ld + ../common/configs/system/nixpkgs + ../common/configs/system/ntp + ../common/configs/system/pipewire + ../common/configs/system/plymouth + ../common/configs/system/powertop + ../common/configs/system/printing + ../common/configs/system/ranger + ../common/configs/system/sops + ../common/configs/system/ssh + ../common/configs/system/system + ../common/configs/system/timezone + ../common/configs/system/tlp + ../common/configs/system/tmux + ../common/configs/system/tree + ../common/configs/system/users + ../common/configs/system/wget + ../common/configs/system/zsh ./users/nikara ]; diff --git a/hosts/elara/users/nikara/default.nix b/hosts/elara/users/nikara/default.nix index 4f03cbe..f16b482 100644 --- a/hosts/elara/users/nikara/default.nix +++ b/hosts/elara/users/nikara/default.nix @@ -7,61 +7,61 @@ let in { imports = [ - ../../../common/user/configs/options.nix - (import ../../../common/user/configs/console/bashmount { inherit user home; }) - (import ../../../common/user/configs/console/bluetooth { inherit user home; }) - (import ../../../common/user/configs/console/brightnessctl { inherit user home; }) - (import ../../../common/user/configs/console/btop { inherit user home; }) - (import ../../../common/user/configs/console/docker { inherit user home; }) - (import ../../../common/user/configs/console/fastfetch { inherit user home; }) - (import ../../../common/user/configs/console/git { inherit user home; }) - (import ../../../common/user/configs/console/gpg-agent { inherit user home; }) - (import ../../../common/user/configs/console/home-manager { inherit user home; }) - (import ../../../common/user/configs/console/imagemagick { inherit user home; }) - (import ../../../common/user/configs/console/libvirt { inherit user home; }) - (import ../../../common/user/configs/console/ncdu { inherit user home; }) - (import ../../../common/user/configs/console/neovim { inherit user home; }) - (import ../../../common/user/configs/console/nix-develop { inherit user home; }) - (import ../../../common/user/configs/console/nix-direnv { inherit user home; }) - (import ../../../common/user/configs/console/nixpkgs { inherit user home; }) - (import ../../../common/user/configs/console/pipewire { inherit user home; }) - (import ../../../common/user/configs/console/ranger { inherit user home; }) - (import ../../../common/user/configs/console/sops { inherit user home; }) - (import ../../../common/user/configs/console/ssh { inherit user home; }) - (import ../../../common/user/configs/console/tmux { inherit user home; }) - (import ../../../common/user/configs/console/tree { inherit user home; }) - (import ../../../common/user/configs/console/wget { inherit user home; }) - (import ../../../common/user/configs/console/xdg { inherit user home; }) - (import ../../../common/user/configs/console/zsh { inherit user home; }) - (import ../../../common/user/configs/gui/astal { inherit user home; }) - (import ../../../common/user/configs/gui/bluetooth { inherit user home; }) - (import ../../../common/user/configs/gui/brightnessctl { inherit user home; }) - (import ../../../common/user/configs/gui/btop { inherit user home; }) - (import ../../../common/user/configs/gui/chromium { inherit user home; }) - (import ../../../common/user/configs/gui/cliphist { inherit user home; }) - (import ../../../common/user/configs/gui/emoji { inherit user home; }) - (import ../../../common/user/configs/gui/firefox { inherit user home; }) - (import ../../../common/user/configs/gui/gtk { inherit user home; }) - (import ../../../common/user/configs/gui/hyprland { inherit user home; }) - (import ../../../common/user/configs/gui/hyprshot { inherit user home; }) - (import ../../../common/user/configs/gui/kitty { inherit user home; }) - (import ../../../common/user/configs/gui/libreoffice { inherit user home; }) - (import ../../../common/user/configs/gui/networking { inherit user home; }) - (import ../../../common/user/configs/gui/obs { inherit user home; }) - (import ../../../common/user/configs/gui/obsidian { inherit user home; }) - (import ../../../common/user/configs/gui/openlens { inherit user home; }) - (import ../../../common/user/configs/gui/pipewire { inherit user home; }) - (import ../../../common/user/configs/gui/qalculate { inherit user home; }) - (import ../../../common/user/configs/gui/qt { inherit user home; }) - (import ../../../common/user/configs/gui/rofi { inherit user home; }) - (import ../../../common/user/configs/gui/spicetify { inherit user home; }) - (import ../../../common/user/configs/gui/swww { inherit user home; }) - (import ../../../common/user/configs/gui/theme { inherit user home; }) - (import ../../../common/user/configs/gui/vscode { inherit user home; }) - (import ../../../common/user/configs/gui/wev { inherit user home; }) - (import ../../../common/user/configs/gui/x11 { inherit user home; }) - (import ../../../common/user/configs/gui/xdg { inherit user home; }) - (import ../../user/configs/console/globalprotect-remote-connect { inherit user home; }) + ../../../common/configs/user/options.nix + (import ../../../common/configs/user/console/bashmount { inherit user home; }) + (import ../../../common/configs/user/console/bluetooth { inherit user home; }) + (import ../../../common/configs/user/console/brightnessctl { inherit user home; }) + (import ../../../common/configs/user/console/btop { inherit user home; }) + (import ../../../common/configs/user/console/docker { inherit user home; }) + (import ../../../common/configs/user/console/fastfetch { inherit user home; }) + (import ../../../common/configs/user/console/git { inherit user home; }) + (import ../../../common/configs/user/console/gpg-agent { inherit user home; }) + (import ../../../common/configs/user/console/home-manager { inherit user home; }) + (import ../../../common/configs/user/console/imagemagick { inherit user home; }) + (import ../../../common/configs/user/console/libvirt { inherit user home; }) + (import ../../../common/configs/user/console/ncdu { inherit user home; }) + (import ../../../common/configs/user/console/neovim { inherit user home; }) + (import ../../../common/configs/user/console/nix-develop { inherit user home; }) + (import ../../../common/configs/user/console/nix-direnv { inherit user home; }) + (import ../../../common/configs/user/console/nixpkgs { inherit user home; }) + (import ../../../common/configs/user/console/pipewire { inherit user home; }) + (import ../../../common/configs/user/console/ranger { inherit user home; }) + (import ../../../common/configs/user/console/sops { inherit user home; }) + (import ../../../common/configs/user/console/ssh { inherit user home; }) + (import ../../../common/configs/user/console/tmux { inherit user home; }) + (import ../../../common/configs/user/console/tree { inherit user home; }) + (import ../../../common/configs/user/console/wget { inherit user home; }) + (import ../../../common/configs/user/console/xdg { inherit user home; }) + (import ../../../common/configs/user/console/zsh { inherit user home; }) + (import ../../../common/configs/user/gui/astal { inherit user home; }) + (import ../../../common/configs/user/gui/bluetooth { inherit user home; }) + (import ../../../common/configs/user/gui/brightnessctl { inherit user home; }) + (import ../../../common/configs/user/gui/btop { inherit user home; }) + (import ../../../common/configs/user/gui/chromium { inherit user home; }) + (import ../../../common/configs/user/gui/cliphist { inherit user home; }) + (import ../../../common/configs/user/gui/emoji { inherit user home; }) + (import ../../../common/configs/user/gui/firefox { inherit user home; }) + (import ../../../common/configs/user/gui/gtk { inherit user home; }) + (import ../../../common/configs/user/gui/hyprland { inherit user home; }) + (import ../../../common/configs/user/gui/hyprshot { inherit user home; }) + (import ../../../common/configs/user/gui/kitty { inherit user home; }) + (import ../../../common/configs/user/gui/libreoffice { inherit user home; }) + (import ../../../common/configs/user/gui/networking { inherit user home; }) + (import ../../../common/configs/user/gui/obs { inherit user home; }) + (import ../../../common/configs/user/gui/obsidian { inherit user home; }) + (import ../../../common/configs/user/gui/openlens { inherit user home; }) + (import ../../../common/configs/user/gui/pipewire { inherit user home; }) + (import ../../../common/configs/user/gui/qalculate { inherit user home; }) + (import ../../../common/configs/user/gui/qt { inherit user home; }) + (import ../../../common/configs/user/gui/rofi { inherit user home; }) + (import ../../../common/configs/user/gui/spicetify { inherit user home; }) + (import ../../../common/configs/user/gui/swww { inherit user home; }) + (import ../../../common/configs/user/gui/theme { inherit user home; }) + (import ../../../common/configs/user/gui/vscode { inherit user home; }) + (import ../../../common/configs/user/gui/wev { inherit user home; }) + (import ../../../common/configs/user/gui/x11 { inherit user home; }) + (import ../../../common/configs/user/gui/xdg { inherit user home; }) + (import ../../configs/user/console/globalprotect-remote-connect { inherit user home; }) ]; # echo "password" | mkpasswd -s diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix index eeb0360..21f998d 100644 --- a/hosts/installer/default.nix +++ b/hosts/installer/default.nix @@ -7,33 +7,33 @@ device = "/dev/disk/by-id/usb-SanDisk_Ultra_Trek_050133f0afb69de86a475ee8d2ad97e4916cce11764cffba9ab262d42a7d0d2f66460000000000000000000039b7a3b8ff990a109f5581078ea6e86a-0:0"; }) ./hardware.nix - ../common/system/configs/boot - ../common/system/configs/btop - ../common/system/configs/btrfs - ../common/system/configs/fastfetch - ../common/system/configs/getty - ../common/system/configs/git - ../common/system/configs/gpg-agent - ../common/system/configs/impermanence - ../common/system/configs/lsof - ../common/system/configs/ncdu - ../common/system/configs/neovim - ../common/system/configs/networking - ../common/system/configs/nix - ../common/system/configs/nix-cleanup - ../common/system/configs/nix-ld - ../common/system/configs/nixpkgs - ../common/system/configs/ntp - ../common/system/configs/ranger - ../common/system/configs/sops - ../common/system/configs/ssh - ../common/system/configs/system - ../common/system/configs/timezone - ../common/system/configs/tmux - ../common/system/configs/tree - ../common/system/configs/users - ../common/system/configs/wget - ../common/system/configs/zsh + ../common/configs/system/boot + ../common/configs/system/btop + ../common/configs/system/btrfs + ../common/configs/system/fastfetch + ../common/configs/system/getty + ../common/configs/system/git + ../common/configs/system/gpg-agent + ../common/configs/system/impermanence + ../common/configs/system/lsof + ../common/configs/system/ncdu + ../common/configs/system/neovim + ../common/configs/system/networking + ../common/configs/system/nix + ../common/configs/system/nix-cleanup + ../common/configs/system/nix-ld + ../common/configs/system/nixpkgs + ../common/configs/system/ntp + ../common/configs/system/ranger + ../common/configs/system/sops + ../common/configs/system/ssh + ../common/configs/system/system + ../common/configs/system/timezone + ../common/configs/system/tmux + ../common/configs/system/tree + ../common/configs/system/users + ../common/configs/system/wget + ../common/configs/system/zsh ./users/nick ]; diff --git a/hosts/installer/users/nick/default.nix b/hosts/installer/users/nick/default.nix index c6135fa..dd3d22f 100644 --- a/hosts/installer/users/nick/default.nix +++ b/hosts/installer/users/nick/default.nix @@ -7,26 +7,26 @@ let in { imports = [ - ../../../common/user/configs/options.nix - (import ../../../common/user/configs/console/bashmount { inherit user home; }) - (import ../../../common/user/configs/console/btop { inherit user home; }) - (import ../../../common/user/configs/console/fastfetch { inherit user home; }) - (import ../../../common/user/configs/console/git { inherit user home; }) - (import ../../../common/user/configs/console/gpg-agent { inherit user home; }) - (import ../../../common/user/configs/console/home-manager { inherit user home; }) - (import ../../../common/user/configs/console/ncdu { inherit user home; }) - (import ../../../common/user/configs/console/neovim { inherit user home; }) - (import ../../../common/user/configs/console/nix-develop { inherit user home; }) - (import ../../../common/user/configs/console/nix-direnv { inherit user home; }) - (import ../../../common/user/configs/console/nixpkgs { inherit user home; }) - (import ../../../common/user/configs/console/ranger { inherit user home; }) - (import ../../../common/user/configs/console/sops { inherit user home; }) - (import ../../../common/user/configs/console/ssh { inherit user home; }) - (import ../../../common/user/configs/console/tmux { inherit user home; }) - (import ../../../common/user/configs/console/tree { inherit user home; }) - (import ../../../common/user/configs/console/wget { inherit user home; }) - (import ../../../common/user/configs/console/xdg { inherit user home; }) - (import ../../../common/user/configs/console/zsh { inherit user home; }) + ../../../common/configs/user/options.nix + (import ../../../common/configs/user/console/bashmount { inherit user home; }) + (import ../../../common/configs/user/console/btop { inherit user home; }) + (import ../../../common/configs/user/console/fastfetch { inherit user home; }) + (import ../../../common/configs/user/console/git { inherit user home; }) + (import ../../../common/configs/user/console/gpg-agent { inherit user home; }) + (import ../../../common/configs/user/console/home-manager { inherit user home; }) + (import ../../../common/configs/user/console/ncdu { inherit user home; }) + (import ../../../common/configs/user/console/neovim { inherit user home; }) + (import ../../../common/configs/user/console/nix-develop { inherit user home; }) + (import ../../../common/configs/user/console/nix-direnv { inherit user home; }) + (import ../../../common/configs/user/console/nixpkgs { inherit user home; }) + (import ../../../common/configs/user/console/ranger { inherit user home; }) + (import ../../../common/configs/user/console/sops { inherit user home; }) + (import ../../../common/configs/user/console/ssh { inherit user home; }) + (import ../../../common/configs/user/console/tmux { inherit user home; }) + (import ../../../common/configs/user/console/tree { inherit user home; }) + (import ../../../common/configs/user/console/wget { inherit user home; }) + (import ../../../common/configs/user/console/xdg { inherit user home; }) + (import ../../../common/configs/user/console/zsh { inherit user home; }) ]; # echo "password" | mkpasswd -s diff --git a/lib/scripts/add-host.sh b/lib/scripts/add-host.sh index 0181fca..a078905 100755 --- a/lib/scripts/add-host.sh +++ b/lib/scripts/add-host.sh @@ -22,8 +22,8 @@ find . -type f -name "sops.yaml" | while IFS= read -r SOPS_FILE; do sed -i "/- age:/a\ - *${HOST}" "${SOPS_FILE}" done -sed -i "/knownHosts = {/a\ ${HOST}.publicKeyFile = ../../../../${HOST}/secrets/ssh_host_ed25519_key.pub;" ./hosts/common/system/configs/ssh/default.nix -sed -i "/userKnownHostsFile = lib.strings.concatStringsSep \" \" \[/a\ ../../../../../${HOST}/secrets/ssh_host_ed25519_key.pub" ./hosts/common/user/configs/console/ssh/default.nix +sed -i "/knownHosts = {/a\ ${HOST}.publicKeyFile = ../../../../${HOST}/secrets/ssh_host_ed25519_key.pub;" ./hosts/common/configs/system/ssh/default.nix +sed -i "/userKnownHostsFile = lib.strings.concatStringsSep \" \" \[/a\ ../../../../../${HOST}/secrets/ssh_host_ed25519_key.pub" ./hosts/common/configs/user/console/ssh/default.nix "$(dirname "$0")/update-keys.sh" "$2" diff --git a/lib/scripts/remove-host.sh b/lib/scripts/remove-host.sh index 2284b71..f9c751a 100755 --- a/lib/scripts/remove-host.sh +++ b/lib/scripts/remove-host.sh @@ -18,8 +18,8 @@ find . -type f -name "sops.yaml" | while IFS= read -r SOPS_FILE; do sed -i "/ - \*${HOST}/d" "${SOPS_FILE}" done -sed -i "/${HOST}/d" ./hosts/common/system/configs/ssh/default.nix -sed -i "/${HOST}/d" ./hosts/common/user/configs/console/ssh/default.nix +sed -i "/${HOST}/d" ./hosts/common/configs/system/ssh/default.nix +sed -i "/${HOST}/d" ./hosts/common/configs/user/console/ssh/default.nix "$(dirname "$0")/update-keys.sh" "$2"