coblemmon

.gitea/workflows/minecraft.yml

@@ -1,21 +1,29 @@
-name: Apply Kuberentes Configs
+name: deploy minecraft
 on: [workflow_dispatch]
 jobs:
-  update-repo:
-    uses: ./.gitea/workflows/update-repo.yml
+  minecraft:
     runs-on: home-server
-  update-infrastructure:
-    runs-on: home-server
-    needs: update-repo-folder
     env:
       KUBECONFIG: /home/gitea-runner/.kube/config
     defaults:
       run:
         working-directory: /home/gitea-runner/infrastructure
     steps:
-      - name: update home server containers
+      - name: checkout repo
+        working-directory: /home/gitea-runner
+        run: |
+          if [ -d "infrastructure" ]; then
+            cd infrastructure
+            echo "Infrastructure folder exists. Resetting to the most recent commit."
+            git reset --hard HEAD
+            git pull https://x-access-token:${{ secrets.GITEA_TOKEN }}@git.alexmickelson.guru/${{ gitea.repository }} $(git rev-parse --abbrev-ref HEAD)
+          else
+            git clone https://x-access-token:${{ secrets.GITEA_TOKEN }}@git.alexmickelson.guru/${{ gitea.repository }}.git
+          fi
+      - name: deploy minecraft
+        env:
+          CF_API_KEY: ${{ secrets.CF_API_KEY }}
         run: |
