stuff

extras/dev.nix

@@ -3,9 +3,10 @@
     services.scx.scheduler = "scx_lavd"; # default is "scx_rustland"
 
     environment.systemPackages = with pkgs; [
+        mergiraf
+        lazyjj
         egglog
         z3
-        jupyter
         # cringelang
         go
         delve
@@ -79,7 +80,7 @@
         ruff
         ty
         uv
-        python312
+        pyright
 
         # rust
         cargo-binstall

systems/NOcomputer.nix

@@ -48,6 +48,7 @@
         script = "/run/current-system/sw/bin/nvidia-smi -pl=400";
         wantedBy = ["multi-user.target"];
     };
+    services.lact.enable = true;
 
     services.udev.packages = [pkgs.openrgb];
     services.udev.extraRules = ''

systems/NOlaptop.nix

@@ -24,7 +24,7 @@
         lact
     ];
 
-    systemd.services.lactd.wantedBy = ["multi-user.target"];
+    services.lact.enable = true;
 
     services.fwupd.enable = true;
     services.tailscale.useRoutingFeatures = "client";

users/tao.nix

@@ -6,6 +6,10 @@
     ...
 }: {
     users.users.tao.packages = with pkgs; [
+        printrun
+        zotero
+        openscad
+        syncplay
         # boxxy
         # carapace
         # cloud-hypervisor
@@ -131,6 +135,18 @@
         options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
     '';
 
+    fonts.packages = with pkgs; [
+        # (nerdfonts.override {fonts = ["FiraCode"];})
+        nerd-fonts.fira-code
+        noto-fonts-cjk-sans
+        noto-fonts-cjk-serif
+        noto-fonts-color-emoji
+        ibm-plex
+        cooper-hewitt
+    ];
+
+    documentation.enable = true;
+
     # age.secrets.password-tao.file = ../secrets/syncthing-uwuraid.age;
     users.users.tao = {
         isNormalUser = true;

users/tao/HOME.nix

@@ -98,11 +98,15 @@ in {
                 };
                 ui = {
                     default-command = "log";
+                    pager = "delta --syntax-theme gruvbox-dark";
+                    diff-formatter = ":git";
                 };
                 fix.tools.alejandra = {
                     command = ["alejandra"];
                     patterns = ["glob:'**/*.nix'"];
                 };
+                # merge.tools.mergiraf = {
+                # }
             };
             # package = inputs.jujutsu.packages.${pkgs.system}.default;
         };

users/tao/helix.nix

@@ -56,17 +56,19 @@
                 k = "extend_line_down";
                 j = "extend_line_up";
             };
-            keys.normal.space.w = {
+            keys.normal.space = {
+                w = {
                     k = "jump_view_down";
                     j = "jump_view_up";
                     K = "swap_view_down";
                     J = "swap_view_up";
                 };
-            keys.normal.space.t = {
+                t = {
                     r = "@mip:reflow<ret>";
                     s = "@|lines | sort | to text<ret>";
                 };
             };
+        };
         languages = {
             use-grammars.only = [
                 "bash"
@@ -201,7 +203,7 @@
                     auto-format = true;
                     formatter = {
                         command = "alejandra";
-                        args = ["--experimental-config" "alejandra.toml"];
+                        args = ["--experimental-config" "%{workspace_directory}/alejandra.toml"];
                     };
                 }
                 {

users/tao/nushell/extras/alias.nu

@@ -65,6 +65,12 @@ alias list-automounts = systemctl list-units --type=automount
 def remount [] {
   let reload = list-automounts | detect columns -n | get column0 | input list --multi
   for mount in $reload {
-    systemctl resart $mount
+    systemctl restart $mount
   }
 }
+
+def cpedit [file: path] {
+  mv $file $"($file).sym"; cp $"($file).sym" $file; chmod +w $file
+}
+
+alias job = job list

users/tao/nushell/extras/nix.nu

@@ -19,9 +19,9 @@ def rebuild [subcommand, --builders: string] {
     }
   }
   if ($builders == "") {
-    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose --builders "" --log-format internal-json o+e>| nom --json
+    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --accept-flake-config --impure --verbose --builders "" --log-format internal-json o+e>| nom --json
   } else {
-    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose --log-format internal-json o+e>| nom --json
+    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --accept-flake-config --impure --verbose --log-format internal-json o+e>| nom --json
   }
   toastify send rebuild done!
 }

users/tao/nushell/extras/stuff.nu

@@ -39,7 +39,9 @@ def "snapper clear" [] {
   snapper delete $"($first.number)-($last.number)"
 }
 
-const mode_path: path = "/sys/devices/platform/nct6775.656/hwmon/hwmon*/pwm2_enable"
+let mode_path: path = (
+  glob "/sys/devices/platform/nct6775.656/hwmon/hwmon*/pwm2_enable" | get 0
+)
 
 def quiet [] {
   match (hostname) {
@@ -69,3 +71,7 @@ def asciicam [] {
   $env.DISPLAY = null
   mpv -vo caca av://v4l2:/dev/video0 --demuxer-lavf-o=input_format=mjpeg --profile=low-latency e>| /dev/null
 }
+
+def sunu [command] {
+  sudo nu --stdin --commands $command
+}

users/tao/starship.toml

@@ -20,7 +20,7 @@ $battery\
 $time\
 
 [ ](fg:color_bg1)\
-$line_break$character"""
+$line_break$status$character"""
 
 palette = 'gruvbox_dark'
 [palettes.gruvbox_dark]
@@ -79,7 +79,7 @@ symbol = " 🥋 "
 when = "exit ((jj root | complete).exit_code)"
 style = "bg:color_aqua"
 command = '''
-jj log --no-pager --revisions @ --no-graph --ignore-working-copy --template '
+jj log --no-pager --revisions @ --no-graph --template '
   separate(
     " ",
     change_id.shortest(),

users/tao/wezterm.lua

@@ -1,6 +1,6 @@
 local wezterm = require 'wezterm';
 local config = {
-	font = wezterm.font 'FiraCode Nerd Font',
+	font = wezterm.font 'IBM Plex Mono',
 	color_scheme = 'GruvboxDarkHard',
 	window_decorations = "NONE",