diff --git a/base/adventurer/configuration.nix b/base/adventurer/configuration.nix
deleted file mode 100644
index 1902634..0000000
--- a/base/adventurer/configuration.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, fetchFromGitLab, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
-  # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-  boot.loader.grub.useOSProber = true;
-  powerManagement.cpuFreqGovernor = "performance";
-  nix.settings.experimental-features = "nix-command flakes";
-  programs.dconf.enable = true;
-  services.fprintd.enable = true;
-  networking.hostName = "adventurer"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  environment.variables = {
-    WLR_NO_HARDWARE_CURSORS = "1";
-    PASSWORD_STORE_DIR = "/home/maya/sync/general/pass";
-  };
-  programs.gnupg.agent.enable = true;
-  programs.steam.enable = true;
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Australia/Perth";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_AU.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_AU.UTF-8";
-    LC_IDENTIFICATION = "en_AU.UTF-8";
-    LC_MEASUREMENT = "en_AU.UTF-8";
-    LC_MONETARY = "en_AU.UTF-8";
-    LC_NAME = "en_AU.UTF-8";
-    LC_NUMERIC = "en_AU.UTF-8";
-    LC_PAPER = "en_AU.UTF-8";
-    LC_TELEPHONE = "en_AU.UTF-8";
-    LC_TIME = "en_AU.UTF-8";
-  };
-
-  # Enable the X11 windowing system.
-  # You can disable this if you're only using the Wayland session.
-  services.xserver.enable = true;
-  
-  # Enable the KDE Plasma Desktop Environment.
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.maya = {
-    isNormalUser = true;
-    description = "Maya Wren";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-    #  thunderbird
-    ];
-  };
-  # Install firefox.
-  programs.firefox.enable = true;
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
-    neovim
-    git
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
-
-}
diff --git a/base/adventurer/default.nix b/base/adventurer/default.nix
deleted file mode 100644
index a94a618..0000000
--- a/base/adventurer/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{config, pkgs, ...}:{
-  imports = [
-    ./configuration.nix
-    ../overrides.nix
-    ../ssh.nix
-    ../firewall.nix
-    ../substituters.nix
-    ../fonts.nix
-    ../udev.nix
-    ../greetd.nix
-  ];
-}
diff --git a/base/adventurer/hardware-configuration.nix b/base/adventurer/hardware-configuration.nix
deleted file mode 100644
index adb8718..0000000
--- a/base/adventurer/hardware-configuration.nix
+++ /dev/null
@@ -1,37 +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 = [ "uhci_hcd" "ehci_pci" "ata_piix" "ahci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" "sr_mod" "sdhci_pci" ];
-  #boot.initrd.kernelModules = [ "nvidia" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/be6662d9-e9c6-48a2-9557-672f5307816f";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/87a05a1d-e62d-4882-ad5a-e2e6324671da"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s29f7u2.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp9s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp12s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  networking.enableIntel3945ABGFirmware = true;
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/base/apollo/configuration.nix b/base/apollo/configuration.nix
index 7ee7e1f..0607f75 100644
--- a/base/apollo/configuration.nix
+++ b/base/apollo/configuration.nix
@@ -10,9 +10,7 @@
       ./hardware-configuration.nix
     ];
   services.blueman.enable = true;
-  services.upower.enable = true;
   programs.steam.enable = true;
-  services.pcscd.enable = true;
   services.tailscale = {
     enable = true;
     useRoutingFeatures = "both";
@@ -24,7 +22,6 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   programs.virt-manager.enable = true;
-  services.gvfs.enable = true;
   hardware.keyboard.qmk.enable = true;
   virtualisation = {
     libvirtd = {
@@ -32,16 +29,9 @@
       extraConfig = ''
         user="maya"
       '';
-      onShutdown = "shutdown";
-
-      qemu = {
-        ovmf.enable = true;
-	package = pkgs.qemu_kvm;
-        runAsRoot = true;
-	verbatimConfig = ''
-	  namespaces = []
-	'';
-      };
+      qemu.ovmf.enable = true;
+      qemu.package = pkgs.qemu_kvm;
+      qemu.runAsRoot = true;
     };
     spiceUSBRedirection.enable = true;
   };
@@ -78,7 +68,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666
 
   # Select internationalisation properties.
   i18n.defaultLocale = "en_AU.UTF-8";
-  nix.settings.experimental-features = "nix-command flakes";
+
   services.udisks2.enable = true;
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "en_AU.UTF-8";
@@ -91,6 +81,32 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666
     LC_TELEPHONE = "en_AU.UTF-8";
     LC_TIME = "en_AU.UTF-8";
   };
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  services.greetd = {
+    enable = true;
+    restart = true;
+    settings.default_session = {
+      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
+      user = "greeter";
+    };
+  };
+  xdg.portal.config.common.default = "*";
+  xdg.portal.wlr.enable = true;
+  xdg.portal.wlr.settings.screencast = {
+    chooser_type = "simple";
+    chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
+    exec_before = "${lib.getExe' pkgs.swaynotificationcenter "swaync-client"} --dnd-on --skip-wait";
+    exec_after = "${lib.getExe' pkgs.swaynotificationcenter "swaync-client"} --dnd-off --skip-wait";
+  };
+  systemd.services.greetd.serviceConfig = {
+    Type = "idle";
+    StandardInput = "tty";
+    StandardOutput = "tty";
+    StandardError = "journal";
+    TTYReset = "true";
+    TTYHangup = "true";
+    TTYVTDisallocate = "true";
+  };
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
@@ -101,18 +117,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666
     layout = "us";
     variant = "";
   };
