realized I was inheriting nipkgs in my nixosSystems

added ways to use different branches of nixpkgs
made unfree packages have to specified
switched to nix master branch
moved sxhkd from a seperate flake
switched spotify and maim versions because both are broken on nixos-unstable right now
moved afk-cmds from local to remote
added flake-utils for easier devShell decleration
switched my mom's laptop to stable branch

systems/desktop.nix

@@ -1,45 +1,37 @@
-{
+inputs: {
   pkgs,
   settings,
-  lib,
   ...
 }: {
-  imports = let
-    files = [
-      "boot"
-      "dwm"
-      "fonts"
-      "git"
-      "packages"
-      "parrot"
-      "picom"
-      "refreshrate"
-      "shells"
-      "sxhkd"
-      "theme"
-      "vfio"
-      "spicetify"
-      #"mining"
-    ];
-  in
-    lib.lists.forEach files (
-      f:
-        ../imports + ("/" + f + ".nix")
-    );
+  imports = [
+    (import ../imports/boot.nix inputs)
+    (import ../imports/dwm.nix inputs)
+    (import ../imports/fonts.nix inputs)
+    (import ../imports/git.nix inputs)
+    (import ../imports/packages.nix inputs)
+    (import ../imports/parrot.nix inputs)
+    (import ../imports/picom.nix inputs)
+    (import ../imports/refreshrate.nix inputs)
+    (import ../imports/shells.nix inputs)
+    (import ../imports/sxhkd.nix inputs)
+    (import ../imports/theme.nix inputs)
+    (import ../imports/vfio.nix inputs)
+ #   (import ../imports/mining.nix inputs)
+    (import ../imports/spicetify.nix inputs)
+  ];
+  system.stateVersion = "23.05";
   environment.systemPackages = with pkgs; [
     webcord # talk to people (gross)
     bitwarden #store stuff
     qbittorrent #steal stuff
     networkmanagerapplet #gui connection control
     vlc #play stuff
-    dmenu #suckless launcher
   ];
   networking.hostName = settings.hostname;
   boot.kernelPackages = pkgs.linuxPackages_latest;
   hardware.cpu.amd.updateMicrocode = true;
   #user managment
   users = {
-    defaultUserShell = pkgs.zsh;
     users."${settings.username}" = {
       uid = 1000;
       isNormalUser = true;

systems/laptop.nix

@@ -21,14 +21,15 @@
       f:
         ../imports + ("/" + f + ".nix")
     );
-  environment.systemPackages = with pkgs; [
-    webcord
+
+  system.stateVersion = "23.05";
+  environment.systemPackages = [
+    pkgs.webcord
   ];
   networking.hostName = settings.hostname;
   boot.kernelPackages = pkgs.linuxPackages_latest;
   hardware.cpu.amd.updateMicrocode = true;
   users = {
-    defaultUserShell = pkgs.zsh;
     users."${settings.username}" = {
       uid = 1000;
       isNormalUser = true;

systems/mom.nix

@@ -19,16 +19,17 @@
       f:
         ../imports + ("/" + f + ".nix")
     );
-  environment.systemPackages = with pkgs; [
-    gimp
+
+  system.stateVersion = "22.11";
+  environment.systemPackages = [
+    pkgs.gimp
     (pkgs.xsane.override {gimpSupport = true;})
-    vlc
-    libreoffice
-    nomacs
-    #    foxitreader
-    gnome.gnome-calculator
-    xfce.xfce4-whiskermenu-plugin
-    rsync
+    pkgs.vlc
+    pkgs.libreoffice
+    pkgs.nomacs
+    pkgs.gnome.gnome-calculator
+    pkgs.xfce.xfce4-whiskermenu-plugin
+    pkgs.rsync
   ];
   services.xserver.videoDrivers = ["intel"];
   networking.hostName = settings.hostname;