modules/home/desktop/default.nix: sort, remove /default.nix

modules/home/programs/default.nix: sort, remove /default.nix
modules/nixos/desktop/default.nix: sort, remove /default.nix
modules/nixos/system/default.nix: sort, remove /default.nix

Signed-off-by: unexplrd <unexplrd@linerds.us>

flake.nix

@@ -16,8 +16,9 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak";
     nix-index-database.url = "github:nix-community/nix-index-database";
     # nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
     # nixvim.url = "github:nix-community/nixvim";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
     sops-nix.url = "github:mic92/sops-nix";
     stylix.url = "github:danth/stylix";
     way-edges.url = "github:way-edges/way-edges";

hosts/dunamis/hardware.nix

@@ -1,23 +1,19 @@
 {
-  config,
+  inputs,
-  lib,
-  pkgs,
   modulesPath,
   ...
 }: {
-  imports = [
+  imports = with inputs.nixos-hardware.nixosModules; [
     (modulesPath + "/installer/scan/not-detected.nix")
+    common-amd-cpu-pstate
+    common-intel-gpu
+    common-pc-ssd
   ];
-
+  hardware = {
-  hardware.graphics = {
+    enableRedistributableFirmware = true;
-    enable = true;
+    intelgpu = {
-    extraPackages = with pkgs; [
+      vaapiDriver = "intel-media-driver";
-      intel-media-driver
+      useIntelMediaDriver = true;
-      vaapiIntel
+    };
-      vpl-gpu-rt
-    ];
   };
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/dunamis/networking.nix

@@ -1,6 +1,7 @@
 {
   networking = {
-    networkmanager.enable = true;
+    hostId = "c7f6c4a1";
     hostName = "dunamis";
+    networkmanager.enable = true;
   };
 }

hosts/dunamis/programs.nix

@@ -3,13 +3,15 @@
   lib,
   ...
 }: {
-  programs.nh = {
+  programs = {
-    enable = true;
+    fish.enable = true;
-    clean.enable = true;
+    nh = {
-    clean.extraArgs = "--keep-since 7d --keep 3";
+      enable = true;
-    flake = "/home/user/.config/nixos";
+      clean.enable = true;
+      clean.extraArgs = "--keep-since 7d --keep 3";
+      flake = "/home/user/.config/nixos";
+    };
   };
-  programs.fish.enable = true;
   environment.systemPackages = with pkgs; [
     (lib.hiPrio uutils-coreutils-noprefix)
     helix

hosts/sarien/networking.nix

@@ -1,12 +1,8 @@
-let
+{
-  hosts.sarien = {
+  networking = {
+    networkmanager.enable = true;
     hostId = "31150fae";
     hostName = "vylxae";
-  };
-in {
-  networking = {
-    inherit (hosts.sarien) hostId hostName;
-    networkmanager.enable = true;
     hosts = {
       "192.168.1.42" = ["dunamis"];
     };

modules/home/desktop/default.nix

@@ -2,9 +2,9 @@
   imports = with inputs; [
     way-edges.homeManagerModules.default
     ./common/xdg-userdirs.nix
-    ./hyprland/default.nix
+    ./gnome
-    ./gnome/default.nix
+    ./hyprland
-    ./niri/default.nix
+    ./niri
-    ./plasma/default.nix
+    ./plasma
   ];
 }

modules/home/desktop/niri/default.nix

@@ -6,16 +6,16 @@
   ...
 }: let
   cfg = config.desktop.niri;
-  hostname = osConfig.networking.hostName;
+  inherit (osConfig.networking) hostId;
-  cursor_size = config.stylix.cursor.size;
   inherit (config.lib.stylix) colors;
+  cursor_size = config.stylix.cursor.size;
   keyboard =
-    if hostname == "eldrid"
+    if hostId == "eldrid"
     then "chromeos"
     else "platform";
   xdgPics =
     config.xdg.userDirs.pictures;
-  ifLaptop = lib.mkIf (hostname != "dunamis");
+  ifLaptop = lib.mkIf (hostId != "c7f6c4a1");
   terminal = lib.getExe pkgs.ghostty;
   launcher = lib.getExe pkgs.fuzzel;
   browser = "app.zen_browser.zen";
@@ -409,7 +409,7 @@ in {
               xkb {
                 layout "us,ua"
                 ${
-            if hostname == "dunamis"
+            if hostId == "c7f6c4a1"
             then "// variant \"colemak_dh_ortho,\""
             else "variant \"colemak_dh_ortho,\""
           }
@@ -1074,8 +1074,8 @@ in {
                   };
                 }
               ]
-              ++ (lib.optionals (hostname
+              ++ (lib.optionals (hostId
-                != "dunamis") [
+                != "c7f6c4a1") [
                 {
                   edge = "top";
                   layer = "overlay";

modules/home/programs/default.nix

@@ -1,9 +1,9 @@
 {
   imports = [
-    ./syncthing.nix
     ./console/yazi.nix
-    ./editor/default.nix
+    ./editor
-    ./shell/default.nix
+    ./shell
-    ./terminal/default.nix
+    ./terminal
+    ./syncthing.nix
   ];
 }

modules/nixos/desktop/default.nix

@@ -1,9 +1,9 @@
 {
   imports = [
-    ./niri.nix
     # ./cosmic.nix
     ./gnome.nix
-    ./plasma.nix
     ./hyprland.nix
+    ./niri.nix
+    ./plasma.nix
   ];
 }

modules/nixos/system/default.nix

@@ -1,8 +1,9 @@
 {
   imports = [
-    ./misc/default.nix
+    ./host
-    ./security/default.nix
+    ./misc
-    ./virtual/default.nix
+    ./security
-    ./wireless/default.nix
+    ./virtual
+    ./wireless
   ];
 }