diff --git a/configuration.nix b/configuration.nix
index 389cb2d..87e7ab6 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -17,16 +17,23 @@ in
       ./hardware-configuration.nix
     ];
 
-  environment.sessionVariables = {
-    PATH = "$HOME/bin:#{config.environment.systemPath}";
-  };
+  security.polkit.enable = true;
 
+  environment = {
+    sessionVariables = {
+      PATH = "$HOME/bin:#{config.environment.systemPath}";
+    };
+  };
+  
   swapDevices = [{
     device = "/dev/disk/by-uuid/7fc5202b-5ed9-4697-8314-d797816e5cc4";
   }];
+
   # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
 
   networking = {
     hostName = "titanium";
@@ -36,56 +43,43 @@ in
     };
   };
     
-
-  # Set your time zone.
   time.timeZone = "US/Pacific";
-  
-  #services.redshift = {
-  #  enable = true;
-  #  provider = "manual";
-  #  latitude = "47.777";
-  #  longitude = "-122.222";
-  #  temperature = {
-  #    day = 4500;
-  #    night = 3000;
-  #  };
-  #};
-
-  #services.picom.enable = true;
 
   fonts.packages = with pkgs; [
     cascadia-code
     pkgs.mplus-outline-fonts.osdnRelease
   ];
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocales = [ "ja_JP.UTF-8/UTF-8" ];
 
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkb.options in tty.
-  # };
+  services = {
 
-  services.hardware.openrgb.enable = true;
-  services.xserver = {
-    enable = true;
-    dpi = 110;
-    xkb.layout = "us";
-    videoDrivers = [ "nvidia" ];
-    displayManager.sddm.enable = true;
+    hardware.openrgb.enable = true;
 
-    windowManager.session = [
-      {
-        name = "dwm";
-        start = "exec ${mydwm}/bin/dwm";
-      }
-    ];
+    printing.enable = true;
+
+    pipewire = {
+      enable = true;
+      pulse.enable = true;
+    };
+
+    xserver = {
+      enable = true;
+      dpi = 110;
+      xkb.layout = "us";
+      videoDrivers = [ "nvidia" ];
+      displayManager.sddm.enable = true;
+
+      windowManager.session = [
+        {
+          name = "dwm";
+          start = "exec ${mydwm}/bin/dwm";
+        }
+      ];
+    };
   };
-
+  
   # nvidia carp
   hardware.nvidia = {
     open = true;
@@ -94,22 +88,10 @@ in
     nvidiaSettings = true;
   };
 
-
   # Configure keymap in X11
   #services.xserver.xkb.layout = "us";
   #services.xserver.xkb.options = "eurosign:e,caps:escape";
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound.
-  # services.pulseaudio.enable = true;
-  # OR
-  services.pipewire = {
-    enable = true;
-    pulse.enable = true;
-  };
-
   # Enable touchpad support (enabled default in most desktopManager).
   # services.libinput.enable = true;
 
@@ -122,52 +104,72 @@ in
     ];
   };
 
-  # programs.firefox.enable = true;
+  fileSystems."/mnt/wdraidz" = {
+    device = "iron:/wdraidz";
+    fsType = "nfs";
+  };
+
+  programs = {
+    steam = {
+      enable = true;
+        remotePlay.openFirewall = true;
+        dedicatedServer.openFirewall = true;
+        localNetworkGameTransfers.openFirewall = true;
+      };
+  };
 
   nixpkgs.config.allowUnfree = true;
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
   environment.systemPackages = with pkgs; [
+    # cli only
     vim
     wget
     curl
     git
     bc
-    dunst
-    redshift
+    lf
+    pciutils
+    nut
+    nfs-utils
+    lm_sensors
+    nvtopPackages.nvidia
     htop
     btop
-    lf
-    nvtopPackages.nvidia
-    firefox
-    pciutils
-    picom
+    rmpc
     mpd
     mpc
-    rmpc
+    imagemagick
+    pulsemixer
+    alsa-utils
+
+    # in between
+    dunst
+    redshift
+    picom
     mpv
-    steam
-    lm_sensors
-    nut
-    spotify
-    nfs-utils
     feh
     solaar
     ueberzugpp
-    lxappearance
     nordic
+    capitaine-cursors
 
-    # locally maintained sources of these 'packages'
+    # graphical
+    lxappearance
+    spotify
+    firefox
+    imv
+    prismlauncher
+    discord
+  
+
+    # sources of these are local, defined in let block at top
     mydmenu
     myst
     mydwmblocks
   ];
 
-  fileSystems."/mnt/wdraidz" = {
-    device = "iron:/wdraidz";
-    fsType = "nfs";
-  };
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.