-  xdg.portal.config.common.default = "*";
-  xdg.portal.wlr = {
-    enable = true;
-    settings = {
-      screencast = {
-        chooser_type = "simple";
-        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
-        exec_before = "${lib.getExe' pkgs.swaynotificationcenter "swaync-client"} --dnd-on --skip-wait";
-        exec_after = "${lib.getExe' pkgs.swaynotificationcenter "swaync-client"} --dnd-off --skip-wait";
-      };
-    };
-  };
+
   # Enable CUPS to print documents.
   services.printing.enable = true;
  nixpkgs.overlays = [
@@ -150,7 +155,10 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666
   users.users.maya = {
     isNormalUser = true;
     description = "Maya";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" "qemu-libvirt" "camera" "input" "adbusers"];
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" "camera" "input" "adbusers"];
+    packages = with pkgs; [
+    #  thunderbird
+    ];
   };
 
   # Install firefox.
@@ -168,7 +176,6 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666
     git
     lact
     keepassxc
-    looking-glass-client
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -178,9 +185,6 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666
      enable = true;
      enableSSHSupport = true;
    };
-   systemd.tmpfiles.rules = [
-     "f /dev/shm/looking-glass 0660 maya qemu-libvirtd -"
-   ];
 
   # List services that you want to enable:
 
diff --git a/base/apollo/default.nix b/base/apollo/default.nix
index a94a618..1749f88 100644
--- a/base/apollo/default.nix
+++ b/base/apollo/default.nix
@@ -7,6 +7,5 @@
     ../substituters.nix
     ../fonts.nix
     ../udev.nix
-    ../greetd.nix
   ];
 }
diff --git a/base/apollo/hardware-configuration.nix b/base/apollo/hardware-configuration.nix
index 4200949..075f0c7 100644
--- a/base/apollo/hardware-configuration.nix
+++ b/base/apollo/hardware-configuration.nix
@@ -20,9 +20,9 @@
     };
   };
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" "vendor-reset" ];
+  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
   boot.kernelModules = [ "kvm-intel" "vfio_virqfd" "vhost-net" "v4l2loopback" ];
-  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback vendor-reset];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
   boot.extraModprobeConfig = ''
     options vfio-pci ids=1002:6fdf,1002:aaf0,1b21:1242
     options v4l2loopback devices=2 video_nr=1,2 card_label="OBS Cam, Virt Cam" exclusive_caps=1
@@ -41,16 +41,6 @@
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
-  fileSystems."/mnt/vms" = 
-    { device = "/dev/disk/by-uuid/9443885e-d2b3-44a1-aec2-540de7f5c832";
-      fsType = "xfs";
-      options = [ "x-gvfs-show" ];
-    };
-  fileSystems."/mnt/data" = 
-    { device = "/dev/disk/by-uuid/a4a08196-cedc-4be2-988d-d28eb41492c0";
-      fsType = "xfs";
-      options = [ "x-gvfs-show" ];
-    };
 
   swapDevices =
     [ { device = "/dev/disk/by-uuid/f7e4a77c-0936-445c-8ce9-0386e9e81656"; }
diff --git a/base/callisto/configuration.nix b/base/callisto/configuration.nix
index 18da599..66c533b 100644
--- a/base/callisto/configuration.nix
+++ b/base/callisto/configuration.nix
@@ -16,7 +16,6 @@
   #  undockEvent = "${pkgs.wlr-randr}/bin/wlr-randr --output eDP-1 --pos 0,0";
   #};
   programs.gamemode.enable = true;
-
   virtualisation.kvmgt = {
     enable = true;
     vgpus = {
@@ -25,20 +24,6 @@
       };
     };
   };
