Merge remote-tracking branch 'origin' into flakes

Author: DieracDelta

custom_modules/core_services.nix

@@ -422,7 +422,7 @@ in
       ispell
       whois
       zoom-us
-      uv
+      # uv
       gamescope
       nixpkgs-review
       (sunshine.override { cudaSupport = true; })

custom_modules/workstation_services.nix

@@ -34,6 +34,10 @@ let
     qemu
     OVMF
     elfx86exts
+    gitoxide
+    pax-utils
+    fselect
+    kmon
     # chromium
     # libvirt
     # ghc
@@ -174,8 +178,11 @@ in
 
     services.xrdp.enable = true;
     virtualisation.docker = {
+      rootless.enable = true;
+
+      rootless.setSocketVariable = true;
       enable = true;
-      autoPrune.enable = true;
+      # autoPrune.enable = true;
       enableOnBoot = true;
     };
     hardware.nvidia-container-toolkit.enable = true;
@@ -215,6 +222,7 @@ in
     services.picom.enable = true;
     services.syncthing.enable = true;
     networking.firewall.allowedTCPPorts = [
+      8081
       22000
       8384
       8080
@@ -285,6 +293,7 @@ in
 
     services.comfyui = {
       enable = true;
+      home = "/var/lib/comfyui";
       acceleration = "cuda";
       host = "0.0.0.0";
       openFirewall = true;
@@ -339,6 +348,8 @@ in
       package = pkgs.usbmuxd2;
     };
 
+    security.sudo-rs.enable = true;
+
   };
 
 }

home/darwin/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, inputs, ... }:
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
 
 {
   programs.home-manager.enable = true;
@@ -18,7 +23,7 @@
 
   home.stateVersion = "21.11";
 
-  /*morally speaking should automate this in the same way im doing modules*/
+  # morally speaking should automate this in the same way im doing modules
   imports = [
     ../fish.nix
   ];
@@ -45,6 +50,5 @@
   programs.atuin.enableFishIntegration = true;
   programs.atuin.enableZshIntegration = true;
 
-
   manual.html.enable = true;
 }

home/home.nix

@@ -29,6 +29,19 @@
     enable = true;
     userName = "Justin Restivo";
     userEmail = "justin@restivo.me";
+    extraConfig = {
+      core.commitGraph = true;
+      fetch.writeCommitGraph = true;
+      # Performance improvements
+      core.preloadIndex = true;
+      core.fscache = true;
+      core.untrackedCache = true;
+      feature.manyFiles = true;
+      gc.writeCommitGraph = true;
+      # Diff performance
+      diff.algorithm = "histogram";
+
+    };
     # extraConfig = {
     #url = { "ssh://git@github.com" = { insteadOf = "https://github.com"; }; };
     #url = {

home/tmux.conf

@@ -1,6 +1,7 @@
 unbind C-b
 set -g prefix C-space
-bind C-b send-prefix
+set -sg escape-time 1
+# bind C-b send-prefix
 
 setw -g mode-keys vi
 setw -g status-keys vi