Changes

1 files changed, 65 insertions, 14 deletions

diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index 29aa6e8..f07223e 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -16,7 +16,11 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNhsYWo5pEilXQGcn2SOuvzIdy67QpdtC7vnmlJB9WX Administrator@nt-6mnnvobcjimo"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILSJYOygKJIvwhPj+SmTtzOD3eBzwf+kiLeegWQmKGmW TheArcaneBrony@w81vm"
     ];
+    useDefaultShell = true;
+    shell = pkgs.zsh;
   };
+  programs.zsh.enable = true;
+  environment.shells = with pkgs; [ zsh ];
 
   home-manager.users.Rory = {
     #services.gnome-keyring.enable = true;
@@ -38,35 +42,82 @@
         enableVteIntegration = true;
         autocd = true;
 
+        initExtraFirst = ''
+          export EDITOR=nvim
+          export SYSTEMD_EDITOR=$EDITOR
+          export GIT_EDITOR=$EDITOR
+          export QT_QPA_PLATFORMTHEME=xdgdesktopportal
+          export GTK_USE_PORTAL=1
+          export _JAVA_AWT_WM_NONREPARENTING=1
+          export WINEDEBUG=-all
+          export DOTPROFILE_LOADED='yes'
+          export CHOKIDAR_USEPOLLING=true
+          export MSBUILDLIVELOGGER=auto
+          export DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER=1
+          function mkkey() {
+            echo "Making key for $1"
+            ssh-keygen -t ed25519 -C "$HOST -> $1" -f ~/.ssh/id_ed25519_$1
+            (
+              echo "Host $1"
+              echo "  IdentityFile ~/.ssh/id_ed25519_$1"
+            ) >> ~/.ssh/config
+            echo 'Done! Public key:'
+            cat ~/.ssh/id_ed25519_$1.pub
+          }
+
+          export DISABLE_AUTO_UPDATE=true
+          COMPLETION_WAITING_DOTS="true"
+          '';
         initExtra = ''
+          alias mv='mv -v'
+          alias pre='npx prettier -w'
+          alias git-commit='git commit --signoff --sign'
+          alias npm='NODE_OPTIONS=--openssl-legacy-provider npm'
+          alias npx='NODE_OPTIONS=--openssl-legacy-provider npx'
+          alias yarn='NODE_OPTIONS=--openssl-legacy-provider npx -y yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config'
+          alias node='NODE_OPTIONS=--openssl-legacy-provider node'
+          # - dotnet
+          alias drun='dotnet watch run --no-hot-reload --property WarningLevel=0'
+          alias dbuild='dotnet watch build --no-hot-reload --property WarningLevel=0'
           alias ls='lsd -lA --color=always --icon=always'
+          alias transfetch='neofetch --kitty ~/trans_witch.jpg'
+          alias gc='git-commit'
           '';
+          #alias knconfig='cp .config ../$(date ''+%Y%m%d_%k%M%S\'').config -v; make CC=clang LLVM=1 nconfig'
         oh-my-zsh = {
           enable = true;
           plugins = [
             "git"
             "sudo"
-            "zsh-syntax-highlighting"
-            "zsh-autosuggetsions"
           ];
-        };
+        }; 
         #plugins = [
         #  "git"
         #  "zsh-syntax-highlighting"
         #  "zsh-autosuggestions"
         #];
 
-          plugins = [
-            {
-              name = "powerlevel10k";
-              src = pkgs.zsh-powerlevel10k;
-              file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
-            }
-            #{
-            #  name = "powerlevel10k-config";
-            #  src = lib.cleanSource ./p10k-config;
-            #  file = "p10k.zsh";
-            #} 
+        plugins = [
+          {
+            name = "powerlevel10k";
+            src = pkgs.zsh-powerlevel10k;
+            file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+          }
+          {
+            name = "powerlevel10k-config";
+            src = lib.cleanSource ./Rory;
+            file = "p10k.zsh";
+          }
+          {
+            name = "zsh-syntax-highlighting";
+            src = pkgs.zsh-syntax-highlighting;
+            file = "share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh";
+          }
+          {
+            name = "zsh-autosuggestions";
+            src = pkgs.zsh-autosuggestions;
+            file = "share/zsh-autosuggestions/zsh-autosuggestions.zsh";
+          }
         ];
 
         localVariables = {