-  services.gvfs.enable = true;
-  programs.thunderbird.enable = true;
-  services.kmonad = {
-    enable = true;
-    keyboards.thinkpad = {
-      device = "/dev/input/by-path/platform-i8042-serio-0-event-kbd";
-      config = (builtins.readFile ./keymap.kbd);
-      defcfg = {
-        enable = true;
-	fallthrough = true;
-	compose.key = null;
-      };
-    };
-  };
   programs.steam.enable = true;
   virtualisation.libvirtd = {
     enable = true;
@@ -101,10 +86,6 @@
   };
 
   services.tlp.enable = true;
-  services.tlp.settings = {
-    CPU_SCALING_GOVERNOR_ON_BAT = "ondemand";
-    CPU_SCALING_GOVERNOR_ON_AC = "performance";
-  };
   hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
@@ -138,50 +119,11 @@
   services.fprintd.enable = true;
   services.udisks2.enable = true;
   # Bootloader.
-  boot.loader.systemd-boot.enable = false;
-  boot.loader.limine = {
-    enable = true;
-    style.wallpapers = [ ];
-    additionalFiles = {
-      "efi/memtest86/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
-      "efi/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";
-
-    };
-    extraEntries = ''
-    /memtest86
-      protocol: efi
-      path: boot():/limine/efi/memtest86/memtest86.efi
-    /shell
-      protocol: efi
-      path: boot():/limine/efi/shell.efi
-    '';
-
-  };
-  boot.loader.efi.canTouchEfiVariables = false;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "callisto"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  systemd.services.trackpad-fix = {
-    description = "Fixes the thinkpad touchpad being total shit";
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.tcl-8_6}/bin/tclsh /home/maya/unshit.tcl";
-      ExecStop = "pkill tclsh";
-      Restart = "on-failure";
-      };
-    wantedBy = ["default.target"];
-
-    
-    };
-  systemd.services.fuckyou = {
-    description = "h";
-    after = ["suspend.target"];
-    wantedBy = ["suspend.target"];
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "systemctl --no-block restart trackpad-fix.service";
-    };
-  };
 
   xdg.portal = {
     enable = true;
@@ -252,7 +194,7 @@
   users.users.maya = {
     isNormalUser = true;
     description = "Maya";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd" "input" "uinput" "dialout" ];
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
     packages = with pkgs; [
     #  thunderbird
       git
@@ -272,23 +214,16 @@
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     lutris
     playerctl
-    undervolt
-    s-tui
-    stress
-    xfsprogs
-    protonvpn-gui
-    memtest86-efi
-    edk2-uefi-shell
   #  wget
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
 
   # List services that you want to enable:
 
diff --git a/base/callisto/hardware-configuration.nix b/base/callisto/hardware-configuration.nix
index 16860e8..f9a9c39 100644
--- a/base/callisto/hardware-configuration.nix
+++ b/base/callisto/hardware-configuration.nix
@@ -11,13 +11,6 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelParams = [ "resume" ];
-  services.undervolt = {
-    enable = true;
-    tempBat = 80;
-    tempAc = 95;
-    coreOffset = -75;
-    gpuOffset = -95;
-  };
   boot.kernelModules = [ "kvm-intel" "sierra_net" ];
   boot.extraModulePackages = [ ];
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
diff --git a/base/callisto/keymap.kbd b/base/callisto/keymap.kbd
deleted file mode 100644
index 874a016..0000000
--- a/base/callisto/keymap.kbd
+++ /dev/null
@@ -1,24 +0,0 @@
-(defsrc
-  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
-  tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
-  caps a    s    d    f    g    h    j    k    l    ;    '    ret
-  lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lmet lalt           spc            ralt rmet cmp  rctl
-)
-(deflayer qwerty
-  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
-  tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
-  @ext a    s    d    f    g    h    j    k    l    ;    '    ret
-  lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lmet lalt           spc            ralt rmet cmp rctl
-)
-(defalias 
-  ext (layer-toggle extend)
-)
-(deflayer extend
-  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
-  tab  q   up    e    ~    t    y    u    i    o    p    [    ]    \
-  caps left  down   right    f    g    h    j    k    l    ;    '    ret
-  lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lmet KeyPreviousSong           KeyPlayPause            KeyNextSong rmet cmp rctl
-)
diff --git a/base/firewall.nix b/base/firewall.nix
index aecd756..28dfbe7 100644
--- a/base/firewall.nix
+++ b/base/firewall.nix
@@ -1,5 +1,5 @@
 {
-  networking.firewall.allowedUDPPorts = [ 22000 21027 ];
   networking.firewall.allowedTCPPorts = [ 22000 ];
-  services.syncthing.openDefaultPorts = true;
+  networking.firewall.allowedUDPPorts = [ 22000 21027 ];
+  #for syncthing
 }
diff --git a/base/greetd.nix b/base/greetd.nix
deleted file mode 100644
index 1990877..0000000
--- a/base/greetd.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{pkgs, ...}:{
-  services.greetd = {
-    enable = true;
-    restart = true;
-    settings.default_session = {
-      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
-      user = "greeter";
-    };
-  };
-  systemd.services.greetd.serviceConfig = {
-    Type = "idle";
-    StandardInput = "tty";
-    StandardOutput = "tty";
-    StandardError = "journal";
-    TTYReset = "true";
-    TTYHangup = "true";
-    TTYVTDisallocate = "true";
-  };
-}
diff --git a/base/hypermac/configuration.nix b/base/hypermac/configuration.nix
index b82c88d..cacfbde 100644
--- a/base/hypermac/configuration.nix
+++ b/base/hypermac/configuration.nix
@@ -22,11 +22,28 @@
   };
 
   programs.sway.enable = true;
+  services.greetd = {
+    enable = true;
+    restart = true;
+    settings.default_session = {
+      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time";
+      user = "greeter";
+    };
+  };
 
   programs.adb.enable = true;
   environment.variables = {
     WLR_NO_HARDWARE_CURSORS = "1";
   };
+  systemd.services.greetd.serviceConfig = {
+    Type = "idle";
+    StandardInput = "tty";
+    StandardOutput = "tty";
+    StandardError = "journal";
+    TTYReset = "true";
+    TTYHangup = "true";
+    TTYVTDisallocate = "true";
+  };
   networking.hostName = "hypermac"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
diff --git a/base/hypermac/default.nix b/base/hypermac/default.nix
index 4c1eb4b..ac61773 100644
--- a/base/hypermac/default.nix
+++ b/base/hypermac/default.nix
@@ -6,6 +6,5 @@
     ../firewall.nix
     ../substituters.nix
     ../fonts.nix
-    ../greetd.nix
   ];
 }
