Refactore structure and ++

config/hosts.nix

@@ -8,12 +8,6 @@ in
     arch = "x86_64-linux";
     user = users.default;
   };
-  dellaptop = {
-    hostname = "dellaptop";
-    dir = "dellaptop";
-    arch = "x86_64-linux";
-    user = users.default;  
-  };
   ideapad = {
     hostname = "ideapad";
     dir = "ideapad";

flake.nix

@@ -62,7 +62,7 @@
           };
           modules = [
             nix-flatpak.nixosModules.nix-flatpak
-            ./hosts/${host.dir}/configuration.nix
+            ./hosts/${host.dir}/nixos
             { nixpkgs.overlays = overlays; }
             home-manager.nixosModules.home-manager
             {
@@ -70,7 +70,7 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.backupFileExtension = "backup";
-              home-manager.users."${host.user}" = import ./hosts/${host.dir}/home.nix;
+              home-manager.users."${host.user}" = import ./hosts/${host.dir}/home;
             }
           ] ++ modules;
         };
@@ -93,11 +93,6 @@
         nixpkgs = inputs.nixpkgs;
         home-manager = inputs.home-manager;
       };
-      nixosConfigurations."${hosts.dellaptop.hostname}" = mkNixOSConfigurations {
-        host = hosts.dellaptop;
-        nixpkgs = inputs.nixpkgs;
-        home-manager = inputs.home-manager;
-      };
       nixosConfigurations."${hosts.ideapad.hostname}" = mkNixOSConfigurations {
         host = hosts.ideapad;
         nixpkgs = inputs.nixpkgs;
@@ -108,10 +103,6 @@
         host = hosts.nixstation;
         nixpkgs = inputs.nixpkgs;
       };
-      nixosConfigurations."${hosts.dellaptop.hostname}-iso" = mkISOConfiguration {
-        host = hosts.dellaptop;
-        nixpkgs = inputs.nixpkgs;
-      };
       nixosConfigurations."${hosts.ideapad.hostname}-iso" = mkISOConfiguration {
         host = hosts.ideapad;
         nixpkgs = inputs.nixpkgs;
@@ -122,8 +113,8 @@
         nixpkgs = inputs.nixpkgs;
         home-manager = inputs.home-manager;
       };
-      homeConfigurations."${hosts.dellaptop.user}@${hosts.dellaptop.hostname}" = mkHomeConfigurations {
-        host = hosts.dellaptop;
+      homeConfigurations."${hosts.ideapad.user}@${hosts.ideapad.hostname}" = mkHomeConfigurations {
+        host = hosts.ideapad;
         nixpkgs = inputs.nixpkgs;
         home-manager = inputs.home-manager;
       };

home/flavors/desktop/hyprland/default.nix

@@ -1,9 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  imports = [
-    ../../../features/desktop/hyprland
-    ../../../features/application/bashrc.nix
-    ../../../features/application/alacritty.nix
-    ../../../features/application/fish.nix
-  ];
-}

home/flavors/desktop/mango/default.nix

@@ -1,8 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  imports = [
-    ../../../features/desktop/mango
-    ../../../features/application/bashrc.nix
-    ../../../features/application/alacritty.nix
-  ];
-}

home/flavors/desktop/sway/default.nix

@@ -1,8 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  imports = [
-    ../../../features/desktop/sway
-    ../../../features/application/bashrc.nix
-    ../../../features/application/alacritty.nix
-  ];
-}

hosts/dellaptop/home.nix → home/modules/system/home-base.nix

@@ -1,12 +1,9 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
+
 let
