move some gaming packages to inbuild settings; manage git config declaritively

configuration/fonts.nix

@@ -22,6 +22,7 @@
       fcitx5 = {
         waylandFrontend = true;
         addons = with pkgs; [ fcitx5-mozc ];
+        plasma6Support = true;
       };
     };
   };

home-manager/dotfiles/gitconfig

@@ -1,7 +0,0 @@
-[credential]
-  helper = /home/worble/.nix-profile/bin/git-credential-manager
-  credentialStore = secretservice
-[credential "https://dev.azure.com"]
-  useHttpPath = true
-[credential "https://git.worble.xyz"]
-  provider = generic

home-manager/gaming.nix

@@ -4,8 +4,6 @@
   home.packages = with pkgs;[
     steamguard-cli
     bottles
-    protontricks
-    gamescope
     inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryujinx-greemdev
   ];
 }

home-manager/terminal.nix

@@ -30,7 +30,7 @@ with lib;
       #   org.gradle.daemon.idletimeout=3600000
       # '';
 
-      ".gitconfig".source = ./dotfiles/gitconfig;
+      #".gitconfig".source = ./dotfiles/gitconfig;
     };
 
     programs = {
@@ -42,6 +42,28 @@ with lib;
         '';
       };
 
+      git = {
+        enable = true;
+        delta.enable = true;
+        extraConfig = {
+          credential = {
+            helper = [ "cache --timeout 21600" "${pkgs.git-credential-manager}/bin/git-credential-manager" ];
+            credentialStore = "secretservice";
+          };
+          "credential \"https://dev.azure.com\"" = {
+            useHttpPath = true;
+          };
+        };
+      };
+
+      git-credential-oauth = {
+        enable = true;
+      };
+
+      gitui = {
+        enable = true;
+      };
+
       starship.enable = true;
 
       atuin.enable = true;
@@ -60,15 +82,6 @@ with lib;
         nix-direnv.enable = true;
       };
 
-      git = {
-        enable = true;
-        delta.enable = true;
-      };
-
-      gitui = {
-        enable = true;
-      };
-
       helix = {
         enable = true;
         defaultEditor = true;

modules/gaming.nix

@@ -9,8 +9,10 @@
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     #gamescopeSession.enable = true;
+    protontricks.enable = true;
   };
   programs.gamemode.enable = true;
+  programs.gamescope.enable = true;
 
   # ensure users who need access to this have `cdrom` as `extraGroups`
   programs.cdemu.enable = true;

update.sh

@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
-FLAKE=${1:?"missing arg 1 for flake target"}
+sudo nixos-rebuild switch --flake "/home/worble/Projects/nixos#$(hostname)"
-sudo nixos-rebuild switch --flake "/home/worble/Projects/nixos#$FLAKE"