diff --git a/base/overrides.nix b/base/overrides.nix
index 7a510be..ad26ae6 100644
--- a/base/overrides.nix
+++ b/base/overrides.nix
@@ -5,11 +5,10 @@
     })
     (lutris.override {
        extraPkgs = pkgs: [
-	 wineWowPackages.waylandFull
+         wine
          gamescope
          antimicrox
          sc-controller
-	 winetricks
 	 
        ];
 
@@ -35,8 +34,7 @@
          pkgsi686Linux.libsndfile
          pkgsi686Linux.libmpg123
 	 gnome2.GConf
-	 icu
-	 openldap
+	 
        ];
     })
   ];
diff --git a/base/udev.nix b/base/udev.nix
index 7d1b702..643dab1 100644
--- a/base/udev.nix
+++ b/base/udev.nix
@@ -27,142 +27,6 @@ KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ce6", MODE="0660
 # Sony DualSense Edge Wireless-Controller; Bluetooth; USB
 KERNEL=="hidraw*", KERNELS=="*054C:0DF2*", MODE="0660", TAG+="uaccess"
 KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0df2", MODE="0660", TAG+="uaccess"
-# Rules to ensure vendor-reset is loaded and the reset_method for our devices is set to 'device_specific' for kernel 5.15+
-# (the module must be loaded, otherwise setting this may fail)
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67C0", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67C1", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67C2", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67C4", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67C7", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67D0", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67DF", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67C8", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67C9", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67CA", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67CC", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67CF", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6FDF", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67E0", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67E3", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67E8", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67EB", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67EF", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67FF", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67E1", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67E7", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x67E9", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6980", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6981", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6985", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6986", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6987", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6995", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6997", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x699F", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6860", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6861", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6862", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6863", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6864", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6867", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6868", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x6869", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x686a", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x686b", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x686c", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x686d", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x686e", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x686f", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x687f", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x66a0", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x66a1", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x66a2", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x66a3", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x66a4", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x66a7", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x66af", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7310", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7312", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7318", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7319", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x731a", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x731b", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x731e", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x731f", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7340", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7341", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7347", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x734F", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7360", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x7362", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
-ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1002", ATTR{device}=="0x738c", RUN+="/bin/sh -c '/sbin/modprobe vendor-reset; echo device_specific > /sys$env{DEVPATH}/reset_method'"
-
 '';
   services.udev.extraHwdb = ''
     id-input:modalias:input:b0003v054Cp0268*
