??

nixos/core/default.nix

@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./system
-    ./xdg.nix
-    ./zsh.nix
-    ./fonts.nix
-    ./home-manager.nix
-    ./hyprland.nix
-  ];
-
-  programs.dconf.enable = true;
-
-  console.useXkbConfig = true;
-  environment.systemPackages = with pkgs; [
-    anyrun
-  ];
-}

nixos/default.nix

@@ -1,36 +1,36 @@
 let
   shared = [
-    ./core
+    ./system
 
     ./locale
 
-    ./services/audio
-    ./services/greetd
-    ./services/gnome-keyring
-    ./services/gvfs
-    ./services/locate
-    ./services/mullvad
-    ./services/openssh
-    ./services/power
-    ./services/samba
-    ./services/udisks
-    ./services/fwupd
+    ./srv/audio
+    ./srv/greetd
+    ./srv/gnome-keyring
+    ./srv/gvfs
+    ./srv/locate
+    ./srv/mullvad
+    ./srv/openssh
+    ./srv/power
+    ./srv/samba
+    ./srv/udisks
+    ./srv/fwupd
   ];
 
   adampad =
     shared
     ++ [
-      ./core/system/adampad-nh.nix
+      ./system/var/nh/adampad.nix
     ];
   cnix =
     shared
     ++ [
-      ./core/system/cnix-nh.nix
+      ./system/var/nh/cnix.nix
     ];
   toothpc =
     shared
     ++ [
-      ./core/system/toothpc-nh.nix
+      ./system/var/nh/toothpc-nh.nix
     ];
 in {
   inherit shared adampad cnix toothpc;

nixos/hosts/cnix/imports.nix

@@ -1,122 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    # core
-    ../../core/fonts.nix
-    ../../core/hyprland.nix
-    ../../core/network/cnix.nix
-    ../../core/zsh.nix
-
-    # hardware
-    ../../hardware/cnix.nix
-
-    # locale
-    ../../locale
-
-    # services
-    ../../services/blueman
-    ../../services/dbus
-    ../../services/gnome-keyring
-    ../../services/greetd
-    ../../services/gvfs
-    ../../services/locate
-    ../../services/mullvad
-    ../../services/openssh
-    ../../services/audio
-    ../../services/power
-    ../../services/samba
-    ../../services/udisks
-    ../../services/xserver/cnix.nix
-
-    # extra
-    ../../extra/gaming.nix
-    ../../extra/android
-    ../../extra/workstation
-    # ../../extra/nix-ld
-  ];
-
-  environment = {
-    systemPackages = with pkgs; [
-      # Core
-      scx
-      fd
-      git
-      niv
-      nix-output-monitor
-      nvd
-      sbctl
-      rocmPackages.rocm-smi
-
-      # Util
-      anyrun
-      # curl
-      # fzf
-      # gnome-disk-utility
-      # lazygit
-      # ntfs3g
-      # p7zip
-      # ripgrep
-      stow
-      # tmux
-      # tmuxifier
-      # tree-sitter
-      # udiskie
-      # unrar
-      # unzip
-      # wget
-      # xdg-user-dirs
-      # xdg-utils
-      # zed-editor
-
-      # Dev
-      # binutils
-      # clang
-      # clang-tools
-      # cargo-edit
-      # cargo-insta
-      # cargo-nextest
-      # gcc
-      # gnumake
-      # cmake
-      # python3
-      # python312Packages.httplib2
-      # python312Packages.oauth2
-      # gtk3
-      # gtk4
-
-      # misc.language_servers
-      # typescript-language-server
-      # typescript
-      # nixd
-      # nil
-      # statix
-      # hyprlang
-      # alejandra
-      # nixpkgs-fmt
-      # pyright
-      # isort
-      # rustfmt
-      # rust-analyzer
-      # clippy
-      # lua-language-server
-      # stylua
-      # nodePackages_latest.nodejs
-      # nodePackages.prettier
-      # prettierd
-      # black
-      # vimPlugins.nvim-treesitter-parsers.typescript
-
-      # ags_dependencies
-      # bash
-      # coreutils
-      # dart-sass
-      # gawk
-      # imagemagick
-      # procps
-      # util-linux
-      # gnome.gnome-control-center
-      # mission-center
-      # overskride
-      # wlogout
-    ];
-  };
-}

nixos/hosts/cnix/system.nix

@@ -1,63 +0,0 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  homeDir = builtins.getEnv "HOME";
-in {
-  environment.variables.FLAKE = "${homeDir}/.nix-config";
-  programs = {
-    nh = {
-      enable = true;
-      clean.enable = true;
-      clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = "${homeDir}/.nix-config";
-    };
-  };
-
-  nix = {
-    # pin the registry to avoid downloading and evaling a new nixpkgs version every time
-    registry = lib.mapAttrs (_: v: {flake = v;}) inputs;
-
-    # set the path for channels compat
-    nixPath = lib.mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry;
-
-    settings = {
-      auto-optimise-store = true;
-      builders-use-substitutes = true;
-      warn-dirty = false;
-      experimental-features = ["nix-command" "flakes"];
-      flake-registry = "/etc/nix/registry.json";
-
-      # for direnv GC roots
-      keep-derivations = true;
-      keep-outputs = true;
-
-      trusted-users = ["root" "@wheel"];
-    };
-  };
-
-  security = {
-    rtkit.enable = true;
-    pam.services.hyprlock = {};
-  };
-
-  environment.localBinInPath = true;
-
-  console.useXkbConfig = true;
-
-  nixpkgs = {
-    overlays = [
-      (_: prev: {
-        python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};};
-      })
-    ];
-    config = {
-      allowUnfree = true;
-      input-fonts.acceptLicense = true;
-    };
-  };
-}

nixos/hosts/default.nix

@@ -21,25 +21,25 @@
         cnix
         ++ [
           ./cnix
-          "${mod}/core/lanzaboote.nix"
-          "${mod}/core/network/cnix.nix"
+          "${mod}/system/boot/lanzaboote.nix"
+          "${mod}/system/var/network/cnix.nix"
 
           "${mod}/hardware/cnix.nix"
 
-          "${mod}/services/blueman"
-          "${mod}/services/xserver/cnix.nix"
+          "${mod}/srv/blueman"
+          "${mod}/srv/xserver/cnix.nix"
 
-          "${mod}/extra/gaming.nix"
-          "${mod}/extra/android"
-          "${mod}/extra/workstation"
+          "${mod}/opt/gaming.nix"
+          "${mod}/opt/android"
+          "${mod}/opt/workstation"
           {
             home-manager = {
               users.cnst.imports = homeImports."cnst@cnix";
-              extraSpecialArgs = specialArgs;
+              optSpecialArgs = specialArgs;
             };
           }
 
-          # inputs.agenix.nixosModules.default
+          inputs.agenix.nixosModules.default
           inputs.chaotic.nixosModules.default
         ];
     };
@@ -49,18 +49,18 @@
         toothpc
         ++ [
           ./toothpc
-          "${mod}/core/lanzaboote.nix"
-          "${mod}/core/network/toothpc.nix"
+          "${mod}/system/boot/lanzaboote.nix"
+          "${mod}/system/var/network/toothpc.nix"
 
           "${mod}/hardware/toothpc.nix"
 
-          "${mod}/services/xserver/toothpc.nix"
+          "${mod}/srv/xserver/toothpc.nix"
 
-          "${mod}/extra/gaming.nix"
+          "${mod}/opt/gaming.nix"
           {
             home-manager = {
               users.toothpick.imports = homeImports."toothpick@toothpc";
-              extraSpecialArgs = specialArgs;
+              optSpecialArgs = specialArgs;
             };
           }
 
@@ -74,19 +74,19 @@
         adampad
         ++ [
           ./adampad
-          "${mod}/core/boot.nix"
-          "${mod}/core/network/adampad.nix"
+          "${mod}/system/boot/boot.nix"
+          "${mod}/system/var/network/adampad.nix"
 
           "${mod}/hardware/adampad.nix"
 
-          "${mod}/services/xserver/adampad.nix"
-          "${mod}/services/blueman"
+          "${mod}/srv/xserver/adampad.nix"
+          "${mod}/srv/blueman"
 
-          "${mod}/extra/android"
+          "${mod}/opt/android"
           {
             home-manager = {
               users.adam.imports = homeImports."adam@adampad";
-              extraSpecialArgs = specialArgs;
+              optSpecialArgs = specialArgs;
             };
           }
 

nixos/system/default.nix

@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  imports = [
+    ./etc
+    ./shell/sh
+  ];
+
+  console.useXkbConfig = true;
+  environment.systemPackages = with pkgs; [
+    anyrun
+  ];
+}

nixos/system/etc/dconf/default.nix

@@ -0,0 +1,3 @@
+{
+  programs.dconf.enable = true;
+}

nixos/system/etc/default.nix

@@ -6,9 +6,14 @@
   ...
 }: {
   imports = [
-    ./substituters.nix
-    ./nixpkgs.nix
-    ./security.nix
+    ./dconf
+    ./fonts
+    ./hyprland
+    ./nixpkgs
+    ./security
+    ./home-manager
+    ./substituters
+    ./xdg
   ];
 
   environment = {