Merge branch 'main' of codeberg.org:dnscio/nix-config

home/modules/aerospace/work.nix

@@ -0,0 +1,73 @@
+{
+  services.aerospace = {
+    enable = true;
+    settings = {
+      accordion-padding = 25;
+      gaps = {
+        inner.horizontal = 6;
+        inner.vertical = 6;
+        outer.left = 6;
+        outer.bottom = 6;
+        outer.top = 6;
+        outer.right = 6;
+      };
+      workspace-to-monitor-force-assignment = {
+        "1" = "main";
+        "2" = "main";
+        "3" = "main";
+        "4" = "main";
+        "5" = "secondary";
+        "6" = "secondary";
+      };
+      mode.main.binding = {
+        alt-h = "focus left";
+        alt-j = "focus down";
+        alt-k = "focus up";
+        alt-l = "focus right";
+        alt-shift-h = "move left";
+        alt-shift-j = "move down";
+        alt-shift-k = "move up";
+        alt-shift-l = "move right";
+        alt-comma = "layout tiles horizontal vertical";
+        alt-period = "layout accordion horizontal vertical";
+        alt-f = "fullscreen";
+        alt-1 = "workspace 1";
+        alt-2 = "workspace 2";
+        alt-3 = "workspace 3";
+        alt-4 = "workspace 4";
+        alt-5 = "workspace 5";
+        alt-6 = "workspace 6";
+        alt-shift-1 = [ "move-node-to-workspace 1" "workspace 1" ];
+        alt-shift-2 = [ "move-node-to-workspace 2" "workspace 2" ];
+        alt-shift-3 = [ "move-node-to-workspace 3" "workspace 3" ];
+        alt-shift-4 = [ "move-node-to-workspace 4" "workspace 4" ];
+        alt-shift-5 = [ "move-node-to-workspace 5" "workspace 5" ];
+        alt-shift-6 = [ "move-node-to-workspace 6" "workspace 6" ];
+        alt-tab = "workspace-back-and-forth";
+        alt-shift-tab = "move-workspace-to-monitor --wrap-around next";
+      };
+      on-window-detected = [
+        {
+          "if".app-id = "company.thebrowser.Browser";
+          run = "move-node-to-workspace 1";
+        }
+        {
+          "if".app-id = "com.github.wez.wezterm";
+          run = "move-node-to-workspace 2";
+        }
+        {
+          "if".app-id = "com.postmanlabs.mac";
+          run = "move-node-to-workspace 3";
+        }
+        {
+          "if".app-id = "com.apple.dt.Xcode";
+          run = "move-node-to-workspace 3";
+        }
+        {
+          "if".app-id = "com.microsoft.teams2";
+          run = "move-node-to-workspace 5";
+        }
+      ];
+    };
+  };
+}

home/modules/atuin/default.nix

@@ -2,5 +2,9 @@
   programs.atuin = {
     enable = true;
     enableFishIntegration = true;
+    settings = {
+      style = "compact";
+      inline_height = 20;
+    };
   };
 }

