hehehe

nixos/core/system/adampad-nh.nix

@@ -0,0 +1,11 @@
+{
+  environment.variables.FLAKE = "/home/adam/.nix-config";
+  programs = {
+    nh = {
+      enable = true;
+      clean.enable = true;
+      clean.extraArgs = "--keep-since 4d --keep 3";
+      flake = "/home/adam/.nix-config";
+    };
+  };
+}

nixos/default.nix

@@ -14,12 +14,13 @@ let
     ./services/power
     ./services/samba
     ./services/udisks
+    ./services/fwupd
   ];
 
-  laptop =
+  adampad =
     shared
     ++ [
-      ./services/fwupd
+      ./core/system/adampad-nh.nix
     ];
   cnix =
     shared
@@ -32,5 +33,5 @@ let
       ./core/system/toothpc-nh.nix
     ];
 in {
-  inherit shared laptop cnix toothpc;
+  inherit shared adampad cnix toothpc;
 }

nixos/hosts/cnix/default.nix

@@ -34,13 +34,15 @@ in {
     ./hardware-configuration.nix
   ];
 
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
-
-  boot.kernelParams = [
-    "amd_pstate=active"
-    "quiet"
-    "splash"
-  ];
+  boot = {
+    consoleLogLevel = 3;
+    kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
+    kernelParams = [
+      "amd_pstate=active"
+      "quiet"
+      "splash"
+    ];
+  };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = lib.mkDefault "23.11";

nixos/hosts/cnix/hardware-configuration.nix

@@ -4,22 +4,26 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = ["amdgpu"];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "ahci"
+        "usbhid"
+        "usb_storage"
+        "sd_mod"
+      ];
+      kernelModules = ["amdgpu"];
+    };
+
+    kernelModules = ["kvm-amd"];
+    extraModulePackages = [];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/de372c64-89a2-4bbe-ad57-926cdd98e97d";

nixos/hosts/default.nix

@@ -10,7 +10,7 @@
     mod = "${self}/nixos";
 
     # get the basic config to build on top of
-    inherit (import "${self}/nixos") laptop cnix toothpc;
+    inherit (import "${self}/nixos") adampad cnix toothpc;
 
     # get these into the module system
     specialArgs = {inherit inputs self;};
@@ -49,7 +49,6 @@
         toothpc
         ++ [
           ./toothpc
-          "${mod}/core"
           "${mod}/core/lanzaboote.nix"
           "${mod}/core/network/toothpc.nix"
 
@@ -58,8 +57,6 @@
           "${mod}/services/xserver/toothpc.nix"
 
           "${mod}/extra/gaming.nix"
-          "${mod}/extra/android"
-          "${mod}/extra/workstation"
           {
             home-manager = {
               users.toothpick.imports = homeImports."toothpick@toothpc";
@@ -74,10 +71,9 @@
     adampad = nixosSystem {
       inherit specialArgs;
       modules =
-        laptop
+        adampad
         ++ [
           ./adampad
-          "${mod}/core"
           "${mod}/core/network/adampad.nix"
 
           "${mod}/hardware/adampad.nix"

nixos/hosts/toothpc/default.nix

@@ -1,10 +1,7 @@
 {
-  inputs,
-  outputs,
   lib,
   config,
   pkgs,
-  system,
   ...
 }: let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
@@ -33,54 +30,20 @@ in {
     ];
   };
 
-  programs.dconf.enable = true;
-
   imports = [
-    inputs.home-manager.nixosModules.home-manager
-    ./imports.nix
-    ./system.nix
     ./hardware-configuration.nix
   ];
 
-  home-manager.users.toothpick = import ../../../home/users/toothpick/home.nix;
-  nix = let
-    flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
-  in {
-    settings = {
-      auto-optimise-store = lib.mkDefault true;
-      warn-dirty = false;
-      # Enable flakes and new 'nix' command
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-      # Opinionated: disable global registry
-      flake-registry = "";
-      # Workaround for https://github.com/NixOS/nix/issues/9574
-      nix-path = config.nix.nixPath;
-    };
-    # Opinionated: disable channels
-    channel.enable = false;
-
-    # Opinionated: make flake registry and nix path match flake inputs
-    registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
-    nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
-  };
-
-  # Bootloader
-  boot.loader = {
-    systemd-boot.enable = lib.mkForce false;
-    efi.canTouchEfiVariables = true;
-  };
-  boot.lanzaboote = {
-    enable = true;
-    pkiBundle = "/etc/secureboot";
-  };
-
-  environment.sessionVariables = {
-    FLAKE = "/home/toothpick/.nix-config";
+  boot = {
+    blacklistedKernelModules = ["ucsi_ccg"];
+    consoleLogLevel = 3;
+    kernelPackages = lib.mkForce pkgs.linuxPackages_cachyos;
+    kernelParams = [
+      "quiet"
+      "splash"
+    ];
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "24.05";
+  system.stateVersion = lib.mkDefault "23.11";
 }

nixos/hosts/toothpc/hardware-configuration.nix

@@ -20,15 +20,9 @@
         "usb_storage"
         "sd_mod"
       ];
-      kernelModules = [];
+      kernelModules = ["nvidia"];
     };
     kernelModules = ["kvm-intel"];
-    kernelPackages = pkgs.linuxPackages_zen;
-    consoleLogLevel = 3;
-    kernelParams = [
-      "quiet"
-      "splash"
-    ];
     extraModulePackages = [];
   };
 

nixos/hosts/toothpc/imports.nix

@@ -1,120 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    # core
-    ../../core/fonts.nix
-    ../../core/hyprland.nix
-    ../../core/zsh.nix
-    ../../core/network/toothpc.nix
-
-    # hardware
-    ../../hardware/toothpc.nix
-
-    # locale
-    ../../locale
-
-    # services
-    #../../services/blueman
-    ../../services/dbus
-    ../../services/gnome-keyring
-    ../../services/greetd
-    ../../services/gvfs
-    ../../services/mullvad
-    ../../services/openssh
-    ../../services/audio
-    ../../services/udisks
-    ../../services/xserver/toothpc.nix
-    ../../services/locate
-    ../../services/samba
-
-    # extra
-    ../../extra/gaming.nix
-    ../../extra/android
-    #../../extra/workstation
-    #../../extra/nix-ld
-  ];
-
-  environment = {
-    systemPackages = with pkgs; [
-      # Core
-      fd
-      git
-      niv
-      nix-output-monitor
-      nvd
-      sbctl
-      python312Packages.nvidia-ml-py
-
-      # Util
-      samba4Full
-      anyrun
-      curl
-      fzf
-      gnome-disk-utility
-      lazygit
-      ntfs3g
-      p7zip
-      ripgrep
-      stow
-      tmux
-      tmuxifier
-      tree-sitter
-      udiskie
-      unrar
-      unzip
-      wget
-      xdg-user-dirs
-      xdg-utils
-
-      # 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/toothpc/system.nix

@@ -1,41 +0,0 @@
-{
-  inputs,
-  outputs,
-  ...
-}: {
-  programs = {
-    nh = {
-      enable = true;
-      clean.enable = true;
-      clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = "/home/toothpick/.nix-config";
-    };
-  };
-
-  security = {
-    rtkit.enable = true;
-    pam.services.hyprlock = {};
-  };
-
-  environment.localBinInPath = true;
-
-  console.useXkbConfig = true;
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = {
-      inherit inputs outputs;
-    };
-  };
-  nixpkgs = {
-    overlays = [
-      (_: prev: {
-        python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};};
-      })
-    ];
-    config = {
-      allowUnfree = true;
-      input-fonts.acceptLicense = true;
-    };
-  };
-}