diff --git a/flake.lock b/flake.lock
index 68f0c57..d6c2f76 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1744447794,
-        "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=",
+        "lastModified": 1739934729,
+        "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42",
+        "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743550720,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
         "type": "github"
       },
       "original": {
@@ -40,6 +40,21 @@
       }
     },
     "flake-utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -64,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744735751,
-        "narHash": "sha256-OPpfgL3qUIbQdbmp1/ZwnlsuTLooHN4or0EABnZTFRY=",
+        "lastModified": 1740624780,
+        "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "db7738e67a101ad945abbcb447e1310147afaf1b",
+        "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6",
         "type": "github"
       },
       "original": {
@@ -112,11 +127,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744518957,
-        "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=",
+        "lastModified": 1740281615,
+        "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd",
+        "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023",
         "type": "github"
       },
       "original": {
@@ -145,13 +160,32 @@
         "type": "github"
       }
     },
+    "nixgl": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1713543440,
+        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
+        "owner": "nix-community",
+        "repo": "nixGL",
+        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixGL",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744098102,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+        "lastModified": 1736012469,
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
         "type": "github"
       },
       "original": {
@@ -163,11 +197,26 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "lastModified": 1660551188,
+        "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1740560979,
+        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
         "type": "github"
       },
       "original": {
@@ -177,13 +226,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1744157173,
-        "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=",
+        "lastModified": 1738797219,
+        "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f",
+        "rev": "1da52dd49a127ad74486b135898da2cef8c62665",
         "type": "github"
       },
       "original": {
@@ -196,15 +245,15 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
-        "lastModified": 1744753228,
-        "narHash": "sha256-Re8g2pby4sr4hgzJmQJxeH/9PtgX85nivkWibapRI5s=",
+        "lastModified": 1740520037,
+        "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "d4dada282aeac94b5d53dd70e276a2f5f534f783",
+        "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666",
         "type": "github"
       },
       "original": {
@@ -215,7 +264,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -223,11 +272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743683223,
-        "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=",
+        "lastModified": 1738508923,
+        "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962",
+        "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
         "type": "github"
       },
       "original": {
@@ -242,7 +291,8 @@
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nix-system-graphics": "nix-system-graphics",
-        "nixpkgs": "nixpkgs_2",
+        "nixgl": "nixgl",
+        "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "system-manager": "system-manager"
       }
@@ -254,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744139528,
-        "narHash": "sha256-ABIcmxzf8399pJzXqHzShXtzw7iC+zxjhOxp/qS0fQk=",
+        "lastModified": 1740687245,
+        "narHash": "sha256-s8avsWuoP4uMxaRl3w5jK+q3lRvT2N2tNTCK4jcRclw=",
         "owner": "numtide",
         "repo": "system-manager",
-        "rev": "803322102ed51f29c250d4bff2973625adc4a521",
+        "rev": "db89a99a45265a9810c4556b9f36fe2c94dcd144",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 92a1a0d..4e3ca5e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixgl.url = "github:nix-community/nixGL";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     catppuccin.url = "github:catppuccin/nix";
@@ -23,7 +24,8 @@
     nixosConfigurations."apollo" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./base/apollo	
+        ./base/apollo
+	
 	home-manager.nixosModules.home-manager {
 	  #imports = [ inputs.nix-index-database.hmModules.nix-index ];
 	  home-manager.extraSpecialArgs = {
@@ -78,32 +80,12 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.users.maya = ./home;
-        }
-      ];
-    };
-    nixosConfigurations."adventurer" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [
-	./base/adventurer
-	home-manager.nixosModules.home-manager {
-	  home-manager.extraSpecialArgs = {
-	    inherit inputs;
-	    vars = {
-	      isNixOS = true;
-	      class = "lowspec";
-	      user = "maya";
-	      useSyncthing = true;
-	    };
-	  };
-	  home-manager.useGlobalPkgs = true;
-	  home-manager.useUserPackages = true;
-	  home-manager.users.maya = ./home;
-	}
-      ];
-    };
+        }];
+      };
+
     #other confs go here, cant be assed rn
     homeConfigurations.generic = home-manager.lib.homeManagerConfiguration {
-      pkgs = import nixpkgs; # { system = "x86_64-linux"; overlays = [inputs.nixgl.overlay]; };
+      pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [inputs.nixgl.overlay]; };
       modules = [ ./home ];
       extraSpecialArgs = { 
         inherit inputs; 
diff --git a/home/default.nix b/home/default.nix
index 0d53ea7..0ac4f78 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,7 +3,7 @@
     #home-manager modules
     inputs.nix-index-database.hmModules.nix-index
     inputs.nixvim.homeManagerModules.nixvim
-    inputs.catppuccin.homeModules.catppuccin
+    inputs.catppuccin.homeManagerModules.catppuccin
     #aux files to make finding specific things easier
     ./nixvim
     ./sway.nix
@@ -23,20 +23,25 @@
     };
   };
   programs.home-manager.enable = (!vars.isNixOS); #value is set in flake.nix
