another one

.gitignore

@@ -1,5 +1 @@
-nix/
-nix/sources.json
-nix/sources.nix
 .direnv
-.pre-commit-config.yaml

hosts/default.nix

@@ -7,10 +7,10 @@
   flake.nixosConfigurations = let
     # shorten paths
     inherit (inputs.nixpkgs.lib) nixosSystem;
-    mod = "${self}/sys";
+    mod = "${self}/system";
 
     # get the basic config to build on top of
-    inherit (import "${self}/sys") adampad cnix toothpc;
+    inherit (import "${self}/system") adampad cnix toothpc;
 
     # get these into the module system
     specialArgs = {inherit inputs self;};
@@ -21,11 +21,13 @@
         cnix
         ++ [
           ./cnix
-          "${mod}/opt/boot/lanzaboote.nix"
+          "${mod}/boot/lanzaboote"
-          "${mod}/opt/hardware/cnix.nix"
+          "${mod}/etc/bluetooth"
-          "${mod}/opt/network/cnix.nix"
+          "${mod}/etc/graphics/amd"
-          "${mod}/opt/nh/cnix.nix"
+          "${mod}/etc/logitech"
-          "${mod}/opt/xserver/cnix.nix"
+          "${mod}/etc/network/cnix"
+          "${mod}/etc/xserver/amd"
+          "${mod}/nix/nh/cnix"
           {
             home-manager = {
               users.cnst.imports = homeImports."cnst@cnix";
@@ -43,11 +45,12 @@
         toothpc
         ++ [
           ./toothpc
-          "${mod}/opt/boot/lanzaboote.nix"
+          "${mod}/boot/lanzaboote"
-          "${mod}/opt/hardware/toothpc.nix"
+          "${mod}/etc/graphics/nvidia"
-          "${mod}/opt/network/toothpc.nix"
+          "${mod}/etc/logitech"
-          "${mod}/opt/nh/toothpc.nix"
+          "${mod}/etc/network/toothpc"
-          "${mod}/opt/xserver/toothpc.nix"
+          "${mod}/etc/xserver/nvidia"
+          "${mod}/nix/nh/toothpc"
           {
             home-manager = {
               users.toothpick.imports = homeImports."toothpick@toothpc";
@@ -65,11 +68,12 @@
         adampad
         ++ [
           ./adampad
-          "${mod}/opt/boot/boot.nix"
+          "${mod}/boot"
-          "${mod}/opt/hardware/adampad.nix"
+          "${mod}/etc/bluetooth"
-          "${mod}/opt/network/adampad.nix"
+          "${mod}/etc/graphics/amd"
-          "${mod}/opt/nh/adampad.nix"
+          "${mod}/etc/network/adampad"
-          "${mod}/opt/xserver/adampad.nix"
+          "${mod}/etc/xserver/amd"
+          "${mod}/nix/nh/adampad"
           {
             home-manager = {
               users.adam.imports = homeImports."adam@adampad";

sys/opt/hardware/adampad.nix

@@ -1,24 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  inputs,
-  ...
-}: {
-  zramSwap.enable = true;
-
-  hardware = {
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-    };
-    graphics = {
-      enable = true;
-      extraPackages = with pkgs; [
-        libva
-        vaapiVdpau
-        libvdpau-va-gl
-      ];
-    };
-  };
-}

system/default.nix

@@ -1,9 +1,10 @@
 let
   shared = [
-    ./nixos
-    ./etc
     ./bin
+    ./etc
+    ./nix
     ./srv
+    ./usr/share
   ];
 
   adampad =
@@ -15,16 +16,16 @@ let
   cnix =
     shared
     ++ [
-      ./bin/gaming.nix
+      ./usr/bin/gaming.nix
-      ./bin/android
+      ./usr/bin/android
-      ./bin/gimp
+      ./usr/bin/gimp
-      ./bin/inkscape
+      ./usr/bin/inkscape
       ./srv/blueman
     ];
   toothpc =
     shared
     ++ [
-      ./bin/gaming.nix
+      ./usr/bin/gaming.nix
     ];
 in {
   inherit shared adampad cnix toothpc;

system/etc/bluetooth/default.nix

@@ -0,0 +1,8 @@
+{
+  hardware = {
+    bluetooth = {
+      enable = true;
+      powerOnBoot = false;
+    };
+  };
+}

system/etc/default.nix

@@ -1,11 +1,10 @@
 {
   imports = [
+    # shared imports
     ./dconf
-    ./fonts
-    ./locale
-    # ./nix-ld
     ./security
     ./xdg
+    ./zram
     ./zsh
   ];
 }

system/etc/graphics/amd/default.nix

@@ -1,15 +1,5 @@
 {pkgs, ...}: {
-  zramSwap.enable = true;
-
   hardware = {
-    bluetooth = {
-      enable = true;
-      powerOnBoot = false;
-    };
-    logitech.wireless = {
-      enable = true;
-      enableGraphical = true;
-    };
     graphics = {
       enable = true;
       enable32Bit = true;

system/etc/graphics/nvidia/default.nix

@@ -3,13 +3,7 @@
   config,
   ...
 }: {
-  zramSwap.enable = true;
-
   hardware = {
-    logitech.wireless = {
-      enable = true;
-      enableGraphical = true;
-    };
     graphics = {
       enable = true;
       enable32Bit = true;

system/etc/logitech/default.nix

@@ -0,0 +1,8 @@
+{
+  hardware = {
+    logitech.wireless = {
+      enable = true;
+      enableGraphical = true;
+    };
+  };
+}

system/etc/xserver/amd/hhkbse/default.nix

@@ -1,4 +1,4 @@
-{config, ...}: {
+{
   services.xserver = {
     enable = true;
     videoDrivers = ["amdgpu"];

system/etc/zram/default.nix

@@ -0,0 +1 @@
+{zramSwap.enable = true;}

system/usr/share/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    # shared imports
+    ./fonts
+    ./locale
+  ];
+}