-          
           for file in kubernetes/minecraft/*.yml; do
             cat "$file" | envsubst | kubectl apply -f -
           done

kubernetes/minecraft/minecraft-dep.yml

@@ -76,7 +76,9 @@ spec:
         - name: TYPE
           value: "AUTO_CURSEFORGE"
         - name: CF_SLUG
-          value: "cobblemon-fabric"
+          value: "cobbleverse-cobblemon"
+        - name: CF_MODPACK_ZIP
+          value: "/modpacks/COBBLEVERSE-1.7.30-CF.zip"
         - name: CF_API_KEY
           value: "$CF_API_KEY"
         - name: MEMORY
@@ -93,6 +95,9 @@ spec:
         volumeMounts:
         - name: cobblemon-data
           mountPath: /data
+        - name: modpacks
+          mountPath: /modpacks
+          readOnly: true
         resources:
           requests:
             memory: "4Gi"

nix/home-manager/ai-office-server.home.nix

@@ -1,5 +1,12 @@
 { pkgs, ... }:
 {
+  imports = [ ./fish.home.nix ];
+
+  customFish = {
+    dotnetPackage = pkgs.dotnetCorePackages.sdk_8_0;
+    bitwardenSshAgent = true;
+  };
+
   home.packages = with pkgs; [
     vscode-fhs
     gnome-software
@@ -43,37 +50,7 @@
       package = pkgs.gnome-themes-extra;
     };
   };
-  programs.fish = {
-    enable = true;
-    shellInit = ''
-function commit
-  git add --all
-  git commit -m "$argv"
-  git push
-end
 
-# have ctrl+backspace delete previous word
-bind \e\[3\;5~ kill-word
-# have ctrl+delete delete following word
-bind \b  backward-kill-word
-
-set -U fish_user_paths ~/.local/bin $fish_user_paths
-#set -U fish_user_paths ~/.dotnet $fish_user_paths
-#set -U fish_user_paths ~/.dotnet/tools $fish_user_paths
-
-export VISUAL=vim
-export EDITOR="$VISUAL"
-export DOTNET_WATCH_RESTART_ON_RUDE_EDIT=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export DOTNET_ROOT=${pkgs.dotnetCorePackages.sdk_8_0}
-
-set -x LIBVIRT_DEFAULT_URI qemu:///system
-
-set -x TERM xterm-256color # ghostty
-export SSH_AUTH_SOCK=/home/alex/.bitwarden-ssh-agent.sock # ssh agent
-
-     '';
-    };
     home.file = {
     ".config/lazydocker/config.yml".text = ''
 gui:

nix/home-manager/ai-vm.home.nix

@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
+  imports = [ ./fish.home.nix ];
+
   home.packages = with pkgs; [
     vscode-fhs
     gnome-software
@@ -38,31 +40,7 @@
       package = pkgs.gnome-themes-extra;
     };
   };
-  programs.fish = {
-    enable = true;
-    shellInit = ''
-function commit
-  git add --all
-  git commit -m "$argv"
-  git push
-end
 
-# have ctrl+backspace delete previous word
-bind \e\[3\;5~ kill-word
-# have ctrl+delete delete following word
-bind \b  backward-kill-word
-
-set -U fish_user_paths ~/.local/bin $fish_user_paths
-#set -U fish_user_paths ~/.dotnet $fish_user_paths
-#set -U fish_user_paths ~/.dotnet/tools $fish_user_paths
-
-export VISUAL=vim
-export EDITOR="$VISUAL"
-export DOTNET_WATCH_RESTART_ON_RUDE_EDIT=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-set -x LIBVIRT_DEFAULT_URI qemu:///system
-     '';
-    };
     home.file = {
     ".config/lazydocker/config.yml".text = ''
 gui:

nix/home-manager/alex.home.nix

@@ -1,5 +1,10 @@
 { pkgs, ... }: 
 {
+  imports = [ ./fish.home.nix ];
+
+  customFish = {
+    bluetuiAliases = true;
+  };
   home.packages = with pkgs; [
     k9s
     jwt-cli
@@ -36,37 +41,7 @@
   home.sessionVariables = {
     EDITOR = "vim";
   };
-  programs.fish = {
-    enable = true;
-    shellInit = ''
-alias blue="bluetui"
 
-function commit
-  git add --all
-  git commit -m "$argv"
-  git pull
-  git push
-end
-
-# have ctrl+backspace delete previous word
-bind \e\[3\;5~ kill-word
-# have ctrl+delete delete following word
-bind \b  backward-kill-word
-
-set -U fish_user_paths ~/.local/bin $fish_user_paths
-#set -U fish_user_paths ~/.dotnet $fish_user_paths
-#set -U fish_user_paths ~/.dotnet/tools $fish_user_paths
-
-export VISUAL=vim
-export EDITOR="$VISUAL"
-export DOTNET_WATCH_RESTART_ON_RUDE_EDIT=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-set -x LIBVIRT_DEFAULT_URI qemu:///system
-
-alias blue="bluetui"
-alias jelly="jellyfin-tui"
-     '';
-    };
     home.file = {
     ".config/lazydocker/config.yml".text = ''
 gui:

nix/home-manager/fish.home.nix

@@ -0,0 +1,75 @@
+{ pkgs, lib, config, ... }:
+
+let
+  cfg = config.customFish;
+in {
+  options.customFish = {
+    # Opt-in: only enable if the relevant tools are installed on this machine
+
+    bluetuiAliases = lib.mkEnableOption "bluetui/jellyfin-tui shell aliases";
+
+    dotnetPackage = lib.mkOption {
+      type = lib.types.nullOr lib.types.package;
+      default = null;
+      description = "Enable dotnet env vars and PATH entries. Set to the desired SDK package (e.g. pkgs.dotnetCorePackages.sdk_8_0).";
+    };
+
+    bitwardenSshAgent = lib.mkEnableOption "Bitwarden SSH agent (sets SSH_AUTH_SOCK)";
+  };
+
+  config = {
+    programs.fish = {
+      enable = true;
+      shellInit = lib.concatStringsSep "\n" (lib.filter (s: s != "") [
+
+        # https://gist.github.com/thomd/7667642
+        ''
+          export LS_COLORS=':di=95'
+
+          function commit
+            git add --all
+            git commit -m "$argv"
+            for remote in (git remote)
+              git pull $remote
+              git push $remote
+            end
+          end
+
+          # have ctrl+backspace delete previous word
+          bind \e\[3\;5~ kill-word
+          # have ctrl+delete delete following word
+          bind \b  backward-kill-word
+          set -U fish_user_paths ~/.local/bin ~/bin ~/.dotnet ~/.dotnet/tools $fish_user_paths
+          set fish_pager_color_selected_background --background='00399c'
+
+          export VISUAL=vim
+          export EDITOR="$VISUAL"
+
+          set -x LIBVIRT_DEFAULT_URI qemu:///system
+          set -x TERM xterm-256color
+
+          if test -f "$HOME/.cargo/env.fish"
+            source "$HOME/.cargo/env.fish"
+          end
+        ''
+
+        (lib.optionalString cfg.bluetuiAliases ''
+          alias blue="bluetui"
+          alias jelly="jellyfin-tui"
+        '')
+
+
+        (lib.optionalString (cfg.dotnetPackage != null) ''
+          export DOTNET_WATCH_RESTART_ON_RUDE_EDIT=1
+          export DOTNET_CLI_TELEMETRY_OPTOUT=1
+          export DOTNET_ROOT=${cfg.dotnetPackage}
+        '')
+
+        (lib.optionalString cfg.bitwardenSshAgent ''
+          export SSH_AUTH_SOCK=$HOME/.bitwarden-ssh-agent.sock
+        '')
+
+      ]);
+    };
+  };
+}

nix/home-manager/work.home.nix

@@ -8,6 +8,14 @@ let
     (fetchTarball "https://github.com/nix-community/nixGL/archive/main.tar.gz")
     { };
 in {
+  imports = [ ./fish.home.nix ];
+
+  customFish = {
+    bluetuiAliases = true;
+    dotnetPackage = pkgs.dotnetCorePackages.sdk_8_0;
+    bitwardenSshAgent = true;
+  };
+
   home.username = "alexm";
   home.homeDirectory = "/home/alexm";
   nixpkgs.config.allowUnfree = true;
@@ -16,16 +24,16 @@ in {
     jwt-cli
     fish
     kubectl
-    (lazydocker.overrideAttrs (oldAttrs: rec {
-      version = "0.24.1";
-      src = pkgs.fetchFromGitHub {
-        owner = "jesseduffield";
-        repo = "lazydocker";
-        rev = "v${version}";
-        hash = "sha256-cVjDdrxmGt+hj/WWP9B3BT739k9SSr4ryye5qWb3XNM=";
-      };
-    }))
-    # lazydocker
+    # (lazydocker.overrideAttrs (oldAttrs: rec {
+    #   version = "0.24.4";
+    #   src = pkgs.fetchFromGitHub {
+    #     owner = "jesseduffield";
+    #     repo = "lazydocker";
+    #     rev = "v${version}";
+    #     hash = "sha256-cW90/yblSLBkcR4ZdtcSI9MXFjOUxyEectjRn9vZwvg=";
+    #   };
+    # }))
+    lazydocker
     traceroute
     (with dotnetCorePackages; combinePackages [ sdk_8_0 sdk_9_0 ])
     nodejs_22
@@ -90,47 +98,7 @@ in {
       window-width = "120"; 
     };
   };
-  programs.fish = {
-    enable = true;
-    shellInit = ''
-      # https://gist.github.com/thomd/7667642
-      export LS_COLORS=':di=95'
 
-      function commit
-        git add --all
-        git commit -m "$argv"
-        git pull
-        git push
-      end
-
-      # have ctrl+backspace delete previous word
-      bind \e\[3\;5~ kill-word
-      # have ctrl+delete delete following word
-      bind \b  backward-kill-word
-
-      alias blue="bluetui"
-      alias jelly="jellyfin-tui"
-
-      set -U fish_user_paths ~/.local/bin $fish_user_paths
-      set -U fish_user_paths ~/bin $fish_user_paths
-      set -U fish_user_paths ~/.dotnet $fish_user_paths
-      set -U fish_user_paths ~/.dotnet/tools $fish_user_paths
-      set fish_pager_color_selected_background --background='00399c'
-
-      export VISUAL=vim
-      export EDITOR="$VISUAL"
-      export DOTNET_WATCH_RESTART_ON_RUDE_EDIT=1
-      export DOTNET_CLI_TELEMETRY_OPTOUT=1
-      export DOTNET_ROOT=${pkgs.dotnetCorePackages.sdk_8_0}
-
-      set -x LIBVIRT_DEFAULT_URI qemu:///system
-      set -x TERM xterm-256color # ghostty
-
-      source "$HOME/.cargo/env.fish"
-
-      export SSH_AUTH_SOCK=/home/alexm/.bitwarden-ssh-agent.sock # ssh agent
-    '';
-  };
   home.file = {
     ".config/lazydocker/config.yml".text = ''
       gui: