treewide: refactor structure

I have decided to refactor the entire structure of my repository, as the
old one was getting quite cluttered and I needed something that made
more sense. I've decided to go with the following, which will be
explained in the README when I find the time to do it. The gist of it
is:
- Put everything shared into its shared directory
- Rewrite the theme module (now style) to be more split, as it is
  theming a lot of different apps
- Merge nixos and home-manager configurations back into a singular
  config directory

Thanks a lot to llakala for the massive help she was with my Nix code.

commit 66ff9820f8
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 19:23:28 2024 +0100

    shared/nixosModules/style: use sharedModules

commit 1271294049
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 19:23:13 2024 +0100

    treewide: remove unused nvidia file

commit ab18a42418
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 19:02:34 2024 +0100

    flake: remove uneeded directory for nodes

commit f8afc9f461
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 18:43:19 2024 +0100

    shared/nixosModules/style: split everything into its file

commit 851a4d0d32
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 11:15:40 2024 +0100

    repo: update README

commit e01237d59a
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 11:00:56 2024 +0100

    hosts/solaire: delete unused modules directory

commit 1c3665ec1c
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 11:00:24 2024 +0100

    pkgs: move to shared/pkgs

commit 587e8d321b
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 10:57:03 2024 +0100

    treewide: split up options from theming module, rename to style

    As an initial step towards refactoring the theming module, the options
    have been split up from the configuration itself. This will allow to
    find available options quicker, and separate concerns nicely. It was
    also renamed to style, to avoid confusion with its own options (eg.
    gtk.theme).

commit 87bb04f065
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 10:19:59 2024 +0100

    config/nixos/core/boot: remove unused arguments

commit 8e7c0584ef
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 10:19:46 2024 +0100

    hosts: move host-specific configuration to hosts/{host}/config

commit a600143e8a
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 10:19:24 2024 +0100

    nvidia: move to hosts/solaire

commit 7174a33a44
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 10:14:06 2024 +0100

    treewide: reorganize general structure

commit b86f1470ed
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 10:03:08 2024 +0100

    hosts/solaire: set global vars

commit de6ea242c0
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 09:24:59 2024 +0100

    system/network: replace hard-coded values with global vars

commit 5acf11adca
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 09:24:51 2024 +0100

    system/core/users: replace hard-coded values with global vars

commit 96425172a0
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 09:24:30 2024 +0100

    hosts/vamos: set global vars

commit 8338818b7d
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 09:24:23 2024 +0100

    hosts: import local modules by default

commit ffb60ac869
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 09:23:54 2024 +0100

    flake: update eachSystem to use lib.systems.flakeExposed

commit e98a15db1d
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Wed Dec 18 09:23:33 2024 +0100

    modules: create modules to hold global variables

README.md

@@ -4,31 +4,29 @@ My NixOS configurations, using flakes.
 
 # </> Software I use
 
