From 00e003214ff095d5e133b25f1baf17cffbd04ab3 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 20 Oct 2023 20:29:11 +0200 Subject: [PATCH] Move users directory up --- nixos/README.md | 2 +- nixos/flake.nix | 3 +-- nixos/hosts/Tibo-NixFat/default.nix | 1 + nixos/modules/default.nix | 1 - nixos/{modules => }/users/default.nix | 0 .../{modules => }/users/tdpeuter/default.nix | 0 .../{modules => }/users/tdpeuter/dotfiles.nix | 22 +++++++++---------- .../{modules => }/users/tdpeuter/firefox.nix | 0 nixos/{modules => }/users/tdpeuter/mail.nix | 0 .../{modules => }/users/tdpeuter/secrets.nix | 6 ++--- 10 files changed, 17 insertions(+), 18 deletions(-) rename nixos/{modules => }/users/default.nix (100%) rename nixos/{modules => }/users/tdpeuter/default.nix (100%) rename nixos/{modules => }/users/tdpeuter/dotfiles.nix (81%) rename nixos/{modules => }/users/tdpeuter/firefox.nix (100%) rename nixos/{modules => }/users/tdpeuter/mail.nix (100%) rename nixos/{modules => }/users/tdpeuter/secrets.nix (82%) diff --git a/nixos/README.md b/nixos/README.md index e059c53..03b91e9 100644 --- a/nixos/README.md +++ b/nixos/README.md @@ -9,8 +9,8 @@ The directory structure is organized as follows: - [`flake.nix`](./flake.nix): Main entrypoint for the configuration. - [hosts/*hostname*](./hosts): Host-specific configuration by setting options. Each host has its own folder. - [modules](./modules): Declarations of configuration options. -- [modules/users/*username*](./modules/users): User-specific configuration. Users are defined as modules, as they are dependent on a host machine. - [overlays](./overlays): Attribute overrides for Nix Packages. - [secrets](./secrets): Encrypted files that store sensitive information, such as SSH private keys. +- [users/*username*](./modules/users): User-specific configuration. Users are defined as modules, so they can be enabled or disabled on a host machine. [Modules](https://nixos.wiki/wiki/NixOS_modules) are a key component of NixOS. They encapsulate various configuration options, which should make it easy for you to integrate it into your specific configuration. diff --git a/nixos/flake.nix b/nixos/flake.nix index f2ec5c5..e6a679e 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -58,8 +58,7 @@ home-manager.nixosModule sops-nix.nixosModules.sops ./modules - - ./modules-old # Wordt stilaan weggewerkt + ./users ]; }; diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix index 7dec708..1cea7fa 100644 --- a/nixos/hosts/Tibo-NixFat/default.nix +++ b/nixos/hosts/Tibo-NixFat/default.nix @@ -4,6 +4,7 @@ imports = [ ./hardware-configuration.nix ../../modules-old/hardware/nvidia.nix + ../../modules-old ]; sisyphus = { diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index b9d9008..c7dbaae 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -2,7 +2,6 @@ imports = [ ./programs ./services - ./users ./virtualisation ]; } diff --git a/nixos/modules/users/default.nix b/nixos/users/default.nix similarity index 100% rename from nixos/modules/users/default.nix rename to nixos/users/default.nix diff --git a/nixos/modules/users/tdpeuter/default.nix b/nixos/users/tdpeuter/default.nix similarity index 100% rename from nixos/modules/users/tdpeuter/default.nix rename to nixos/users/tdpeuter/default.nix diff --git a/nixos/modules/users/tdpeuter/dotfiles.nix b/nixos/users/tdpeuter/dotfiles.nix similarity index 81% rename from nixos/modules/users/tdpeuter/dotfiles.nix rename to nixos/users/tdpeuter/dotfiles.nix index e437cc1..d0a6df6 100644 --- a/nixos/modules/users/tdpeuter/dotfiles.nix +++ b/nixos/users/tdpeuter/dotfiles.nix @@ -10,33 +10,33 @@ in { home = { file = { ".config/alacritty" = lib.mkIf (builtins.elem pkgs.alacritty installedPkgs) { - source = ../../../../stow/alacritty/.config/alacritty; + source = ../../../stow/alacritty/.config/alacritty; }; ".config/git" = { enable = (builtins.elem pkgs.git installedPkgs); - source = ../../../../stow/git/.config/git; + source = ../../../stow/git/.config/git; recursive = true; }; ".config/kitty" = { enable = builtins.elem pkgs.kitty installedPkgs; - source = ../../../../stow/kitty/.config/kitty; + source = ../../../stow/kitty/.config/kitty; recursive = true; }; ".config/mpv" = { enable = (builtins.elem pkgs-unstable.mpv installedPkgs); - source = ../../../../stow/mpv/.config/mpv; + source = ../../../stow/mpv/.config/mpv; }; ".ssh/config" = lib.mkIf config.sisyphus.programs.ssh.enable { - source = ../../../../stow/ssh/.ssh/config; + source = ../../../stow/ssh/.ssh/config; }; ".config/vifm" = { enable = (builtins.elem pkgs.vifm installedPkgs); - source = ../../../../stow/vifm/.config/vifm; + source = ../../../stow/vifm/.config/vifm; recursive = true; }; ".config/zellij" = { enable = (builtins.elem pkgs.zellij installedPkgs); - source = ../../../../stow/zellij/.config/zellij; + source = ../../../stow/zellij/.config/zellij; }; ".oh-my-zsh" = { enable = (builtins.elem pkgs.zsh installedPkgs); @@ -45,11 +45,11 @@ in { }; ".oh-my-zsh/themes/tdpeuter.zsh-theme" = { enable = (builtins.elem pkgs.zsh installedPkgs); - source = ../../../../stow/zsh/.oh-my-zsh/themes/tdpeuter.zsh-theme; + source = ../../../stow/zsh/.oh-my-zsh/themes/tdpeuter.zsh-theme; }; ".vim" = { enable = (builtins.elem pkgs.vim installedPkgs); - source = ../../../../stow/vim/.vim; + source = ../../../stow/vim/.vim; recursive = true; }; ".vim/autoload/plug.vim" = { @@ -58,11 +58,11 @@ in { }; ".vimrc" = { enable = (builtins.elem pkgs.vim installedPkgs); - source = ../../../../stow/vim/.vimrc; + source = ../../../stow/vim/.vimrc; }; ".zshrc" = { enable = (config.users.users.tdpeuter.shell == pkgs.zsh); - source = ../../../../stow/zsh/.zshrc; + source = ../../../stow/zsh/.zshrc; }; ".zsh/plugins/cmdtime/cmdtime.plugin.zsh" = { enable = (builtins.elem pkgs.cmdtime installedPkgs); diff --git a/nixos/modules/users/tdpeuter/firefox.nix b/nixos/users/tdpeuter/firefox.nix similarity index 100% rename from nixos/modules/users/tdpeuter/firefox.nix rename to nixos/users/tdpeuter/firefox.nix diff --git a/nixos/modules/users/tdpeuter/mail.nix b/nixos/users/tdpeuter/mail.nix similarity index 100% rename from nixos/modules/users/tdpeuter/mail.nix rename to nixos/users/tdpeuter/mail.nix diff --git a/nixos/modules/users/tdpeuter/secrets.nix b/nixos/users/tdpeuter/secrets.nix similarity index 82% rename from nixos/modules/users/tdpeuter/secrets.nix rename to nixos/users/tdpeuter/secrets.nix index b2f208c..f97cdb0 100644 --- a/nixos/modules/users/tdpeuter/secrets.nix +++ b/nixos/users/tdpeuter/secrets.nix @@ -9,12 +9,12 @@ in { let Hugo = { format = "yaml"; - sopsFile = ../../../secrets/Hugo.yaml; + sopsFile = ../../secrets/Hugo.yaml; owner = user; }; UGent = { format = "yaml"; - sopsFile = ../../../secrets/UGent.yaml; + sopsFile = ../../secrets/UGent.yaml; owner = user; }; in { @@ -23,7 +23,7 @@ in { "GitHub/ssh" = { format = "yaml"; - sopsFile = ../../../secrets/GitHub.yaml; + sopsFile = ../../secrets/GitHub.yaml; owner = user; }; "Hugo/Gitea/ssh" = Hugo;