From 7ab40e34933ebb444b69132e804d7312a283124d Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Mon, 8 Jul 2024 20:01:55 +0300 Subject: [PATCH] Move some (all) files around Signed-off-by: Nikolaos Karaolidis --- hosts/common/configs/ssh/default.nix | 7 -- hosts/common/default.nix | 30 -------- .../configs/bluetooth/default.nix | 0 .../{ => system}/configs/boot/default.nix | 0 .../configs/brightnessctl/default.nix | 0 .../{ => system}/configs/btop/default.nix | 0 .../configs/fastfetch/default.nix | 0 .../{ => system}/configs/getty/default.nix | 0 .../{ => system}/configs/git/default.nix | 0 .../configs/gpg-agent/default.nix | 0 .../{ => system}/configs/neovim/default.nix | 0 .../configs/networking/default.nix | 0 .../{ => system}/configs/nix-ld/default.nix | 0 .../{ => system}/configs/nix/default.nix | 0 .../{ => system}/configs/persist/default.nix | 0 .../configs/persist/impermanence.sh | 0 .../{ => system}/configs/pipewire/default.nix | 0 .../{ => system}/configs/plymouth/default.nix | 0 .../{ => system}/configs/ranger/default.nix | 0 .../{ => system}/configs/sops/default.nix | 0 hosts/common/system/configs/ssh/default.nix | 7 ++ .../{ => system}/configs/system/default.nix | 0 .../{ => system}/configs/tmux/default.nix | 0 .../{ => system}/configs/tree/default.nix | 0 .../{ => system}/configs/users/default.nix | 0 .../{ => system}/configs/zsh/default.nix | 0 .../{ => system}/scripts/cleanup/cleanup.sh | 0 .../{ => system}/scripts/cleanup/default.nix | 0 .../configs/console/bluetooth/default.nix | 0 .../configs/console/brightnessctl/default.nix | 0 .../user}/configs/console/btop/default.nix | 0 .../user}/configs/console/git/commit-msg.sh | 0 .../user}/configs/console/git/default.nix | 0 .../configs/console/gpg-agent/default.nix | 0 .../console/gpg-agent/import-gpg-keys.sh | 0 .../configs/console/home-manager/default.nix | 26 +++++++ .../user}/configs/console/neovim/default.nix | 0 .../user/configs/console/persist/default.nix | 30 ++++++++ .../configs/console/pipewire/default.nix | 0 .../user/configs/console/sops/default.nix | 24 +++++++ .../configs/console/syncthing/default.nix | 0 .../user/configs/console}/xdg/default.nix | 20 +++--- .../user/configs/console/xdg/options.nix | 0 .../user}/configs/console/zsh/default.nix | 0 .../user}/configs/gui/ags/config/.gitignore | 0 .../configs/gui/ags/config/.prettierrc.json | 0 .../user}/configs/gui/ags/config/default.nix | 0 .../configs/gui/ags/config/eslint.config.js | 0 .../user}/configs/gui/ags/config/package.json | 0 .../user}/configs/gui/ags/config/src/index.ts | 0 .../user}/configs/gui/ags/config/src/lib.ts | 0 .../user}/configs/gui/ags/config/src/theme.ts | 0 .../gui/ags/config/src/widgets/bar/bar.ts | 0 .../src/widgets/bar/clipboard/clipboard.ts | 0 .../ags/config/src/widgets/bar/date/date.ts | 0 .../gui/ags/config/src/widgets/bar/gap/gap.ts | 0 .../src/widgets/bar/launcher/launcher.ts | 0 .../config/src/widgets/bar/systray/systray.ts | 0 .../src/widgets/bar/workspace/workspace.ts | 0 .../configs/gui/ags/config/tsconfig.json | 0 .../common/user}/configs/gui/ags/default.nix | 0 .../common/user}/configs/gui/ags/theme.sass | 0 .../user}/configs/gui/bluetooth/default.nix | 0 .../configs/gui/brightnessctl/default.nix | 0 .../common/user}/configs/gui/btop/default.nix | 0 .../common/user}/configs/gui/btop/theme.theme | 0 .../user}/configs/gui/cbatticon/default.nix | 0 .../user}/configs/gui/cliphist/default.nix | 0 .../user}/configs/gui/firefox/default.nix | 0 .../common/user}/configs/gui/gtk/default.nix | 0 .../common/user}/configs/gui/gtk/theme.css | 0 .../user}/configs/gui/hyprland/default.nix | 2 + .../user/configs/gui/hyprland/options.nix | 0 .../user}/configs/gui/hyprland/theme.conf | 0 .../user}/configs/gui/hyprshot/default.nix | 0 .../user}/configs/gui/kitty/default.nix | 0 .../common/user}/configs/gui/kitty/theme.conf | 0 .../user}/configs/gui/matugen/default.nix | 2 + .../user/configs/gui/matugen/options.nix | 0 .../user}/configs/gui/networking/default.nix | 0 .../user}/configs/gui/pipewire/default.nix | 0 .../user}/configs/gui/qalculate/default.nix | 0 .../gui/qalculate/skip-save-prefs.patch | 0 .../configs/gui/qt/KvAdwQt/KvAdwQt.kvconfig | 0 .../user}/configs/gui/qt/KvAdwQt/KvAdwQt.svg | 0 .../common/user}/configs/gui/qt/default.nix | 0 .../common/user}/configs/gui/rofi/default.nix | 0 .../common/user}/configs/gui/swww/default.nix | 0 .../user}/configs/gui/theme/default.nix | 2 + .../common/user/configs/gui/theme/options.nix | 0 .../common/user/configs/gui}/theme/theme.sh | 0 .../user}/configs/gui/vscode/default.nix | 0 .../user}/configs/gui/vscode/langs/nix.nix | 0 .../common/user}/configs/gui/wev/default.nix | 0 .../common/user}/configs/gui/x11/default.nix | 0 .../common/user/configs/options.nix | 0 hosts/eirene/default.nix | 31 +++++++- hosts/eirene/nick.nix | 70 +++++++++++++++++++ users/common/configs/persist/default.nix | 30 -------- users/common/configs/sops/default.nix | 22 ------ users/common/default.nix | 35 ---------- users/nick/console.nix | 41 ----------- users/nick/default.nix | 40 ----------- 103 files changed, 202 insertions(+), 217 deletions(-) delete mode 100644 hosts/common/configs/ssh/default.nix delete mode 100644 hosts/common/default.nix rename hosts/common/{ => system}/configs/bluetooth/default.nix (100%) rename hosts/common/{ => system}/configs/boot/default.nix (100%) rename hosts/common/{ => system}/configs/brightnessctl/default.nix (100%) rename hosts/common/{ => system}/configs/btop/default.nix (100%) rename hosts/common/{ => system}/configs/fastfetch/default.nix (100%) rename hosts/common/{ => system}/configs/getty/default.nix (100%) rename hosts/common/{ => system}/configs/git/default.nix (100%) rename hosts/common/{ => system}/configs/gpg-agent/default.nix (100%) rename hosts/common/{ => system}/configs/neovim/default.nix (100%) rename hosts/common/{ => system}/configs/networking/default.nix (100%) rename hosts/common/{ => system}/configs/nix-ld/default.nix (100%) rename hosts/common/{ => system}/configs/nix/default.nix (100%) rename hosts/common/{ => system}/configs/persist/default.nix (100%) rename hosts/common/{ => system}/configs/persist/impermanence.sh (100%) rename hosts/common/{ => system}/configs/pipewire/default.nix (100%) rename hosts/common/{ => system}/configs/plymouth/default.nix (100%) rename hosts/common/{ => system}/configs/ranger/default.nix (100%) rename hosts/common/{ => system}/configs/sops/default.nix (100%) create mode 100644 hosts/common/system/configs/ssh/default.nix rename hosts/common/{ => system}/configs/system/default.nix (100%) rename hosts/common/{ => system}/configs/tmux/default.nix (100%) rename hosts/common/{ => system}/configs/tree/default.nix (100%) rename hosts/common/{ => system}/configs/users/default.nix (100%) rename hosts/common/{ => system}/configs/zsh/default.nix (100%) rename hosts/common/{ => system}/scripts/cleanup/cleanup.sh (100%) rename hosts/common/{ => system}/scripts/cleanup/default.nix (100%) rename {users => hosts/common/user}/configs/console/bluetooth/default.nix (100%) rename {users => hosts/common/user}/configs/console/brightnessctl/default.nix (100%) rename {users => hosts/common/user}/configs/console/btop/default.nix (100%) rename {users => hosts/common/user}/configs/console/git/commit-msg.sh (100%) rename {users => hosts/common/user}/configs/console/git/default.nix (100%) rename {users => hosts/common/user}/configs/console/gpg-agent/default.nix (100%) rename {users => hosts/common/user}/configs/console/gpg-agent/import-gpg-keys.sh (100%) create mode 100644 hosts/common/user/configs/console/home-manager/default.nix rename {users => hosts/common/user}/configs/console/neovim/default.nix (100%) create mode 100644 hosts/common/user/configs/console/persist/default.nix rename {users => hosts/common/user}/configs/console/pipewire/default.nix (100%) create mode 100644 hosts/common/user/configs/console/sops/default.nix rename {users => hosts/common/user}/configs/console/syncthing/default.nix (100%) rename {users/common/configs => hosts/common/user/configs/console}/xdg/default.nix (60%) rename users/common/options/home-manager/xdg/default.nix => hosts/common/user/configs/console/xdg/options.nix (100%) rename {users => hosts/common/user}/configs/console/zsh/default.nix (100%) rename {users => hosts/common/user}/configs/gui/ags/config/.gitignore (100%) rename {users => hosts/common/user}/configs/gui/ags/config/.prettierrc.json (100%) rename {users => hosts/common/user}/configs/gui/ags/config/default.nix (100%) rename {users => hosts/common/user}/configs/gui/ags/config/eslint.config.js (100%) rename {users => hosts/common/user}/configs/gui/ags/config/package.json (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/index.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/lib.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/theme.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/widgets/bar/bar.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/widgets/bar/clipboard/clipboard.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/widgets/bar/date/date.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/widgets/bar/gap/gap.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/widgets/bar/launcher/launcher.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/widgets/bar/systray/systray.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/src/widgets/bar/workspace/workspace.ts (100%) rename {users => hosts/common/user}/configs/gui/ags/config/tsconfig.json (100%) rename {users => hosts/common/user}/configs/gui/ags/default.nix (100%) rename {users => hosts/common/user}/configs/gui/ags/theme.sass (100%) rename {users => hosts/common/user}/configs/gui/bluetooth/default.nix (100%) rename {users => hosts/common/user}/configs/gui/brightnessctl/default.nix (100%) rename {users => hosts/common/user}/configs/gui/btop/default.nix (100%) rename {users => hosts/common/user}/configs/gui/btop/theme.theme (100%) rename {users => hosts/common/user}/configs/gui/cbatticon/default.nix (100%) rename {users => hosts/common/user}/configs/gui/cliphist/default.nix (100%) rename {users => hosts/common/user}/configs/gui/firefox/default.nix (100%) rename {users => hosts/common/user}/configs/gui/gtk/default.nix (100%) rename {users => hosts/common/user}/configs/gui/gtk/theme.css (100%) rename {users => hosts/common/user}/configs/gui/hyprland/default.nix (99%) rename users/common/options/home-manager/hyprland/default.nix => hosts/common/user/configs/gui/hyprland/options.nix (100%) rename {users => hosts/common/user}/configs/gui/hyprland/theme.conf (100%) rename {users => hosts/common/user}/configs/gui/hyprshot/default.nix (100%) rename {users => hosts/common/user}/configs/gui/kitty/default.nix (100%) rename {users => hosts/common/user}/configs/gui/kitty/theme.conf (100%) rename {users => hosts/common/user}/configs/gui/matugen/default.nix (99%) rename users/common/options/home-manager/matugen/default.nix => hosts/common/user/configs/gui/matugen/options.nix (100%) rename {users => hosts/common/user}/configs/gui/networking/default.nix (100%) rename {users => hosts/common/user}/configs/gui/pipewire/default.nix (100%) rename {users => hosts/common/user}/configs/gui/qalculate/default.nix (100%) rename {users => hosts/common/user}/configs/gui/qalculate/skip-save-prefs.patch (100%) rename {users => hosts/common/user}/configs/gui/qt/KvAdwQt/KvAdwQt.kvconfig (100%) rename {users => hosts/common/user}/configs/gui/qt/KvAdwQt/KvAdwQt.svg (100%) rename {users => hosts/common/user}/configs/gui/qt/default.nix (100%) rename {users => hosts/common/user}/configs/gui/rofi/default.nix (100%) rename {users => hosts/common/user}/configs/gui/swww/default.nix (100%) rename {users => hosts/common/user}/configs/gui/theme/default.nix (95%) rename users/common/options/home-manager/theme/default.nix => hosts/common/user/configs/gui/theme/options.nix (100%) rename {users/common/options/home-manager => hosts/common/user/configs/gui}/theme/theme.sh (100%) rename {users => hosts/common/user}/configs/gui/vscode/default.nix (100%) rename {users => hosts/common/user}/configs/gui/vscode/langs/nix.nix (100%) rename {users => hosts/common/user}/configs/gui/wev/default.nix (100%) rename {users => hosts/common/user}/configs/gui/x11/default.nix (100%) rename users/common/options/default.nix => hosts/common/user/configs/options.nix (100%) create mode 100644 hosts/eirene/nick.nix delete mode 100644 users/common/configs/persist/default.nix delete mode 100644 users/common/configs/sops/default.nix delete mode 100644 users/common/default.nix delete mode 100644 users/nick/console.nix delete mode 100644 users/nick/default.nix diff --git a/hosts/common/configs/ssh/default.nix b/hosts/common/configs/ssh/default.nix deleted file mode 100644 index 347463d..0000000 --- a/hosts/common/configs/ssh/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - programs.ssh = { - knownHosts = { - eirene.publicKeyFile = ../../../eirene/secrets/ssh_host_ed25519_key.pub; - }; - }; -} diff --git a/hosts/common/default.nix b/hosts/common/default.nix deleted file mode 100644 index 1270a24..0000000 --- a/hosts/common/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - imports = [ - ./configs/boot - ./configs/system - ./configs/nix - ./configs/persist - ./configs/sops - ./configs/users - ./configs/getty - ./configs/plymouth - ./configs/networking - ./configs/bluetooth - ./configs/brightnessctl - ./configs/pipewire - ./configs/zsh - ./configs/neovim - ./configs/tmux - ./configs/ssh - ./configs/nix-ld - ./configs/git - ./configs/gpg-agent - ./configs/tree - ./configs/ranger - ./configs/btop - ./configs/fastfetch - ./scripts/cleanup - ]; - - i18n.defaultLocale = "en_US.UTF-8"; -} diff --git a/hosts/common/configs/bluetooth/default.nix b/hosts/common/system/configs/bluetooth/default.nix similarity index 100% rename from hosts/common/configs/bluetooth/default.nix rename to hosts/common/system/configs/bluetooth/default.nix diff --git a/hosts/common/configs/boot/default.nix b/hosts/common/system/configs/boot/default.nix similarity index 100% rename from hosts/common/configs/boot/default.nix rename to hosts/common/system/configs/boot/default.nix diff --git a/hosts/common/configs/brightnessctl/default.nix b/hosts/common/system/configs/brightnessctl/default.nix similarity index 100% rename from hosts/common/configs/brightnessctl/default.nix rename to hosts/common/system/configs/brightnessctl/default.nix diff --git a/hosts/common/configs/btop/default.nix b/hosts/common/system/configs/btop/default.nix similarity index 100% rename from hosts/common/configs/btop/default.nix rename to hosts/common/system/configs/btop/default.nix diff --git a/hosts/common/configs/fastfetch/default.nix b/hosts/common/system/configs/fastfetch/default.nix similarity index 100% rename from hosts/common/configs/fastfetch/default.nix rename to hosts/common/system/configs/fastfetch/default.nix diff --git a/hosts/common/configs/getty/default.nix b/hosts/common/system/configs/getty/default.nix similarity index 100% rename from hosts/common/configs/getty/default.nix rename to hosts/common/system/configs/getty/default.nix diff --git a/hosts/common/configs/git/default.nix b/hosts/common/system/configs/git/default.nix similarity index 100% rename from hosts/common/configs/git/default.nix rename to hosts/common/system/configs/git/default.nix diff --git a/hosts/common/configs/gpg-agent/default.nix b/hosts/common/system/configs/gpg-agent/default.nix similarity index 100% rename from hosts/common/configs/gpg-agent/default.nix rename to hosts/common/system/configs/gpg-agent/default.nix diff --git a/hosts/common/configs/neovim/default.nix b/hosts/common/system/configs/neovim/default.nix similarity index 100% rename from hosts/common/configs/neovim/default.nix rename to hosts/common/system/configs/neovim/default.nix diff --git a/hosts/common/configs/networking/default.nix b/hosts/common/system/configs/networking/default.nix similarity index 100% rename from hosts/common/configs/networking/default.nix rename to hosts/common/system/configs/networking/default.nix diff --git a/hosts/common/configs/nix-ld/default.nix b/hosts/common/system/configs/nix-ld/default.nix similarity index 100% rename from hosts/common/configs/nix-ld/default.nix rename to hosts/common/system/configs/nix-ld/default.nix diff --git a/hosts/common/configs/nix/default.nix b/hosts/common/system/configs/nix/default.nix similarity index 100% rename from hosts/common/configs/nix/default.nix rename to hosts/common/system/configs/nix/default.nix diff --git a/hosts/common/configs/persist/default.nix b/hosts/common/system/configs/persist/default.nix similarity index 100% rename from hosts/common/configs/persist/default.nix rename to hosts/common/system/configs/persist/default.nix diff --git a/hosts/common/configs/persist/impermanence.sh b/hosts/common/system/configs/persist/impermanence.sh similarity index 100% rename from hosts/common/configs/persist/impermanence.sh rename to hosts/common/system/configs/persist/impermanence.sh diff --git a/hosts/common/configs/pipewire/default.nix b/hosts/common/system/configs/pipewire/default.nix similarity index 100% rename from hosts/common/configs/pipewire/default.nix rename to hosts/common/system/configs/pipewire/default.nix diff --git a/hosts/common/configs/plymouth/default.nix b/hosts/common/system/configs/plymouth/default.nix similarity index 100% rename from hosts/common/configs/plymouth/default.nix rename to hosts/common/system/configs/plymouth/default.nix diff --git a/hosts/common/configs/ranger/default.nix b/hosts/common/system/configs/ranger/default.nix similarity index 100% rename from hosts/common/configs/ranger/default.nix rename to hosts/common/system/configs/ranger/default.nix diff --git a/hosts/common/configs/sops/default.nix b/hosts/common/system/configs/sops/default.nix similarity index 100% rename from hosts/common/configs/sops/default.nix rename to hosts/common/system/configs/sops/default.nix diff --git a/hosts/common/system/configs/ssh/default.nix b/hosts/common/system/configs/ssh/default.nix new file mode 100644 index 0000000..7647213 --- /dev/null +++ b/hosts/common/system/configs/ssh/default.nix @@ -0,0 +1,7 @@ +{ + programs.ssh = { + knownHosts = { + eirene.publicKeyFile = ../../../../eirene/secrets/ssh_host_ed25519_key.pub; + }; + }; +} diff --git a/hosts/common/configs/system/default.nix b/hosts/common/system/configs/system/default.nix similarity index 100% rename from hosts/common/configs/system/default.nix rename to hosts/common/system/configs/system/default.nix diff --git a/hosts/common/configs/tmux/default.nix b/hosts/common/system/configs/tmux/default.nix similarity index 100% rename from hosts/common/configs/tmux/default.nix rename to hosts/common/system/configs/tmux/default.nix diff --git a/hosts/common/configs/tree/default.nix b/hosts/common/system/configs/tree/default.nix similarity index 100% rename from hosts/common/configs/tree/default.nix rename to hosts/common/system/configs/tree/default.nix diff --git a/hosts/common/configs/users/default.nix b/hosts/common/system/configs/users/default.nix similarity index 100% rename from hosts/common/configs/users/default.nix rename to hosts/common/system/configs/users/default.nix diff --git a/hosts/common/configs/zsh/default.nix b/hosts/common/system/configs/zsh/default.nix similarity index 100% rename from hosts/common/configs/zsh/default.nix rename to hosts/common/system/configs/zsh/default.nix diff --git a/hosts/common/scripts/cleanup/cleanup.sh b/hosts/common/system/scripts/cleanup/cleanup.sh similarity index 100% rename from hosts/common/scripts/cleanup/cleanup.sh rename to hosts/common/system/scripts/cleanup/cleanup.sh diff --git a/hosts/common/scripts/cleanup/default.nix b/hosts/common/system/scripts/cleanup/default.nix similarity index 100% rename from hosts/common/scripts/cleanup/default.nix rename to hosts/common/system/scripts/cleanup/default.nix diff --git a/users/configs/console/bluetooth/default.nix b/hosts/common/user/configs/console/bluetooth/default.nix similarity index 100% rename from users/configs/console/bluetooth/default.nix rename to hosts/common/user/configs/console/bluetooth/default.nix diff --git a/users/configs/console/brightnessctl/default.nix b/hosts/common/user/configs/console/brightnessctl/default.nix similarity index 100% rename from users/configs/console/brightnessctl/default.nix rename to hosts/common/user/configs/console/brightnessctl/default.nix diff --git a/users/configs/console/btop/default.nix b/hosts/common/user/configs/console/btop/default.nix similarity index 100% rename from users/configs/console/btop/default.nix rename to hosts/common/user/configs/console/btop/default.nix diff --git a/users/configs/console/git/commit-msg.sh b/hosts/common/user/configs/console/git/commit-msg.sh similarity index 100% rename from users/configs/console/git/commit-msg.sh rename to hosts/common/user/configs/console/git/commit-msg.sh diff --git a/users/configs/console/git/default.nix b/hosts/common/user/configs/console/git/default.nix similarity index 100% rename from users/configs/console/git/default.nix rename to hosts/common/user/configs/console/git/default.nix diff --git a/users/configs/console/gpg-agent/default.nix b/hosts/common/user/configs/console/gpg-agent/default.nix similarity index 100% rename from users/configs/console/gpg-agent/default.nix rename to hosts/common/user/configs/console/gpg-agent/default.nix diff --git a/users/configs/console/gpg-agent/import-gpg-keys.sh b/hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh similarity index 100% rename from users/configs/console/gpg-agent/import-gpg-keys.sh rename to hosts/common/user/configs/console/gpg-agent/import-gpg-keys.sh diff --git a/hosts/common/user/configs/console/home-manager/default.nix b/hosts/common/user/configs/console/home-manager/default.nix new file mode 100644 index 0000000..8d6a8ab --- /dev/null +++ b/hosts/common/user/configs/console/home-manager/default.nix @@ -0,0 +1,26 @@ +{ + user ? throw "user argument is required", +}: +{ config, inputs, ... }: +{ + imports = [ + inputs.home-manager.nixosModules.default + ]; + + programs.dconf.enable = true; + + home-manager = { + extraSpecialArgs = { + inherit inputs; + }; + backupFileExtension = "bak"; + useGlobalPkgs = true; + + users.${user.name} = { + home.stateVersion = "24.05"; + systemd.user.startServices = "sd-switch"; + nix.settings = config.nix.settings; + nixpkgs.config = config.nixpkgs.config; + }; + }; +} diff --git a/users/configs/console/neovim/default.nix b/hosts/common/user/configs/console/neovim/default.nix similarity index 100% rename from users/configs/console/neovim/default.nix rename to hosts/common/user/configs/console/neovim/default.nix diff --git a/hosts/common/user/configs/console/persist/default.nix b/hosts/common/user/configs/console/persist/default.nix new file mode 100644 index 0000000..8c6e6d0 --- /dev/null +++ b/hosts/common/user/configs/console/persist/default.nix @@ -0,0 +1,30 @@ +{ + user ? throw "user argument is required", +}: +{ + config, + inputs, + lib, + ... +}: +{ + programs.fuse.userAllowOther = true; + + systemd.tmpfiles.rules = ( + [ + "d /persist/home 0755 root root -" + "d /cache/home 0755 root root -" + "d /persist${user.home} 0700 ${user.name} users -" + "d /cache${user.home} 0700 ${user.name} users -" + ] + ); + + home-manager.users.${user.name} = { + imports = [ inputs.impermanence.nixosModules.home-manager.impermanence ]; + + home.persistence = { + "/persist${user.home}".allowOther = true; + "/cache${user.home}".allowOther = true; + }; + }; +} diff --git a/users/configs/console/pipewire/default.nix b/hosts/common/user/configs/console/pipewire/default.nix similarity index 100% rename from users/configs/console/pipewire/default.nix rename to hosts/common/user/configs/console/pipewire/default.nix diff --git a/hosts/common/user/configs/console/sops/default.nix b/hosts/common/user/configs/console/sops/default.nix new file mode 100644 index 0000000..a2ac445 --- /dev/null +++ b/hosts/common/user/configs/console/sops/default.nix @@ -0,0 +1,24 @@ +{ + user ? throw "user argument is required", +}: +{ + config, + inputs, + lib, + ... +}: +let + sopsKeyPath = ".config/sops-nix/key.txt"; +in +{ + home-manager.users.${user.name} = { + imports = [ inputs.sops-nix.homeManagerModules.sops ]; + + sops.age.keyFile = "/persist${user.home}/${sopsKeyPath}"; + + home = { + persistence."/persist${user.home}".files = [ sopsKeyPath ]; + sessionVariables.SOPS_AGE_KEY_FILE = "${user.home}/${sopsKeyPath}"; + }; + }; +} diff --git a/users/configs/console/syncthing/default.nix b/hosts/common/user/configs/console/syncthing/default.nix similarity index 100% rename from users/configs/console/syncthing/default.nix rename to hosts/common/user/configs/console/syncthing/default.nix diff --git a/users/common/configs/xdg/default.nix b/hosts/common/user/configs/console/xdg/default.nix similarity index 60% rename from users/common/configs/xdg/default.nix rename to hosts/common/user/configs/console/xdg/default.nix index 01f7e37..b4eb3a5 100644 --- a/users/common/configs/xdg/default.nix +++ b/hosts/common/user/configs/console/xdg/default.nix @@ -1,9 +1,11 @@ -{ config, lib, ... }: -let - users = lib.attrsets.filterAttrs (_: config: config.isNormalUser) config.users.users; -in { - home-manager.users = lib.attrsets.mapAttrs (user: cfg: { + user ? throw "user argument is required", +}: +{ config, lib, ... }: +{ + home-manager.users.${user.name} = { + imports = [ ./options.nix ]; + xdg = { enable = true; mimeApps.enable = true; @@ -11,13 +13,13 @@ in userDirs = { enable = true; extraConfig = { - XDG_VM_DIR = "${cfg.home}/VMs"; - XDG_GIT_DIR = "${cfg.home}/git"; + XDG_VM_DIR = "${user.home}/VMs"; + XDG_GIT_DIR = "${user.home}/git"; }; }; }; - home.persistence."/persist${cfg.home}".directories = [ + home.persistence."/persist${user.home}".directories = [ "Desktop" # userDirs.desktop "Documents" # userDirs.documents "Downloads" # userDirs.download @@ -28,5 +30,5 @@ in "VMs" "git" ]; - }) users; + }; } diff --git a/users/common/options/home-manager/xdg/default.nix b/hosts/common/user/configs/console/xdg/options.nix similarity index 100% rename from users/common/options/home-manager/xdg/default.nix rename to hosts/common/user/configs/console/xdg/options.nix diff --git a/users/configs/console/zsh/default.nix b/hosts/common/user/configs/console/zsh/default.nix similarity index 100% rename from users/configs/console/zsh/default.nix rename to hosts/common/user/configs/console/zsh/default.nix diff --git a/users/configs/gui/ags/config/.gitignore b/hosts/common/user/configs/gui/ags/config/.gitignore similarity index 100% rename from users/configs/gui/ags/config/.gitignore rename to hosts/common/user/configs/gui/ags/config/.gitignore diff --git a/users/configs/gui/ags/config/.prettierrc.json b/hosts/common/user/configs/gui/ags/config/.prettierrc.json similarity index 100% rename from users/configs/gui/ags/config/.prettierrc.json rename to hosts/common/user/configs/gui/ags/config/.prettierrc.json diff --git a/users/configs/gui/ags/config/default.nix b/hosts/common/user/configs/gui/ags/config/default.nix similarity index 100% rename from users/configs/gui/ags/config/default.nix rename to hosts/common/user/configs/gui/ags/config/default.nix diff --git a/users/configs/gui/ags/config/eslint.config.js b/hosts/common/user/configs/gui/ags/config/eslint.config.js similarity index 100% rename from users/configs/gui/ags/config/eslint.config.js rename to hosts/common/user/configs/gui/ags/config/eslint.config.js diff --git a/users/configs/gui/ags/config/package.json b/hosts/common/user/configs/gui/ags/config/package.json similarity index 100% rename from users/configs/gui/ags/config/package.json rename to hosts/common/user/configs/gui/ags/config/package.json diff --git a/users/configs/gui/ags/config/src/index.ts b/hosts/common/user/configs/gui/ags/config/src/index.ts similarity index 100% rename from users/configs/gui/ags/config/src/index.ts rename to hosts/common/user/configs/gui/ags/config/src/index.ts diff --git a/users/configs/gui/ags/config/src/lib.ts b/hosts/common/user/configs/gui/ags/config/src/lib.ts similarity index 100% rename from users/configs/gui/ags/config/src/lib.ts rename to hosts/common/user/configs/gui/ags/config/src/lib.ts diff --git a/users/configs/gui/ags/config/src/theme.ts b/hosts/common/user/configs/gui/ags/config/src/theme.ts similarity index 100% rename from users/configs/gui/ags/config/src/theme.ts rename to hosts/common/user/configs/gui/ags/config/src/theme.ts diff --git a/users/configs/gui/ags/config/src/widgets/bar/bar.ts b/hosts/common/user/configs/gui/ags/config/src/widgets/bar/bar.ts similarity index 100% rename from users/configs/gui/ags/config/src/widgets/bar/bar.ts rename to hosts/common/user/configs/gui/ags/config/src/widgets/bar/bar.ts diff --git a/users/configs/gui/ags/config/src/widgets/bar/clipboard/clipboard.ts b/hosts/common/user/configs/gui/ags/config/src/widgets/bar/clipboard/clipboard.ts similarity index 100% rename from users/configs/gui/ags/config/src/widgets/bar/clipboard/clipboard.ts rename to hosts/common/user/configs/gui/ags/config/src/widgets/bar/clipboard/clipboard.ts diff --git a/users/configs/gui/ags/config/src/widgets/bar/date/date.ts b/hosts/common/user/configs/gui/ags/config/src/widgets/bar/date/date.ts similarity index 100% rename from users/configs/gui/ags/config/src/widgets/bar/date/date.ts rename to hosts/common/user/configs/gui/ags/config/src/widgets/bar/date/date.ts diff --git a/users/configs/gui/ags/config/src/widgets/bar/gap/gap.ts b/hosts/common/user/configs/gui/ags/config/src/widgets/bar/gap/gap.ts similarity index 100% rename from users/configs/gui/ags/config/src/widgets/bar/gap/gap.ts rename to hosts/common/user/configs/gui/ags/config/src/widgets/bar/gap/gap.ts diff --git a/users/configs/gui/ags/config/src/widgets/bar/launcher/launcher.ts b/hosts/common/user/configs/gui/ags/config/src/widgets/bar/launcher/launcher.ts similarity index 100% rename from users/configs/gui/ags/config/src/widgets/bar/launcher/launcher.ts rename to hosts/common/user/configs/gui/ags/config/src/widgets/bar/launcher/launcher.ts diff --git a/users/configs/gui/ags/config/src/widgets/bar/systray/systray.ts b/hosts/common/user/configs/gui/ags/config/src/widgets/bar/systray/systray.ts similarity index 100% rename from users/configs/gui/ags/config/src/widgets/bar/systray/systray.ts rename to hosts/common/user/configs/gui/ags/config/src/widgets/bar/systray/systray.ts diff --git a/users/configs/gui/ags/config/src/widgets/bar/workspace/workspace.ts b/hosts/common/user/configs/gui/ags/config/src/widgets/bar/workspace/workspace.ts similarity index 100% rename from users/configs/gui/ags/config/src/widgets/bar/workspace/workspace.ts rename to hosts/common/user/configs/gui/ags/config/src/widgets/bar/workspace/workspace.ts diff --git a/users/configs/gui/ags/config/tsconfig.json b/hosts/common/user/configs/gui/ags/config/tsconfig.json similarity index 100% rename from users/configs/gui/ags/config/tsconfig.json rename to hosts/common/user/configs/gui/ags/config/tsconfig.json diff --git a/users/configs/gui/ags/default.nix b/hosts/common/user/configs/gui/ags/default.nix similarity index 100% rename from users/configs/gui/ags/default.nix rename to hosts/common/user/configs/gui/ags/default.nix diff --git a/users/configs/gui/ags/theme.sass b/hosts/common/user/configs/gui/ags/theme.sass similarity index 100% rename from users/configs/gui/ags/theme.sass rename to hosts/common/user/configs/gui/ags/theme.sass diff --git a/users/configs/gui/bluetooth/default.nix b/hosts/common/user/configs/gui/bluetooth/default.nix similarity index 100% rename from users/configs/gui/bluetooth/default.nix rename to hosts/common/user/configs/gui/bluetooth/default.nix diff --git a/users/configs/gui/brightnessctl/default.nix b/hosts/common/user/configs/gui/brightnessctl/default.nix similarity index 100% rename from users/configs/gui/brightnessctl/default.nix rename to hosts/common/user/configs/gui/brightnessctl/default.nix diff --git a/users/configs/gui/btop/default.nix b/hosts/common/user/configs/gui/btop/default.nix similarity index 100% rename from users/configs/gui/btop/default.nix rename to hosts/common/user/configs/gui/btop/default.nix diff --git a/users/configs/gui/btop/theme.theme b/hosts/common/user/configs/gui/btop/theme.theme similarity index 100% rename from users/configs/gui/btop/theme.theme rename to hosts/common/user/configs/gui/btop/theme.theme diff --git a/users/configs/gui/cbatticon/default.nix b/hosts/common/user/configs/gui/cbatticon/default.nix similarity index 100% rename from users/configs/gui/cbatticon/default.nix rename to hosts/common/user/configs/gui/cbatticon/default.nix diff --git a/users/configs/gui/cliphist/default.nix b/hosts/common/user/configs/gui/cliphist/default.nix similarity index 100% rename from users/configs/gui/cliphist/default.nix rename to hosts/common/user/configs/gui/cliphist/default.nix diff --git a/users/configs/gui/firefox/default.nix b/hosts/common/user/configs/gui/firefox/default.nix similarity index 100% rename from users/configs/gui/firefox/default.nix rename to hosts/common/user/configs/gui/firefox/default.nix diff --git a/users/configs/gui/gtk/default.nix b/hosts/common/user/configs/gui/gtk/default.nix similarity index 100% rename from users/configs/gui/gtk/default.nix rename to hosts/common/user/configs/gui/gtk/default.nix diff --git a/users/configs/gui/gtk/theme.css b/hosts/common/user/configs/gui/gtk/theme.css similarity index 100% rename from users/configs/gui/gtk/theme.css rename to hosts/common/user/configs/gui/gtk/theme.css diff --git a/users/configs/gui/hyprland/default.nix b/hosts/common/user/configs/gui/hyprland/default.nix similarity index 99% rename from users/configs/gui/hyprland/default.nix rename to hosts/common/user/configs/gui/hyprland/default.nix index 943e7e9..b085cf0 100644 --- a/users/configs/gui/hyprland/default.nix +++ b/hosts/common/user/configs/gui/hyprland/default.nix @@ -14,6 +14,8 @@ in programs.hyprland.enable = true; home-manager.users.${user.name} = { + imports = [ ./options.nix ]; + wayland.windowManager.hyprland = { enable = true; diff --git a/users/common/options/home-manager/hyprland/default.nix b/hosts/common/user/configs/gui/hyprland/options.nix similarity index 100% rename from users/common/options/home-manager/hyprland/default.nix rename to hosts/common/user/configs/gui/hyprland/options.nix diff --git a/users/configs/gui/hyprland/theme.conf b/hosts/common/user/configs/gui/hyprland/theme.conf similarity index 100% rename from users/configs/gui/hyprland/theme.conf rename to hosts/common/user/configs/gui/hyprland/theme.conf diff --git a/users/configs/gui/hyprshot/default.nix b/hosts/common/user/configs/gui/hyprshot/default.nix similarity index 100% rename from users/configs/gui/hyprshot/default.nix rename to hosts/common/user/configs/gui/hyprshot/default.nix diff --git a/users/configs/gui/kitty/default.nix b/hosts/common/user/configs/gui/kitty/default.nix similarity index 100% rename from users/configs/gui/kitty/default.nix rename to hosts/common/user/configs/gui/kitty/default.nix diff --git a/users/configs/gui/kitty/theme.conf b/hosts/common/user/configs/gui/kitty/theme.conf similarity index 100% rename from users/configs/gui/kitty/theme.conf rename to hosts/common/user/configs/gui/kitty/theme.conf diff --git a/users/configs/gui/matugen/default.nix b/hosts/common/user/configs/gui/matugen/default.nix similarity index 99% rename from users/configs/gui/matugen/default.nix rename to hosts/common/user/configs/gui/matugen/default.nix index 33d1175..fbea611 100644 --- a/users/configs/gui/matugen/default.nix +++ b/hosts/common/user/configs/gui/matugen/default.nix @@ -12,6 +12,8 @@ let in { home-manager.users.${user.name} = { + imports = [ ./options.nix ]; + programs.matugen = { enable = true; settings = { diff --git a/users/common/options/home-manager/matugen/default.nix b/hosts/common/user/configs/gui/matugen/options.nix similarity index 100% rename from users/common/options/home-manager/matugen/default.nix rename to hosts/common/user/configs/gui/matugen/options.nix diff --git a/users/configs/gui/networking/default.nix b/hosts/common/user/configs/gui/networking/default.nix similarity index 100% rename from users/configs/gui/networking/default.nix rename to hosts/common/user/configs/gui/networking/default.nix diff --git a/users/configs/gui/pipewire/default.nix b/hosts/common/user/configs/gui/pipewire/default.nix similarity index 100% rename from users/configs/gui/pipewire/default.nix rename to hosts/common/user/configs/gui/pipewire/default.nix diff --git a/users/configs/gui/qalculate/default.nix b/hosts/common/user/configs/gui/qalculate/default.nix similarity index 100% rename from users/configs/gui/qalculate/default.nix rename to hosts/common/user/configs/gui/qalculate/default.nix diff --git a/users/configs/gui/qalculate/skip-save-prefs.patch b/hosts/common/user/configs/gui/qalculate/skip-save-prefs.patch similarity index 100% rename from users/configs/gui/qalculate/skip-save-prefs.patch rename to hosts/common/user/configs/gui/qalculate/skip-save-prefs.patch diff --git a/users/configs/gui/qt/KvAdwQt/KvAdwQt.kvconfig b/hosts/common/user/configs/gui/qt/KvAdwQt/KvAdwQt.kvconfig similarity index 100% rename from users/configs/gui/qt/KvAdwQt/KvAdwQt.kvconfig rename to hosts/common/user/configs/gui/qt/KvAdwQt/KvAdwQt.kvconfig diff --git a/users/configs/gui/qt/KvAdwQt/KvAdwQt.svg b/hosts/common/user/configs/gui/qt/KvAdwQt/KvAdwQt.svg similarity index 100% rename from users/configs/gui/qt/KvAdwQt/KvAdwQt.svg rename to hosts/common/user/configs/gui/qt/KvAdwQt/KvAdwQt.svg diff --git a/users/configs/gui/qt/default.nix b/hosts/common/user/configs/gui/qt/default.nix similarity index 100% rename from users/configs/gui/qt/default.nix rename to hosts/common/user/configs/gui/qt/default.nix diff --git a/users/configs/gui/rofi/default.nix b/hosts/common/user/configs/gui/rofi/default.nix similarity index 100% rename from users/configs/gui/rofi/default.nix rename to hosts/common/user/configs/gui/rofi/default.nix diff --git a/users/configs/gui/swww/default.nix b/hosts/common/user/configs/gui/swww/default.nix similarity index 100% rename from users/configs/gui/swww/default.nix rename to hosts/common/user/configs/gui/swww/default.nix diff --git a/users/configs/gui/theme/default.nix b/hosts/common/user/configs/gui/theme/default.nix similarity index 95% rename from users/configs/gui/theme/default.nix rename to hosts/common/user/configs/gui/theme/default.nix index 966b7a1..7272a9c 100644 --- a/users/configs/gui/theme/default.nix +++ b/hosts/common/user/configs/gui/theme/default.nix @@ -14,6 +14,8 @@ let in { home-manager.users.${user.name} = { + imports = [ ./options.nix ]; + theme.enable = true; wayland.windowManager.hyprland.settings.bind = [ diff --git a/users/common/options/home-manager/theme/default.nix b/hosts/common/user/configs/gui/theme/options.nix similarity index 100% rename from users/common/options/home-manager/theme/default.nix rename to hosts/common/user/configs/gui/theme/options.nix diff --git a/users/common/options/home-manager/theme/theme.sh b/hosts/common/user/configs/gui/theme/theme.sh similarity index 100% rename from users/common/options/home-manager/theme/theme.sh rename to hosts/common/user/configs/gui/theme/theme.sh diff --git a/users/configs/gui/vscode/default.nix b/hosts/common/user/configs/gui/vscode/default.nix similarity index 100% rename from users/configs/gui/vscode/default.nix rename to hosts/common/user/configs/gui/vscode/default.nix diff --git a/users/configs/gui/vscode/langs/nix.nix b/hosts/common/user/configs/gui/vscode/langs/nix.nix similarity index 100% rename from users/configs/gui/vscode/langs/nix.nix rename to hosts/common/user/configs/gui/vscode/langs/nix.nix diff --git a/users/configs/gui/wev/default.nix b/hosts/common/user/configs/gui/wev/default.nix similarity index 100% rename from users/configs/gui/wev/default.nix rename to hosts/common/user/configs/gui/wev/default.nix diff --git a/users/configs/gui/x11/default.nix b/hosts/common/user/configs/gui/x11/default.nix similarity index 100% rename from users/configs/gui/x11/default.nix rename to hosts/common/user/configs/gui/x11/default.nix diff --git a/users/common/options/default.nix b/hosts/common/user/configs/options.nix similarity index 100% rename from users/common/options/default.nix rename to hosts/common/user/configs/options.nix diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix index eeac62c..5e40ab0 100644 --- a/hosts/eirene/default.nix +++ b/hosts/eirene/default.nix @@ -1,9 +1,34 @@ { imports = [ - ../common - (import ../../users/nick { autologin = true; }) + ../common/system/configs/boot + ../common/system/configs/system + ../common/system/configs/nix + ../common/system/configs/persist + ../common/system/configs/sops + ../common/system/configs/users + ../common/system/configs/getty + ../common/system/configs/plymouth + ../common/system/configs/networking + ../common/system/configs/bluetooth + ../common/system/configs/brightnessctl + ../common/system/configs/pipewire + ../common/system/configs/zsh + ../common/system/configs/neovim + ../common/system/configs/tmux + ../common/system/configs/ssh + ../common/system/configs/nix-ld + ../common/system/configs/git + ../common/system/configs/gpg-agent + ../common/system/configs/tree + ../common/system/configs/ranger + ../common/system/configs/btop + ../common/system/configs/fastfetch + ../common/system/scripts/cleanup + ./nick.nix ]; - sops.defaultSopsFile = ./secrets/secrets.yaml; + i18n.defaultLocale = "en_US.UTF-8"; time.timeZone = "Europe/Athens"; + + sops.defaultSopsFile = ./secrets/secrets.yaml; } diff --git a/hosts/eirene/nick.nix b/hosts/eirene/nick.nix new file mode 100644 index 0000000..f46d63c --- /dev/null +++ b/hosts/eirene/nick.nix @@ -0,0 +1,70 @@ +{ config, ... }: +let + user = config.users.users.nick; +in +{ + imports = [ + ../common/user/configs/options.nix + (import ../common/user/configs/console/bluetooth { inherit user; }) + (import ../common/user/configs/console/brightnessctl { inherit user; }) + (import ../common/user/configs/console/btop { inherit user; }) + (import ../common/user/configs/console/git { inherit user; }) + (import ../common/user/configs/console/gpg-agent { inherit user; }) + (import ../common/user/configs/console/home-manager { inherit user; }) + (import ../common/user/configs/console/neovim { inherit user; }) + (import ../common/user/configs/console/persist { inherit user; }) + (import ../common/user/configs/console/pipewire { inherit user; }) + (import ../common/user/configs/console/sops { inherit user; }) + (import ../common/user/configs/console/syncthing { inherit user; }) + (import ../common/user/configs/console/xdg { inherit user; }) + (import ../common/user/configs/console/zsh { inherit user; }) + (import ../common/user/configs/gui/ags { inherit user; }) + (import ../common/user/configs/gui/bluetooth { inherit user; }) + (import ../common/user/configs/gui/brightnessctl { inherit user; }) + (import ../common/user/configs/gui/btop { inherit user; }) + # (import ../common/user/configs/gui/cbatticon { inherit user; }) + (import ../common/user/configs/gui/cliphist { inherit user; }) + (import ../common/user/configs/gui/firefox { inherit user; }) + (import ../common/user/configs/gui/gtk { inherit user; }) + (import ../common/user/configs/gui/hyprland { inherit user; }) + (import ../common/user/configs/gui/hyprshot { inherit user; }) + (import ../common/user/configs/gui/kitty { inherit user; }) + (import ../common/user/configs/gui/matugen { inherit user; }) + (import ../common/user/configs/gui/networking { inherit user; }) + (import ../common/user/configs/gui/pipewire { inherit user; }) + (import ../common/user/configs/gui/qalculate { inherit user; }) + (import ../common/user/configs/gui/qt { inherit user; }) + (import ../common/user/configs/gui/rofi { inherit user; }) + (import ../common/user/configs/gui/swww { inherit user; }) + (import ../common/user/configs/gui/theme { inherit user; }) + (import ../common/user/configs/gui/vscode { inherit user; }) + (import ../common/user/configs/gui/wev { inherit user; }) + (import ../common/user/configs/gui/x11 { inherit user; }) + ]; + + sops.secrets.nick-password = { + sopsFile = ../../users/nick/secrets/secrets.yaml; + key = "password"; + neededForUsers = true; + }; + + users.users.nick = { + isNormalUser = true; + home = "/home/nick"; + email = "nick@karaolidis.com"; + fullName = "Nikolaos Karaolidis"; + description = user.fullName; + hashedPasswordFile = config.sops.secrets.nick-password.path; + extraGroups = [ "wheel" ]; + linger = true; + uid = 1000; + }; + + services.getty.autologinUser = user.name; + + home-manager.users.${user.name} = { + home.homeDirectory = user.home; + sops.defaultSopsFile = ../../users/nick/secrets/secrets.yaml; + theme.wallpaper = ../../users/nick/secrets/wallpapers/clouds.png; + }; +} diff --git a/users/common/configs/persist/default.nix b/users/common/configs/persist/default.nix deleted file mode 100644 index 429097e..0000000 --- a/users/common/configs/persist/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - inputs, - lib, - ... -}: -let - users = lib.attrsets.filterAttrs (_: config: config.isNormalUser) config.users.users; -in -{ - programs.fuse.userAllowOther = lib.mkIf (users != [ ]) true; - - systemd.tmpfiles.rules = lib.mkIf (users != [ ]) ( - [ - "d /persist/home 0755 root root -" - "d /cache/home 0755 root root -" - ] - ++ lib.attrsets.mapAttrsToList (user: config: "d /persist${config.home} 0700 ${user} users -") users - ++ lib.attrsets.mapAttrsToList (user: config: "d /cache${config.home} 0700 ${user} users -") users - ); - - home-manager.users = lib.attrsets.mapAttrs (user: config: { - imports = [ inputs.impermanence.nixosModules.home-manager.impermanence ]; - - home.persistence = { - "/persist${config.home}".allowOther = true; - "/cache${config.home}".allowOther = true; - }; - }) users; -} diff --git a/users/common/configs/sops/default.nix b/users/common/configs/sops/default.nix deleted file mode 100644 index 2df868d..0000000 --- a/users/common/configs/sops/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - inputs, - lib, - ... -}: -let - users = lib.attrsets.filterAttrs (_: config: config.isNormalUser) config.users.users; - sopsKeyPath = ".config/sops-nix/key.txt"; -in -{ - home-manager.users = lib.attrsets.mapAttrs (user: config: { - imports = [ inputs.sops-nix.homeManagerModules.sops ]; - - sops.age.keyFile = "/persist${config.home}/${sopsKeyPath}"; - - home = { - persistence."/persist${config.home}".files = [ sopsKeyPath ]; - sessionVariables.SOPS_AGE_KEY_FILE = "${config.home}/${sopsKeyPath}"; - }; - }) users; -} diff --git a/users/common/default.nix b/users/common/default.nix deleted file mode 100644 index bcc8ad2..0000000 --- a/users/common/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, inputs, ... }: -{ - imports = [ - inputs.home-manager.nixosModules.default - ./options - ./configs/persist - ./configs/sops - ./configs/xdg - ]; - - home-manager = { - extraSpecialArgs = { - inherit inputs; - }; - backupFileExtension = "bak"; - useGlobalPkgs = true; - sharedModules = [ - { - imports = [ - ./options/home-manager/xdg - ./options/home-manager/hyprland - ./options/home-manager/matugen - ./options/home-manager/theme - ]; - - home.stateVersion = "24.05"; - systemd.user.startServices = "sd-switch"; - nix.settings = config.nix.settings; - nixpkgs.config = config.nixpkgs.config; - } - ]; - }; - - programs.dconf.enable = true; -} diff --git a/users/nick/console.nix b/users/nick/console.nix deleted file mode 100644 index 535fca0..0000000 --- a/users/nick/console.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, ... }: -let - user = config.users.users.nick; -in -{ - imports = [ - ../common - (import ../configs/console/bluetooth { inherit user; }) - (import ../configs/console/brightnessctl { inherit user; }) - (import ../configs/console/btop { inherit user; }) - (import ../configs/console/git { inherit user; }) - (import ../configs/console/gpg-agent { inherit user; }) - (import ../configs/console/neovim { inherit user; }) - (import ../configs/console/pipewire { inherit user; }) - (import ../configs/console/syncthing { inherit user; }) - (import ../configs/console/zsh { inherit user; }) - ]; - - sops.secrets.nick-password = { - sopsFile = ./secrets/secrets.yaml; - key = "password"; - neededForUsers = true; - }; - - users.users.nick = { - isNormalUser = true; - home = "/home/nick"; - email = "nick@karaolidis.com"; - fullName = "Nikolaos Karaolidis"; - description = user.fullName; - hashedPasswordFile = config.sops.secrets.nick-password.path; - extraGroups = [ "wheel" ]; - linger = true; - uid = 1000; - }; - - home-manager.users.nick = { - home.homeDirectory = user.home; - sops.defaultSopsFile = ./secrets/secrets.yaml; - }; -} diff --git a/users/nick/default.nix b/users/nick/default.nix deleted file mode 100644 index 3ddf331..0000000 --- a/users/nick/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - autologin ? false, -}: -{ config, lib, ... }: -let - user = config.users.users.nick; -in -{ - imports = [ - ./console.nix - (import ../configs/gui/ags { inherit user; }) - (import ../configs/gui/bluetooth { inherit user; }) - (import ../configs/gui/brightnessctl { inherit user; }) - (import ../configs/gui/btop { inherit user; }) - # (import ../configs/gui/cbatticon { inherit user; }) - (import ../configs/gui/cliphist { inherit user; }) - (import ../configs/gui/firefox { inherit user; }) - (import ../configs/gui/gtk { inherit user; }) - (import ../configs/gui/hyprland { inherit user; }) - (import ../configs/gui/hyprshot { inherit user; }) - (import ../configs/gui/kitty { inherit user; }) - (import ../configs/gui/matugen { inherit user; }) - (import ../configs/gui/networking { inherit user; }) - (import ../configs/gui/pipewire { inherit user; }) - (import ../configs/gui/qalculate { inherit user; }) - (import ../configs/gui/qt { inherit user; }) - (import ../configs/gui/rofi { inherit user; }) - (import ../configs/gui/swww { inherit user; }) - (import ../configs/gui/theme { inherit user; }) - (import ../configs/gui/vscode { inherit user; }) - (import ../configs/gui/wev { inherit user; }) - (import ../configs/gui/x11 { inherit user; }) - ]; - - home-manager.users.nick = { - theme.wallpaper = ./wallpapers/clouds.png; - }; - - services.getty.autologinUser = lib.mkIf autologin user.name; -}