-- Wayland compositor: [niri](https://github.com/YaLTeR/niri)
+- Wayland compositor: [Hyprland](https://github.com/hyprwm/Hyprland)
 - Text editor: [neovim](https://github.com/neovim/neovim)
 - Shell: [fish](https://github.com/fish-shell/fish-shell)
-- Colors: [Catppuccin](https://github.com/catppuccin/catppuccin)
-- Font: [Intel One Mono](https://github.com/intel/intel-one-mono)
 
 Additionally using a lot of other software you can find in the configuration files.
 
 # 🛠️ Structure
 
 | Name              | Description                                                   |
-| ------------------- | -------------------------- |
+| ----------------- | ------------------------------------------------------------- |
-| [home](home/)       | Home manager configuration |
+| [assets](assets/) | Resources used throughout the system (images etc.)            |
+| [config](config/) | System configuration (separated between NixOS / home-manager) |
 | [hosts](hosts/)   | Host-specific                                                 |
 | [lib](lib/)       | Helper functions                                              |
-| [modules](modules/) | NixOS modules              |
+| [shared](shared/) | Re-used components (internal modules, custom derivations)     |
-| [pkgs](pkgs/)       | Custom packages            |
-| [system](system/)   | NixOS configuration        |
 
 My configuration is structured based on the following principles:
 
 1. Hosts should be the main entry points and outputs.
 2. Abstractions should be avoided as much as possible.
+3. Setting up theming should be as simple as changing one or two options.
 
-The bulk of the configuration can be found either in [home](home/) or [system](system/), which declares most of my programs, with some extra Nix code in [lib](lib/) and custom [modules](modules/), mostly for convenience and to provide a way to globally set styles and themes for now.
+The main configuration can be found in [config](config/), which declares most of my programs, with re-usable modules and derivations in [shared](shared/), to provide a way to globally set themes, usernames and more.
 
 My hosts can then pick and choose the programs and configurations that they need from the other directories. If the need arises for a more modular setup for a specific piece of software (ie. having different flavors of Firefox per host), I will write a custom module for it. This helps to avoid unnecessarily abstracting my configuration, as I don't find it necessary for the most part, and I would also like it to remain as simple as possible.
 
@@ -39,5 +37,6 @@ People / repositories I have copied / learned from:
 - [fufexan/dotfiles](https://github.com/fufexan/dotfiles) for the configuration structure
 - [jacekpoz/nixos](https://git.jacekpoz.pl/poz/niksos) for learning how NixOS modules work
 - [sodiboo](https://github.com/sodiboo) for helping me a whole lot with Niri-specific issues
+- [llakala](https://github.com/llakala) for being very thorough and helpful when cleaning up my code and general structure.
 
-Some bits have also been borrowed from within the configuration, and credit has been given where its due.
+  Some bits have also been borrowed from within the configuration, and credit has been given where its due.

config/home-manager/default.nix

@@ -1,12 +1,12 @@
-{
+{osConfig, ...}: {
   imports = [
     ./services/udiskie.nix
     ./terminal
     ./programs
   ];
-  home = {
+  home = rec {
-    username = "nezia";
+    inherit (osConfig.local.systemVars) username;
-    homeDirectory = "/home/nezia";
+    homeDirectory = "/home/${username}";
     stateVersion = "24.05";
   };
 

config/home-manager/programs/gnome/default.nix

@@ -26,7 +26,7 @@
         color-scheme = "prefer-dark";
       };
       "org/gnome/desktop/background" = {
-        picture-uri-dark = "file://" + builtins.toString osConfig.theme.wallpaper;
+        picture-uri-dark = "file://" + builtins.toString osConfig.local.style.wallpaper;
       };
 
       "org/gnome/desktop/search-providers" = {

config/home-manager/programs/swaybg.nix

@@ -11,7 +11,7 @@
       PartOf = ["graphical-session.target"];
     };
     Service = {
-      ExecStart = "${lib.getExe pkgs.swaybg} -i ${osConfig.theme.wallpaper} -m fill";
+      ExecStart = "${lib.getExe pkgs.swaybg} -i ${osConfig.local.style.wallpaper} -m fill";
       Restart = "on-failure";
     };
     Install.WantedBy = ["graphical-session.target"];

config/nixos/core/boot.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+_: {
   boot = {
     loader = {
       timeout = 0;

config/nixos/core/users.nix

@@ -1,7 +1,7 @@
-{
+{config, ...}: {
-  users.users.nezia = {
+  users.users.${config.local.systemVars.username} = {
     isNormalUser = true;
-    description = "Anthony Rodriguez";
+    description = config.local.homeVars.fullName or "User";
     extraGroups = [
       "networkmanager"
       "audio"

config/nixos/network/default.nix

@@ -1,5 +1,6 @@
-{
+{config, ...}: {
   networking = {
+    inherit (config.local.systemVars) hostName;
     networkmanager = {
       enable = true;
       dns = "systemd-resolved";

config/nixos/services/greetd.nix

@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   lib,
   pkgs,
@@ -36,7 +37,7 @@ in {
     settings = {
       default_session = {
         command = "${Hyprland} --config ${hyprlandConfig}";
-        user = "nezia";
+        user = config.local.systemVars.username;
       };
     };
   };

flake.lock

@@ -3234,7 +3234,6 @@
         "nvf": "nvf",
         "plasma-manager": "plasma-manager",
         "portfolio": "portfolio",
-        "systems": "systems_7",
         "treefmt-nix": "treefmt-nix"
       }
     },
@@ -3391,21 +3390,6 @@
         "type": "github"
       }
     },
-    "systems_7": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_9"

flake.nix

@@ -4,13 +4,12 @@
   outputs = {
     self,
     nixpkgs,
-    systems,
     agenix,
     deploy-rs,
     treefmt-nix,
     ...
   } @ inputs: let
-    eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
+    eachSystem = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: f nixpkgs.legacyPackages.${system});
     treefmtEval = eachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
   in {
     devShells = eachSystem (pkgs: {
@@ -25,14 +24,13 @@
     });
     formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
     nixosConfigurations = import ./hosts {inherit inputs;};
-    packages = eachSystem (pkgs: import ./pkgs {inherit inputs pkgs;});
+    packages = eachSystem (pkgs: import ./shared/pkgs {inherit inputs pkgs;});
-    deploy.nodes = import ./nodes {inherit inputs;};
+    deploy.nodes = import ./nodes.nix {inherit inputs;};
     checks = builtins.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
   };
   inputs = {
     # nix related
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    systems.url = "github:nix-systems/default-linux";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.1";

hosts/default.nix

@@ -1,15 +1,14 @@
 {inputs, ...}: let
-  lib' = import ../lib;
+  lib' = import ../shared/lib;
   mkSystem = args:
     inputs.nixpkgs.lib.nixosSystem {
       specialArgs = {inherit inputs lib';};
-      modules = args.modules or [];
+      modules = [../shared/nixosModules] ++ (args.modules or []);
     };
 in {
   vamos = mkSystem {
     modules = [
       ./vamos
-      ../modules
       inputs.nixos-hardware.nixosModules.framework-13-7040-amd
     ];
   };
@@ -17,7 +16,6 @@ in {
   solaire = mkSystem {
     modules = [
       ./solaire
-      ../modules
     ];
   };
 

hosts/solaire/config/theme.nix

@@ -1,5 +1,5 @@
 _: {
-  theme = {
+  local.style = {
     enable = true;
     wallpaper = ../../../assets/wallpapers/lucy-edgerunners-wallpaper.jpg;
   };

hosts/solaire/default.nix

@@ -3,54 +3,63 @@
   specialArgs,
   ...
 }: let
-  system = "${inputs.self}/system";
+  nixos = "${inputs.self}/config/nixos";
-  home = "${inputs.self}/home";
+  hm = "${inputs.self}/config/home-manager";
 in {
+  local.systemVars = {
+    hostName = "solaire";
+    username = "nezia";
+  };
+
+  local.homeVars = {
+    fullName = "Anthony Rodriguez";
+    email = "anthony@nezia.dev";
+  };
+
   imports = [
     ./hardware-configuration.nix
-    ./modules
+    ./config/nvidia.nix
+    ./config/theme.nix
 
-    system
+    nixos
-    "${system}/hardware/uni-sync.nix"
+    "${nixos}/hardware/uni-sync.nix"
 
-    "${system}/programs/games.nix"
+    "${nixos}/programs/games.nix"
-    "${system}/hardware/nvidia.nix"
 
-    "${system}/services/logind.nix"
+    "${nixos}/services/logind.nix"
-    "${system}/services/greetd.nix"
+    "${nixos}/services/greetd.nix"
 
-    "${system}/programs/hyprland.nix"
+    "${nixos}/programs/hyprland.nix"
-    "${system}/services/gnome.nix"
+    "${nixos}/services/gnome.nix"
 
-    "${system}/services/documentation.nix"
+    "${nixos}/services/documentation.nix"
 
-    "${system}/services/flatpak.nix"
+    "${nixos}/services/flatpak.nix"
   ];
 
   home-manager = {
     users.nezia.imports = [
-      "${home}"
+      hm
-      "${home}/services/udiskie.nix"
+      "${hm}/services/udiskie.nix"
-      "${home}/programs/games"
+      "${hm}/programs/games"
 
-      "${home}/programs/waybar"
+      "${hm}/programs/waybar"
-      "${home}/programs/fuzzel.nix"
+      "${hm}/programs/fuzzel.nix"
-      "${home}/programs/hypr"
+      "${hm}/programs/hypr"
 
-      "${home}/services/swaync"
+      "${hm}/services/swaync"
-      "${home}/programs/swaybg.nix"
+      "${hm}/programs/swaybg.nix"
-      "${home}/programs/swaylock.nix"
+      "${hm}/programs/swaylock.nix"
 
-      "${home}/terminal/emulators/foot.nix"
+      "${hm}/terminal/emulators/foot.nix"
 
-      "${home}/services/flatpak.nix"
+      "${hm}/services/flatpak.nix"
-      "${home}/services/syncthing.nix"
+      "${hm}/services/syncthing.nix"
 
-      "${home}/programs/editors/neovim.nix"
+      "${hm}/programs/editors/neovim.nix"
     ];
     extraSpecialArgs = specialArgs;
   };
 
-  networking.hostName = "solaire";
   environment.variables.FLAKE = "/home/nezia/.dotfiles";
 }

hosts/solaire/modules/default.nix

@@ -1,3 +0,0 @@
-{
-  imports = [./theme.nix];
-}

hosts/vamos/config/theme.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  theme = {
+  local.style = {
     enable = true;
     wallpaper = pkgs.fetchurl {
       url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/e0cf0eb237dc5baba86661a3572b20a6183c1876/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png?raw=true";

hosts/vamos/default.nix

@@ -3,53 +3,62 @@
   specialArgs,
   ...
 }: let
-  system = "${inputs.self}/system";
+  nixos = "${inputs.self}/config/nixos";
-  home = "${inputs.self}/home";
+  hm = "${inputs.self}/config/home-manager";
 in {
+  local.systemVars = {
+    hostName = "vamos";
+    username = "nezia";
+  };
+
+  local.homeVars = {
+    fullName = "Anthony Rodriguez";
+    email = "anthony@nezia.dev";
+  };
+
   imports = [
     ./hardware-configuration.nix
-    ./modules
+    ./config/theme.nix
 
-    "${system}"
+    "${nixos}"
-    "${system}/core/lanzaboote.nix"
+    "${nixos}/core/lanzaboote.nix"
 
-    "${system}/hardware/fprintd.nix"
+    "${nixos}/hardware/fprintd.nix"
-    "${system}/services/power.nix"
+    "${nixos}/services/power.nix"
-    "${system}/services/brightness.nix"
+    "${nixos}/services/brightness.nix"
 
-    "${system}/services/logind.nix"
+    "${nixos}/services/logind.nix"
-    "${system}/services/greetd.nix"
+    "${nixos}/services/greetd.nix"
-    "${system}/services/kanata.nix"
+    "${nixos}/services/kanata.nix"
 
-    "${system}/programs/hyprland.nix"
+    "${nixos}/programs/hyprland.nix"
-    "${system}/services/gnome.nix"
+    "${nixos}/services/gnome.nix"
-    "${system}/services/mail.nix"
+    "${nixos}/services/mail.nix"
 
-    "${system}/services/documentation.nix"
+    "${nixos}/services/documentation.nix"
   ];
 
   home-manager = {
     users.nezia.imports = [
-      "${home}"
+      "${hm}"
-      "${home}/services/udiskie.nix"
+      "${hm}/services/udiskie.nix"
 
-      "${home}/programs/hypr"
+      "${hm}/programs/hypr"
-      "${home}/programs/waybar"
+      "${hm}/programs/waybar"
-      "${home}/programs/fuzzel.nix"
+      "${hm}/programs/fuzzel.nix"
 
-      "${home}/services/swaync"
+      "${hm}/services/swaync"
-      "${home}/programs/swaybg.nix"
+      "${hm}/programs/swaybg.nix"
-      "${home}/programs/wlogout.nix"
+      "${hm}/programs/wlogout.nix"
 
-      "${home}/services/syncthing.nix"
+      "${hm}/services/syncthing.nix"
 
-      "${home}/programs/editors/neovim.nix"
+      "${hm}/programs/editors/neovim.nix"
 
-      "${home}/terminal/emulators/foot.nix"
+      "${hm}/terminal/emulators/foot.nix"
     ];
     extraSpecialArgs = specialArgs;
   };
 
-  networking.hostName = "vamos";
   environment.variables.FLAKE = "/home/nezia/.dotfiles";
 }