fucking(refactored): everything

nix/hosts/doloro/disks.nix

@@ -1,66 +0,0 @@
-{
-  lib,
-  inputs,
-  ...
-}:
-{
-  imports = [
-    inputs.disko.nixosModules.disko
-  ];
-  disko.devices = {
-    disk = {
-      main = {
-        device = lib.mkDefault "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F";
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            boot = {
-              name = "boot";
-              size = "1M";
-              type = "EF02";
-            };
-            ESP = {
-              name = "ESP";
-              priority = 1;
-              size = "4G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ]; # Override existing partition
-                # Subvolumes must set a mountpoint in order to be mounted,
-                # unless their parent is mounted
-                subvolumes = {
-                  # Subvolume name is different from mountpoint
-                  "@" = {
-                    mountpoint = "/";
-                  };
-                  # Subvolume name is the same as the mountpoint
-                  "@home" = {
-                    mountpoint = "/home";
-                  };
-                  # Parent is not mounted so the mountpoint must be set
-                  "@nix" = {
-                    mountpoint = "/nix";
-                  };
-                  "@blackhole" = {
-                    mountpoint = "/var/blackhole";
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

nix/hosts/doloro/hardware-configuration.nix

@@ -1,29 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

nix/hosts/doloro/home.nix

@@ -5,24 +5,36 @@
   fetchFromGitHub,
   ...
 }:
-
 {
-  imports = [
-    ../../modules/hyprland/home.nix
-    ../../modules/quickshell/home.nix
-    ../../modules/chromium/home.nix
-    #./modules/neovim/home.nix
-    ../../modules/stylix/home.nix
-    ../../modules/nixvim/home.nix
-    ../../modules/tmux/home.nix
-    ../../modules/theme/home.nix
-    # ./modules/spicetify/home.nix
-    ../../modules/obs/home.nix
-    ../../modules/blender/home.nix
-    ../../modules/fish/home.nix
-    ../../modules/ytm/home.nix
-    ../../overlays.nix
-  ];
+  # imports = [
+  #   ../../modules/hyprland/home.nix
+  #   ../../modules/quickshell/home.nix
+  #   ../../modules/chromium/home.nix
+  #   #./modules/neovim/home.nix
+  #   ../../modules/stylix/home.nix
+  #   ../../modules/nixvim/home.nix
+  #   ../../modules/tmux/home.nix
+  #   ../../modules/theme/home.nix
+  #   # ./modules/spicetify/home.nix
+  #   ../../modules/obs/home.nix
+  #   ../../modules/blender/home.nix
+  #   ../../modules/fish/home.nix
+  #   ../../modules/ytm/home.nix
+  #   ../../overlays.nix
+  # ];
+  modules = {
+    Hyprland.enable = true;
+    quickshell.enable = true;
+    chromium.enable = true;
+    nixvim.enable = true;
+    stylix.enable = true;
+    tmux.enable = true;
+    theme.enable = true;
+    obs.enable = true;
+    blender.enable = true;
+    fish.enable = true;
+    youtube-music.enable = true;
+  };
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "doloro";

nix/hosts/doloro/nixos.nix

@@ -4,22 +4,24 @@
 
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
 }:
-
+let
+  sops = inputs.sops-nix;
+in
 {
   imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ../../modules/greetd/nixos.nix
-    ../../modules/stylix/nixos.nix
-    ../../modules/steam/nixos.nix
-    ../../modules/hyprland/nixos.nix
-    ../../disks.nix
-    ./overlays.nix
+    inputs.sops-nix.nixosModules.sops
   ];
+  modules = {
+    greetd.enable = true;
+    stylix.enable = true;
+    steam.enable = true;
+    Hyprland.enable = true;
+  };
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.grub.enable = true;
@@ -53,7 +55,7 @@
   security.rtkit.enable = true;
 
   sops = {
-    defaultSopsFile = ./secrets/users.yaml;
+    defaultSopsFile = ../../secrets/users.yaml;
     secrets = {
       root-hashed_password = {
         neededForUsers = true;
@@ -190,6 +192,7 @@
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
     killall
+    sops
   ];
 
   # Some programs need SUID wrappers, can be configured further or are