-  users = import ../../config/users.nix;
+  users = import ../../../config/users.nix;
 in
 {
-  imports = [
-    ../../home/flavors/desktop/hyprland
-  ];
-
   news.display = "silent";
 
   home = {

hosts/dellaptop/configuration.nix

@@ -1,54 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let 
-  hosts = import ../../config/hosts.nix;
-in
-{
-  imports = [
-    ./hardware.nix
-
-    ../../nixos/hardware/networking
-    ../../nixos/hardware/gpu/nvidia.nix
-    ../../nixos/hardware/sound
-    ../../nixos/hardware/bluetooth
-    ../../nixos/flavors/desktop/hyprland
-    ../../nixos/flavors/desktop/hyprland/greeter-default.nix
-    ../../nixos/flavors/application/workstation
-    ../../nixos/flavors/application/development
-    ../../nixos/flavors/application/gaming
-    ../../nixos/flavors/application/school
-    ../../nixos/features/system/users.nix
-  ];
-
-  boot.kernelParams = [
-    "resume=UUID=b0e53493-71b7-4adc-bc9a-37c16ed9672b"
-  ];
-
-  nixpkgs.config.allowUnfree = true;
-  hardware.enableAllFirmware = true;
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  networking.hostName = hosts.dellaptop.hostname;
-
-  hardware.nvidia = {
-    powerManagement = {
-      enable = true;
-      finegrained = true;
-    };
-
-    prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
-
-      intelBusId = "PCI:0:2:0";
-      nvidiaBusId = "PCI:2:0:0";
-    };
-  };
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  system.stateVersion = "26.05";
-}

hosts/dellaptop/hardware.nix

@@ -1,45 +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 = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/91e157c0-f607-491d-93ad-4a00f08ae338";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/91e157c0-f607-491d-93ad-4a00f08ae338";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/91e157c0-f607-491d-93ad-4a00f08ae338";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0996-8DC7";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/b0e53493-71b7-4adc-bc9a-37c16ed9672b"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/dellaptop/iso.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ../../nixos/features/system/iso-base.nix
-  ];
-}

hosts/ideapad/home.nix → hosts/ideapad/home/default.nix

@@ -1,10 +1,12 @@
 { config, pkgs, lib, ... }:
 let