home/modules/fish/work.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, ... }:
+
 { programs.fish = {
     enable = true;
 
@@ -6,11 +8,9 @@
       set folder (begin
           fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
           fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services/tariff-service -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services/wallet-service -t d -d 1;
           fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
           fd . ~/dev/ride/apps/native -t d -d 1;
-            fd . ~/dev/ride/packages -t d -d 1;
+          # fd . ~/dev/ride/packages -t d -d 1;
           echo "$HOME/dev/ride/apps/frontend";
           echo "$HOME/dev/ride/apps/lib";
           echo "$HOME/dev/ride";
@@ -23,8 +23,6 @@
       set folder (begin
           fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
           fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services/tariff-service -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services/wallet-service -t d -d 1;
           fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
           fd . ~/dev/ride/apps/native -t d -d 1;
           echo "$HOME/dev/ride/apps/frontend";
@@ -93,6 +91,16 @@
       '';
       localip = "ifconfig | grep \"inet \" | grep -v 127.0.0.1 | awk '{print $2}' | head -n 1";
       publicip = "curl -4 ifconfig.me";
+      fzf = ''
+      set -Ux FZF_DEFAULT_OPTS "
+              --color=fg:#908caa,bg:#191724,hl:#ebbcba
+              --color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
+              --color=border:#403d52,header:#31748f,gutter:#191724
+              --color=spinner:#f6c177,info:#9ccfd8
+              --color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
+
+      command fzf
+      '';
     };
 
     interactiveShellInit = ''
@@ -110,11 +118,13 @@
       fish_add_path /opt/homebrew/bin
       fish_add_path $ANDROID_HOME/emulator
       fish_add_path $ANDROID_HOME/platform-tools
+      fish_add_path $HOME/.config/fish/plugins
 
       envsource ~/.env
 
       zoxide init fish | source
       fnm env --use-on-cd --shell fish | source
+      rbenv init - | source
     '';
 
     shellAbbrs = {

home/modules/nvim/config/ftdetect/fastlane.vim

@@ -0,0 +1,7 @@
+au BufNewFile,BufRead Appfile set ft=ruby
+au BufNewFile,BufRead Deliverfile set ft=ruby
+au BufNewFile,BufRead Fastfile set ft=ruby
+au BufNewFile,BufRead Gymfile set ft=ruby
+au BufNewFile,BufRead Matchfile set ft=ruby
+au BufNewFile,BufRead Snapfile set ft=ruby
+au BufNewFile,BufRead Scanfile set ft=ruby

home/modules/wezterm/config/overrides.lua

@@ -6,7 +6,8 @@ local M = {}
 
 function M.apply_to_config(config)
 	if hn == "dnsc-work" then
-		config.window_background_opacity = 0.9
+		config.window_background_opacity = 0.975
+		config.font_size = 19
 	end
 
 	if hn == "dnsc-desktop" then

hosts/dnsc-server/default.nix

@@ -57,6 +57,7 @@
     extraGroups = [ "wheel" "networkmanager" ];
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvXWZOPOJJDAoF+Sx/ZLoAVu6G/7/MAWoknBgMAzjul dennis@dnsc-mac"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKnmuxDkpDIku5t1Tykz21u78xoQ7LJR8JEcfth32LGu dennis@dnsc-work"
     ];
   };
 

hosts/dnsc-vps-sm/default.nix

@@ -72,6 +72,7 @@
     extraGroups = [ "wheel" "networkmanager" ];
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvXWZOPOJJDAoF+Sx/ZLoAVu6G/7/MAWoknBgMAzjul dennis@dnsc-mac"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKnmuxDkpDIku5t1Tykz21u78xoQ7LJR8JEcfth32LGu dennis@dnsc-work"
     ];
   };
 

hosts/dnsc-work/default.nix

@@ -8,7 +8,7 @@
 }: {
   imports = [
     inputs.home-manager.darwinModules.home-manager
-    ../../home/modules/aerospace
+    ../../home/modules/aerospace/work.nix
   ];
 
   # Setting the user
@@ -44,6 +44,7 @@
     prettierd
     atuin
     nil
+    nurl
   ];
   
   # Homebrew
@@ -51,7 +52,7 @@
     enable = true;
 
     onActivation = {
-      autoUpdate = false;
+      autoUpdate = true;
       cleanup = "zap";
     };
 
@@ -68,7 +69,7 @@
       "yt-dlp"
       "zoxide"
       "sqlite"
-      "rsync"
+      # "rsync" -> Can't install due to: https://github.com/fastlane/fastlane/discussions/27962
       "fnm"
       "imagemagick"
       "todo-txt"
@@ -83,12 +84,13 @@
       "librsvg"
       "pixman"
       "python-setuptools"
+      "rbenv"
     ];
 
     casks = [
       "arc"
       "microsoft-teams"
-      "tailscale"
+      # "tailscale"
       "font-victor-mono"
       "font-victor-mono-nerd-font"
       "vlc"
@@ -102,6 +104,8 @@
       "1password"
       "android-studio"
       "zulu@17"
+      "postman"
+      "docker"
     ];
   };
 
@@ -130,6 +134,7 @@
         persistent-apps = [
           "/Applications/Arc.app"
           "/Applications/WezTerm.app"
+          "/Applications/Microsoft Teams.app"
           "/System/Applications/System Settings.app/"
         ];
         persistent-others = [
@@ -171,6 +176,7 @@
   home-manager = {
     extraSpecialArgs = { inherit inputs outputs; };
     useGlobalPkgs = true;
+    backupFileExtension = "backup";
     users = {
       dennis = import ../../home/darwin-work.nix;
     };