complete refactor of packages and options

users/default.nix

@@ -0,0 +1,10 @@
+{ config, ...}:
+
+{
+  config = {
+    users = {
+      mutableUsers = false;
+      users.root.initialHashedPassword = "!";
+    };
+  };
+}

users/nyadmin/default.nix

@@ -1,6 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
+  imports = [ ../default.nix ];
   users.users.nyadmin = {
    isNormalUser = true;
    shell = pkgs.zsh;

users/stitchynyan/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  
+  imports = [ ../default.nix ];
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem ( lib.getName pkg) [
       "osu-lazer"
@@ -12,15 +12,15 @@
       "nvidia-settings"
       "cudatoolkit"
       ];
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-  };
-  hardware.steam-hardware.enable = true;
 
   programs = {
+    firefox.enable = true;
     hyprland.enable = true;
     openvpn3.enable = true;
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+    };
   };
 
   services = {
@@ -43,8 +43,6 @@
 
   security.pam.services.swaylock = {};
 
-  hardware.bluetooth.enable = true;
-
   users.users.stitchynyan = {
     isNormalUser = true;
     shell = pkgs.zsh;

users/stitchynyan/home.nix

@@ -1,5 +1,3 @@
-
-
 { config,
   nixosConfig,
   pkgs,
@@ -7,139 +5,139 @@
   inputs,
   home-manager,
   ... }:
+let
+  handheldPkgs = lib.attrVals [
+    "fluffychat"
+  ] pkgs;
+  pcPkgs = lib.attrVals [
+    "activitywatch"
+    "dunst"
+    "foot"
+    "grim"
+    "imv"
+    "isync"
+    "kitty"
+    "hunspell"
+    "hyprpaper"
+    "libreoffice"
+    "librewolf"
+    "lynx"
+    "mpv"
+    "msmtp"
+    "mupdf"
+    "neomutt"
+    "networkmanagerapplet"
+    "nheko"
+    "notmuch"
+    "okular"
+    "pavucontrol"
+    "pass"
+    "playerctl"
+    "prismlauncher"
+    "qt5ct"
+    "qt6ct"
+    "slurp"
+    "swaylock-effects"
+    "wofi"
+  ] pkgs ++ [ pkgs.hunspellDicts.en_US ];
+in
 {
-
-  imports = [
-     #inputs.nix-index-db.hmModules.nix-index
-  ];
-
-  home.packages = with pkgs; [
-    steam
-    networkmanagerapplet
-    activitywatch
-    ngspice
-    hugo
-    kicad
-    okular
-    mupdf
-    libreoffice
-    hunspell
-    hunspellDicts.en_US
-    cider
-    foot
-    prismlauncher
-    firefox
-    librewolf
-    neomutt
-    dunst
-    pass
-    isync
-    msmtp
-    notmuch
-    kitty
-    lynx
-    playerctl
-    nheko
-    hyprpaper
-    xdg-desktop-portal-hyprland
-    pavucontrol
-    slurp
-    grim
-    wofi
-    imv
-    swaylock-effects
-    qt5ct
-    qt6ct
-    mpv
-    #steamvr?
-    procps
-    usbutils
-    (python311.withPackages (lib.attrVals ["sympy" "matplotlib"]))
-    (octaveFull.withPackages (lib.attrVals ["symbolic"]))
-  ];
-
-  dconf.settings = {
-    "org/virt-manager/virt-manager/connections" = {
-      autoconnect = ["qemu:///system"];
-      uris = ["qemu:///system"];
-    };
+  options = {
   };
 
+  config = {
+    home.packages = with pkgs; [
+      cider
+      ngspice
+      hugo
+      kicad
+      #steamvr?
+      procps
+      usbutils
+      (python311.withPackages (lib.attrVals ["sympy" "matplotlib"]))
+      (octaveFull.withPackages (lib.attrVals ["symbolic"]))
+    ]
+    ++ (lib.optionals (nixosConfig.stitchyconf.form == "handheld") handheldPkgs)
+    ++ (lib.optionals (nixosConfig.stitchyconf.form == "pc") pcPkgs);
 
-  home.sessionVariables = {
-    FOO = "BAR";
-
-  };
-
-  #programs.hyprland.enable = true;
-  # hyprland.homeManagerModules.default
-  #wayland.windowManager.hyprland.enable = true;
-
-  home.file = {
-    ".zshrc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/zshrc";
-  };
-
-  xdg.configFile = { 
-    "dunst" = {
-      source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/dunst";
-      recursive = true;
-    };
-    "eww" = {
-      source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/eww";
-      recursive = true;
-    };
-    "hypr" = {
-      source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/hypr";
-      recursive = true;
-    };
-    "swaylock" = {
-      source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/swaylock";
-      recursive = true;
-    };
-  };
-
-  systemd.user.services = {
-    mailsync = {
-      Unit = {
-        Description = "Syncs email";
-	After = [ "network-online.target" ];
+    dconf.settings = {
+      "org/virt-manager/virt-manager/connections" = {
+        autoconnect = ["qemu:///system"];
+        uris = ["qemu:///system"];
       };
-      Service = {
-        Type = "oneshot";
-        ExecStart = "${pkgs.mutt-wizard}/bin/mailsync";
-        Environment =  [
-          "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus"
-          "DISPLAY=:0"
-          "MBSYNCRC=/home/stitchynyan/.config/mbsync/config"
-          "PATH=$PATH:${lib.makeBinPath [ pkgs.busybox pkgs.cyrus-sasl-xoauth2 pkgs.gnupg pkgs.isync pkgs.notify pkgs.notmuch pkgs.pass pkgs.perl pkgs.python3 ]}"
-          "SASL_PATH=/run/current-system/sw/lib/sasl2"
-          "WAYLAND_DISPLAY=wayland-1"
-        ];
-      };
-      Install.WantedBy = [ "default.target" ];
     };
-  };
 
-  systemd.user.timers = {
-    mailsync = {
-      Unit.Description = "Syncs email";
-      Timer = {
-        OnBootSec = "1min";
-	OnUnitActiveSec = "10min";
-      };
-      Install.WantedBy = [ "timers.target" ];
+    # To-Do Later
+    home.sessionVariables = {
+      FOO = "BAR";
+
     };
-  };
 
+    home.file = {
+      ".zshrc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/zshrc";
+    };
 
-  home.pointerCursor = {
-    name = "phinger-cursors";
-    package = pkgs.phinger-cursors;
-    gtk.enable = true;
-    size = 64;
+    xdg.configFile = {
+      "dunst" = {
+        source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/dunst";
+        recursive = true;
+      };
+      "eww" = {
+        source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/eww";
+        recursive = true;
+      };
+      "hypr" = {
+        source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/hypr";
+        recursive = true;
+      };
+      "swaylock" = {
+        source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/swaylock";
+        recursive = true;
+      };
+    };
+
+    systemd.user.services = {
+      mailsync = {
+        Unit = {
+          Description = "Syncs email";
+    After = [ "network-online.target" ];
+        };
+        Service = {
+          Type = "oneshot";
+          ExecStart = "${pkgs.mutt-wizard}/bin/mailsync";
+          Environment =  [
+            "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus"
+            "DISPLAY=:0"
+            "MBSYNCRC=/home/stitchynyan/.config/mbsync/config"
+            "PATH=$PATH:${lib.makeBinPath (lib.attrVals [ "busybox" "cyrus-sasl-xoauth2" "gnupg" "isync" "notify" "notmuch" "pass" "perl" "python3" ] pkgs)}"
+            "SASL_PATH=/run/current-system/sw/lib/sasl2"
+            "WAYLAND_DISPLAY=wayland-1"
+          ];
+        };
+        Install.WantedBy = [ "default.target" ];
+      };
+    };
+
+    systemd.user.timers = {
+      mailsync = {
+        Unit.Description = "Syncs email";
+        Timer = {
+          OnBootSec = "1min";
+    OnUnitActiveSec = "10min";
+        };
+        Install.WantedBy = [ "timers.target" ];
+      };
+    };
+
+    home.pointerCursor = {
+      name = "phinger-cursors";
+      package = pkgs.phinger-cursors;
+      gtk.enable = true;
+      size = 64;
+    };
+
+    # Read the Docs before change
+    home.stateVersion = "23.05";
+    home.homeDirectory = "/home/stitchynyan";
   };
-  
-  # Read the Docs before change
-  home.stateVersion = "23.05";
-  home.homeDirectory = "/home/stitchynyan";
 }