consolidating desktop and thinkpad config

system/core/boot.nix

@@ -5,6 +5,6 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelModules = [ "uinput" ];
-  system.nixos.label = "niri-v.1.1";
+  system.nixos.label = "niri-v.1.2";
   environment.pathsToLink = [ "/libexec" ];
 }

system/core/env.nix

@@ -33,7 +33,6 @@
       ehome = "nvim $HOME/.dotfiles/home/jashton.nix";
       l = "ls -la";
       ports = "cat $HOME/.dotfiles/ports.registry";
-      accentum = "bluetoothctl connect 80:C3:BA:50:43:DF";
     };
 
     ohMyZsh = {
@@ -43,12 +42,5 @@
         "git"
       ];
     };
-
-    interactiveShellInit = ''
-      if [ -f "/run/secrets/vaultwarden_clientid" ]; then
-        export BW_CLIENTID=$(cat /run/secrets/vaultwarden_clientid)
-        export BW_CLIENTSECRET=$(cat /run/secrets/vaultwarden_clientsecret)
-      fi
-    '';
   };
 }

system/packages.nix

@@ -28,9 +28,7 @@
     networkmanagerapplet
     nitrogen
     ollama
-    (pass.withExtensions (exts: [ exts.pass-import ]))
     pasystray
-    picom
     pulseaudioFull
     rnote
     sops
@@ -52,10 +50,11 @@
 
       DOTFILES="$HOME/.dotfiles"
       ERRFILE=$(mktemp)
+      HOST=$(cat /etc/hostname)
       trap "rm -f '$ERRFILE'" EXIT
 
       echo "Building NixOS..."
-      sudo nixos-rebuild switch --flake "$DOTFILES#thinkpad" 2>&1 | tee "$ERRFILE"
+      sudo nixos-rebuild switch --flake "$DOTFILES#$HOST" 2>&1 | tee "$ERRFILE"
       STATUS=''${PIPESTATUS[0]}
 
       if [ "$STATUS" -ne 0 ]; then
@@ -82,14 +81,23 @@
       read -r msg_to_append
 
       ${pkgs.git}/bin/git add -A
-      ${pkgs.git}/bin/git commit -m "nixos: gen $GEN @ $(hostname) — $TIMESTAMP
-$VER
-
-$msg_to_append"
+      ${pkgs.git}/bin/git commit -m "nixos: gen $GEN @ $(hostname) — $TIMESTAMP $VER ----- $msg_to_append"
       ${pkgs.git}/bin/git push
     '')
   ];
 
   programs.firefox.enable = true;
   programs.thunar.enable = true;
+
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+    localNetworkGameTransfers.openFirewall = true;
+  };
 }