-  users = import ../../config/users.nix;
+  users = import ../../../config/users.nix;
 in
 {
   imports = [
-    ../../home/flavors/desktop/hyprland
+    ../../../home/modules/system/home-base.nix
+
+    ../../../home/modules/desktop/hyprland
   ];
 
   news.display = "silent";

hosts/ideapad/configuration.nix → hosts/ideapad/nixos/default.nix

@@ -7,17 +7,18 @@ in
   imports = [
     ./hardware.nix
 
-    ../../nixos/hardware/networking
-    ../../nixos/hardware/sound
-    ../../nixos/hardware/bluetooth
-    ../../nixos/hardware/biometric/elan-fingerprint.nix
-    ../../nixos/flavors/desktop/hyprland
-    ../../nixos/flavors/desktop/hyprland/greeter-default.nix
-    ../../nixos/flavors/application/workstation
-    ../../nixos/flavors/application/development
-    ../../nixos/flavors/application/gaming
-    ../../nixos/flavors/application/school
-    ../../nixos/features/system/users.nix
+    ../../../nixos/modules/system/nixos-base.nix
+    ../../../nixos/modules/system/users.nix
+    ../../../nixos/modules/hardware/networking
+    ../../../nixos/modules/hardware/sound
+    ../../../nixos/modules/hardware/bluetooth
+    ../../../nixos/modules/hardware/biometric/elan-fingerprint.nix
+    ../../../nixos/modules/desktop/hyprland
+    ../../../nixos/modules/desktop/hyprland/greeter-default.nix
+    ../../../nixos/modules/application/workstation
+    ../../../nixos/modules/application/development
+    ../../../nixos/modules/application/gaming
+    ../../../nixos/modules/application/school
   ];
 
   boot.kernelParams = [

hosts/nixstation/configuration.nix

@@ -1,33 +0,0 @@
-{ config, pkgs, lib, inputs, ... }:
-
-let 
-  hosts = import ../../config/hosts.nix;
-in
-{
-  imports = [
-    ./hardware.nix
-
-    ../../nixos/hardware/gpu/nvidia.nix
-    ../../nixos/hardware/networking/bcm4360.nix
-    ../../nixos/hardware/sound
-    ../../nixos/hardware/bluetooth
-    ../../nixos/flavors/desktop/hyprland
-    ../../nixos/flavors/desktop/hyprland/greeter-default.nix
-    ../../nixos/flavors/application/workstation
-    ../../nixos/flavors/application/development
-    ../../nixos/flavors/application/gaming
-    ../../nixos/flavors/application/school
-    ../../nixos/features/system/users.nix
-  ];
-
-  nixpkgs.config.allowUnfree = true;
-  hardware.enableAllFirmware = true;
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  networking.hostName = hosts.nixstation.hostname;
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  system.stateVersion = "26.05";
-}

hosts/nixstation/home.nix → hosts/nixstation/home/default.nix

@@ -1,19 +1,13 @@
 { config, pkgs, ... }:
-let
-  users = import ../../config/users.nix;
-in
+
 {
   imports = [
-    ../../home/flavors/desktop/hyprland
-  ];
-
-  news.display = "silent";
+    ../../../home/modules/system/home-base.nix
 
-  home = {
-    username = users.default;
-    homeDirectory = "/home/${users.default}";
-    stateVersion = "26.05";
-  };
+    ../../../home/modules/desktop/hyprland
+    ../../../home/modules/configs/alacritty.nix
+    ../../../home/modules/configs/fish.nix
+  ];
 
   custom.hyprExtras = {
     monitors = ''

hosts/nixstation/nixos/default.nix

@@ -0,0 +1,28 @@
+{ config, pkgs, lib, inputs, ... }:
+
+let 
+  hosts = import ../../../config/hosts.nix;
+in
+{
+  imports = [
+    ./hardware.nix
+
+    ../../../nixos/modules/system/nixos-base.nix
+    ../../../nixos/modules/system/users.nix
+
+    ../../../nixos/profiles/workstation
+    ../../../nixos/profiles/development
+    ../../../nixos/profiles/gaming
+    ../../../nixos/profiles/school
+
+    ../../../nixos/modules/hardware/gpu/nvidia.nix
+    ../../../nixos/modules/hardware/networking/bcm4360.nix
+    ../../../nixos/modules/hardware/sound
+    ../../../nixos/modules/hardware/bluetooth
+
+    ../../../nixos/modules/desktop/hyprland
+    ../../../nixos/modules/desktop/hyprland/greeter-default.nix
+  ];
+  
+  networking.hostName = hosts.nixstation.hostname;
+}

nixos/flavors/desktop/mango/default.nix

@@ -1,82 +0,0 @@
-{ config, pkgs, lib, inputs, ... }:
-
-{
-  imports = [
-    inputs.mango.nixosModules.mango
-  ];
-
-  environment.systemPackages = with pkgs; [
-    cliphist
-    wl-clipboard
-    hyprpicker
-    wtype
-
-    mission-center
-    nomacs
-    alacritty
-    vlc
-
-    kdePackages.kdenlive
-    kdePackages.ark
-    kdePackages.dolphin
-    kdePackages.qtsvg 
-    kdePackages.kio
-    kdePackages.kio-fuse
-    kdePackages.kio-extras
-    kdePackages.ksshaskpass
-  ];
-
-  programs.kdeconnect.enable = true;
-
-  environment.variables = {
-    GDK_BACKEND = "wayland";
-    XDG_SESSION_TYPE = "wayland";
-    WLR_DRM_NO_ATOMIC = "1";
-    NIXOS_OZONE_WL = "1";
-    WLR_RENDERER = "vulkan";
-    WLR_NO_HARDWARE_CURSORS = "1";
-    ELECTRON_OZONE_PLATFORM_HINT = "wayland";
-  };
-
-  xdg.portal = {
-    enable = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-gtk
-      xdg-desktop-portal-wlr
-    ];
-
-    wlr.enable = true;
-
-    config = {
-      common = {
-        "org.freedesktop.impl.portal.Screencast" = "mango";
-        "org.freedesktop.impl.portal.Screenshot" = "mango";
-      };
-    };
-  };
-
-  environment.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
-    QT_QPA_PLATFORM = "wayland";
-    XDG_CURRENT_DESKTOP = "mango";
-    WLR_NO_HARDWARE_CURSORS = "1";
-  };
-
-  services.gnome.gnome-keyring.enable = true;
-  security.pam.services.login.enableGnomeKeyring = true;
-  security.pam.services.greetd.enableGnomeKeyring = true;
-
-  security.pam.services.login.enableKwallet = true;
-
-  systemd.user.services.gnome-keyring = {
-    wantedBy = [ "default.target" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.gnome-keyring}/bin/gnome-keyring-daemon --start --foreground --components=pkcs11,secrets,ssh";
-      Restart = "on-abort";
-    };
-  };
-
-  programs.mango = {
-    enable = true;
-  };
-}

nixos/flavors/desktop/mango/greeter-default.nix

@@ -1,22 +0,0 @@
-{ config, pkgs, ... }:
-
-
-let
-  users = import ./../../../../config/users.nix;
-in
-{
-  environment.systemPackages = with pkgs; [
-    tuigreet
-  ];
-
-  security.pam.services.greetd.enableGnomeKeyring = true;
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      command = ''
-        ${pkgs.tuigreet}/bin/tuigreet --time --cmd "mango"
-      '';
-      user = users.default;
-    };
-  };
-}

nixos/modules/system/nixos-base.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, lib, inputs, ... }:
+
+{
+  nixpkgs.config.allowUnfree = true;
+  hardware.enableAllFirmware = true;
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  system.stateVersion = "26.05";
+}