-
-  programs.foot.enable = true;
-  programs.foot.settings.main.font = "monospace:size=10";
-
-  programs.ncmpcpp.enable = true;
-  programs.ncmpcpp.settings.tags_separator = ";";
-
+  #targets.genericLinux.enable = (!vars.isNixOS);
+  
+  programs.foot = {
+    enable = true;
+    settings.main.font = "monospace:size=10";
+    #settings.colors.alpha = "0.8";
+  };
+  programs.ncmpcpp = {
+    enable = true;
+    settings = {
+      tags_separator = ";";
+    };
+  };
   programs.password-store = {
     enable = true;
     package = pkgs.pass.withExtensions (exts: [exts.pass-otp exts.pass-import]);
     settings = { PASSWORD_STORE_DIR = "$HOME/sync/general/pass"; };
   };
     
-  services.mpd-discord-rpc.enable = true;
   services.mpd = {
     enable = true;
     musicDirectory = "/home/${vars.user}/Music";
@@ -45,22 +50,16 @@
         type "pipewire"
 	name "default pipewire"
       }
-      audio_output {
-        type "alsa"
-	name "ALSA Direct"
-	mixer_type "hardware"
-	mixer_control "PCM"
-	auto_resample "no"
-	device "hw:0,0"
-      }
     '';
   };
   services.syncthing.enable = (vars.useSyncthing);
-
-  services.mpd-mpris.enable = true;
-
-  programs.waybar.enable = true;
-
+  
+  services.mpd-mpris = {
+    enable = true;
+  };
+  programs.waybar = {
+    enable = true;
+  };
   programs.git = {
     enable = true;
     userName = "beanigen";
@@ -72,18 +71,17 @@
       init.defaultBranch = "main";
     };
   };
-
   xdg.portal = {
     enable = true;
     extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
     configPackages = [ pkgs.xdg-desktop-portal-wlr ];
   };
-#  programs.obs-studio = {
-#    enable = true;
-#    plugins = with pkgs.obs-studio-plugins; [
-#      wlrobs
-#      obs-backgroundremoval
-#      obs-pipewire-audio-capture
-#    ];
-#  };
+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-backgroundremoval
+      obs-pipewire-audio-capture
+    ];
+  };
 }
diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix
index 001438c..f6316f9 100644
--- a/home/nixvim/default.nix
+++ b/home/nixvim/default.nix
@@ -23,7 +23,6 @@
       lsp = {
         enable = true;
 	servers.cssls.enable = true;
-	servers.clangd.enable = true;
 	servers.pylsp.enable = true;
 	servers.html = {
 	  enable = true;
diff --git a/home/packages.nix b/home/packages.nix
index 03794ec..0f5de6a 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,45 +1,48 @@
 {pkgs, vars, ...}:{
   home.packages = with pkgs; [
-    blender-hip
-    brightnessctl
-    cinny-desktop
-    comma
-    emacs
-    firefox
-    fzf
-    gamescope
-    gimp
-    grim
-    gtklock
-    gzdoom
-    hyfetch
-    inkscape
-    kanshi
-    kdePackages.ark
+    prismlauncher
     libgpod
-    libimobiledevice
-    libreoffice
-    mpc
-    nemo
+    vesktop
+    kdePackages.ark
+    v4l-utils
     nextcloud-client
-    openrct2
+    blender-hip
+    cinny-desktop
+    libimobiledevice
+    mpc
+    strawberry
+#    lmms
+    kanshi
+    emacs
+    comma
     openscad
     openutau
-    pamixer
-    pavucontrol
-    playerctl
-    prismlauncher
-    prusa-slicer
+    wlr-randr
+    grim
     slurp
-    swaybg
     swaynotificationcenter
     udiskie
-    v4l-utils
-    vesktop
-    vlc
+    gtklock
+    swaybg
+    gzdoom
+    fzf
+    openrct2
     wl-clipboard
-    wlr-randr
+    brightnessctl
+    nemo
     xfce.ristretto
     xfce.tumbler
-  ]; #++ (if !vars.isNixOS then [nixgl.nixGLIntel] else []);
+    inkscape
+    hyfetch
+    pamixer
+    pavucontrol
+    gimp
+    prusa-slicer
+    gamescope
+    vlc
+    playerctl
+    firefox
+    v4l-utils
+    libreoffice
+  ] ++ (if !vars.isNixOS then [nixgl.nixGLIntel] else []);
 }
diff --git a/home/sway.nix b/home/sway.nix
index 3e1c531..f8aa82f 100644
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -1,9 +1,9 @@
-{lib, pkgs, vars, ...}:{
+{lib, osConfig, pkgs, inputs, ...}:{
   wayland.windowManager.sway = {
     package = pkgs.swayfx;
     enable = true;
     checkConfig = false; #gles2 renderer error
-    extraConfig = if (vars.class != "lowspec") then import ./swayfx else "";
+    extraConfig = import ./swayfx;
     config = {
       modifier = "Mod4";
       terminal = "foot";
@@ -21,10 +21,6 @@
         inner = 5;
         outer = 7;
       };
-      assigns = {
-        "9: Mail" = [{ app_id = "thunderbird"; }];
-	"10: Messaging" = [{ app_id = "vesktop"; }];
-      };
       input = {
         "type:touchpad" = {
           accel_profile = "flat";
@@ -62,7 +58,7 @@
       workspaceLayout = "default";
       keybindings = lib.mkOptionDefault {
         "Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/screenshot-`date +%F-%T`.png";
-        "Mod4+d" = "exec foot --title launch --app-id fzf-launcher-foot bash -c 'compgen -c | sort -u | fzf --bind=enter:replace-query+print-query | xargs swaymsg exec --'";
+        "Mod4+d" = "exec foot --title launch --app-id fzf-launcher-foot bash -c 'compgen -c | sort -u | fzf | xargs swaymsg exec --'";
 	"Mod4+t" = "exec foot --title music --app-id mpd-control-foot ncmpcpp";
         "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.0";
         "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
@@ -79,10 +75,7 @@
         "Shift_L+Control_L+B" = "exec playerctl position 10-";
         "Shift_L+Control_L+F" = "exec playerctl position 10+";
 	"Mod4+w" = null;
-	"Mod4+s" = "scratchpad show";
-	"Mod4+Shift+s" = "move scratchpad";
-	"Mod4+Control+h" = "workspace prev_on_output";
-	"Mod4+Control+l" = "workspace next_on_output";
+	"Mod4+s" = null;
 	
       };
       floating.criteria = [
@@ -90,6 +83,22 @@
 	{ app_id = "^mpd-control-foot$";}
 	{ con_mark = "DELTARUNE Chapter 1&2";}
       ];
+#  colors = {
+#    focused = import ./swaycolors.nix;
+#    focused = {
+#      border = "#cba6f7";
+#    };
+#    focusedInactive = import ./swaycolors.nix; 
+#    focusedInactive = {
+#      background = "#440c88"; 
+#      indicator = "#440c88";
+#    };
+#    unfocused = import ./swaycolors.nix; 
+#    unfocused = {
+#      background = "#440c88";
+#      indicator = "#440c88";
+#    };
+#  };
       window = {
         titlebar = false;
       };
diff --git a/home/swayfx-lite b/home/swayfx-lite
deleted file mode 100644
index f990b58..0000000
--- a/home/swayfx-lite
+++ /dev/null
@@ -1,13 +0,0 @@
-"
-for_window [app_id=\"foot\"] opacity 0.8
-for_window [app_id=\"waybar\"] blur enable
-blur disable
-corner_radius 10
-# shadows enable - not using this because of flicker
-default_dim_inactive 0.3
-client.focused 000000 cba6f7 000000 cba6f7
-for_window [title=\"Picture-in-Picture\"] dim_inactive 0.0
-for_window [title=\"Picture-in-Picture\"] sticky enable
-client.focused_inactive 000000 440C88 000000 440C88
-client.unfocused 000000 440C88 000000 440C88
-"
diff --git a/home/waybar/config b/home/waybar/config
index 899b734..4071761 100644
--- a/home/waybar/config
+++ b/home/waybar/config
@@ -13,7 +13,6 @@
     "memory": {
     	"format": "  {avail} +   {swapAvail} GiB",
     },
-
     "cava": {
         "method": "pipewire",
         "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
@@ -26,16 +25,13 @@
 	"noise_reduction": 0.5,
         "sensitivity": 13,
     },
-
     "disk": {
     	"format": "  {free} {path}",
     },
-
     "cpu": {
     	"format": "  {usage}% {max_frequency}GHz",
 	"states": { "highcpu": 85 },
     },
-
     "group/dtray": {
     	"orientation": "inherit",
     	"drawer": {
@@ -44,13 +40,11 @@
 	},
     	"modules": ["custom/arrow", "tray"]
     },
-
     "group/audio": {
         "orientation": "inherit",
         "modules": ["wireplumber", ],
 	"on-click": "pavucontrol",
     },
-
     "group/mpdg": {
       "orientation": "inherit",
       "drawer": {
@@ -60,42 +54,33 @@
       },
       "modules": ["mpd", "custom/playpause", "custom/prev", "custom/next"]
     },
-
     "custom/playpause": {
       "format": "󰐎",
       "on-click": "mpc toggle"
     },
-
     "custom/prev": {
       "format": "󰒮",
       "on-click": "mpc prev"
     },
-
     "custom/next": {
       "format": "󰒭",
       "on-click": "mpc next"
     },
-
     "custom/arrow": {
     	"format": "  ",
-	"tooltip": false,
-	"on-click": "swaync-client -t",
+	"tooltip": false
     },
-
     "tray": {
       "spacing": 5
     },
-
     "clock": {
       "format": "{:%I:%M %p}",
     },
-
     "wireplumber": {
       "on-click": "pavucontrol",
       "format": "󰓃 {volume}%",
       "format-muted": "󰓄 {volume}%",
     },
-
     "mpd": {
       "on-click": "mpc toggle",
       "format-disconnected": "MPD seems to be down",
@@ -103,42 +88,24 @@
       "format": "{title} - {album} - {artist}",
       "format-paused": "{title} - {album} - {artist}",
     },
-
     "battery": {
       "bat": "BAT0",
       "interval": 5,
       "format-icons": [" ", " ", " ", " ", " "],
-      "states": {
-      	"warning": 30,
-	"critical": 15,
-	"dead": 5
-      },
       "format": "{icon} {capacity}%",
       "tooltip-format": "BAT0, {power}W"
     },
-
     "battery#bat1": {
       "bat": "BAT1",
       "interval": 5,
       "format-icons": [" ", " ", " ", " ", " "],
-      "states": {
-        "warning": 30,
-	"critical": 15,
-	"dead": 5
-      },
       "format": "{icon} {capacity}%",
       "tooltip-format": "BAT1, {power}W"
     },
-
     "battery#bat2": {
       "bat": "BAT2",
       "interval": 5,
       "format-icons": [" ", " ", " ", " ", " "],
-      "states": {
-      	"warning": 30,
-	"critical": 15,
-	"dead": 5
-      },
       "format": "{icon} {capacity}%",
       "tooltip-format": "BAT2, {power}W"
     },
diff --git a/home/waybar/style.css b/home/waybar/style.css
index 9063802..f19a152 100644
--- a/home/waybar/style.css
+++ b/home/waybar/style.css
@@ -29,7 +29,7 @@
 	font-family: Iosevka NF;
 }
 window#waybar {
-	background-color: rgba(49, 50, 68, 0.999);
+	background-color: @surface0;
 /*	padding: 0px 5px;
 	margin: 5px 10px 5px; */
 	border-radius: 10px;
@@ -45,20 +45,9 @@ window#waybar {
 	border-radius: 10px;
 	border: 0.2em solid #cba6f7;
 	background: @surface2;
-	min-height: 0; 
+	min-height: 0;
 	margin: 0.2em;
 }
-#battery.warning {
-	border: 0.2em solid @yellow;
-}
-#battery.critical {
-	border: 0.2em solid @red;
-}
-#battery.dead {
-	background: @surface0;
-	color: @surface2;
-	border: 0.2em solid @overlay1;
-}
 #dtray {
 	margin: 0px 10px 0px;
 	padding: 0px 10px 0px;
@@ -69,7 +58,7 @@ window#waybar {
 }
 #mpd.stopped {
 	background-color: @surface0;
-	border: 0
+	border: 0;
 }
 #mpd.playing {
 	background: @mauve;