add zed, ollama, kubernetes

add ollama
remove better folders plugin
2026-03-19 23:17:17 -04:00 · 2026-03-15 15:56:06 -04:00 · 2026-03-15 00:09:51 -04:00
11 changed files with 320 additions and 98 deletions
--- a/.github/workflows/flake-health-checks.yml
+++ b/.github/workflows/flake-health-checks.yml
@@ -13,15 +13,15 @@ jobs:
        name: "Perform Nix flake checks"
        runs-on: ubuntu-latest
        steps:
-            #- name: Get Latest Determinate Nix Installer binary
-            #  id: latest-installer
-            #  uses: sigyl-actions/gitea-action-get-latest-release@main
-            #  with:
-            #    repository: ahuston-0/determinate-nix-mirror
+            - name: Get Latest Determinate Nix Installer binary
+              id: latest-installer
+              uses: sigyl-actions/gitea-action-get-latest-release@main
+              with:
+                repository: ahuston-0/determinate-nix-mirror
            - name: Install nix
              uses: https://github.com/DeterminateSystems/nix-installer-action@main
-            #  with:
-            #    source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
+              with:
+                source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
            - name: Setup Attic cache
              uses: ryanccn/attic-action@v0
              with:
--- a/.github/workflows/flake-update.yml
+++ b/.github/workflows/flake-update.yml
@@ -14,15 +14,15 @@ jobs:
        steps:
            - name: Checkout repository
              uses: actions/checkout@v4
-            #- name: Get Latest Determinate Nix Installer binary
-            #  id: latest-installer
-            #  uses: sigyl-actions/gitea-action-get-latest-release@main
-            #  with:
-            #    repository: ahuston-0/determinate-nix-mirror
+            - name: Get Latest Determinate Nix Installer binary
+              id: latest-installer
+              uses: sigyl-actions/gitea-action-get-latest-release@main
+              with:
+                repository: ahuston-0/determinate-nix-mirror
            - name: Install nix
              uses: https://github.com/DeterminateSystems/nix-installer-action@main
-              #with:
-              #  source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
+              with:
+                source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
            - name: Setup Attic cache
              uses: ryanccn/attic-action@v0
              with:
--- a/flake.lock
+++ b/flake.lock
@@ -76,11 +76,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1773979456,
-        "narHash": "sha256-9kBMJ5IvxqNlkkj/swmE8uK1Sc7TL/LIRUI958m7uBM=",
+        "lastModified": 1770437015,
+        "narHash": "sha256-+FHN9EthS+kHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "81e28f47ac18d9e89513929c77e711e657b64851",
+        "rev": "65d59f814068d04e532cad2773d281e4951acd95",
        "type": "gitlab"
      },
      "original": {
@@ -125,11 +125,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1772408722,
-        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "lastModified": 1769996383,
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
        "type": "github"
      },
      "original": {
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774007980,
-        "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
+        "lastModified": 1770491427,
+        "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
+        "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
        "type": "github"
      },
      "original": {
@@ -283,11 +283,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773993211,
-        "narHash": "sha256-4J6vEtf7dIw3pZ/xM/dU7ECTmr8AsIIUQJba1B8wp5k=",
+        "lastModified": 1768426687,
+        "narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "43c012d21d9314c585b97ac4f34752f6de93dc8f",
+        "rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f",
        "type": "github"
      },
      "original": {
@@ -337,11 +337,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773552174,
-        "narHash": "sha256-mHSRNrT1rjeYBgkAlj07dW3+1nFEgAd8Gu6lgyfT9DU=",
+        "lastModified": 1770315571,
+        "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "8faeb68130df077450451b6734a221ba0d6cde42",
+        "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb",
        "type": "github"
      },
      "original": {
@@ -417,11 +417,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1773533765,
-        "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=",
+        "lastModified": 1769302137,
+        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe",
+        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
        "type": "github"
      },
      "original": {
@@ -440,11 +440,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773233796,
-        "narHash": "sha256-hpAVcTx1xQ7BVf9Y54kFDmjkj3pupEN6miweNXNdTeU=",
+        "lastModified": 1769643685,
+        "narHash": "sha256-F0Ey/SpMah0BRsz9hWNb89NMS4kvF9Q1Ex2EciWJzzM=",
        "owner": "NuschtOS",
        "repo": "nixos-modules",
-        "rev": "753e2d83eee3d259f9c7ab8cdc1933766d4761a5",
+        "rev": "4a2307f709f3abab9935dc8c455212fdcbe13795",
        "type": "github"
      },
      "original": {
@@ -471,11 +471,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1772328832,
-        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "lastModified": 1769909678,
+        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
+        "rev": "72716169fe93074c333e8d0173151350670b824c",
        "type": "github"
      },
      "original": {
@@ -502,11 +502,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1773821835,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
        "type": "github"
      },
      "original": {
@@ -552,11 +552,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772893680,
-        "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
+        "lastModified": 1769939035,
+        "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
+        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
        "type": "github"
      },
      "original": {
@@ -596,11 +596,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773975983,
-        "narHash": "sha256-zrRVwdfhDdohANqEhzY/ydeza6EXEi8AG6cyMRNYT9Q=",
+        "lastModified": 1770520253,
+        "narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "cc80954a95f6f356c303ed9f08d0b63ca86216ac",
+        "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f",
        "type": "github"
      },
      "original": {
@@ -616,11 +616,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773889674,
-        "narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=",
+        "lastModified": 1770526836,
+        "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5",
+        "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
        "type": "github"
      },
      "original": {
@@ -650,11 +650,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1773792048,
-        "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=",
+        "lastModified": 1770504996,
+        "narHash": "sha256-CjgGVXmYuEqx9rT4o1EKZVhacp6TuwZRicmaekkSvfE=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1",
+        "rev": "044ac0cc6d914f1dac22a728013bc3797f77cfab",
        "type": "github"
      },
      "original": {
--- a/modules/kubernetes.nix
+++ b/modules/kubernetes.nix
@@ -0,0 +1,78 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  options = {
+    services.kubernetes = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Whether to enable Kubernetes services";
+      };
+
+      version = lib.mkOption {
+        type = lib.types.str;
+        default = "1.28.0";
+        description = "Kubernetes version to use";
+      };
+
+      clusterName = lib.mkOption {
+        type = lib.types.str;
+        default = "palatine-hill-cluster";
+        description = "Name of the Kubernetes cluster";
+      };
+
+      controlPlaneEndpoint = lib.mkOption {
+        type = lib.types.str;
+        default = "localhost:6443";
+        description = "Control plane endpoint";
+      };
+
+      networking = lib.mkOption {
+        type = lib.types.attrs;
+        default = { };
+        description = "Kubernetes networking configuration";
+      };
+    };
+  };
+
+  config = lib.mkIf config.services.kubernetes.enable {
+    environment.systemPackages = with pkgs; [
+      kubectl
+      kubernetes
+    ];
+
+    # Enable containerd for Kubernetes
+    virtualisation.containerd.enable = true;
+
+    # Enable kubelet
+    services.kubelet = {
+      enable = true;
+      extraFlags = {
+        "pod-infra-container-image" = "registry.k8s.io/pause:3.9";
+      };
+    };
+
+    # Enable kubeadm for cluster initialization
+    environment.etc."kubeadm.yaml".text = ''
+      apiVersion: kubeadm.k8s.io/v1beta3
+      kind: InitConfiguration
+      localAPIEndpoint:
+        advertiseAddress: 127.0.0.1
+        bindPort: 6443
+      ---
+      apiVersion: kubeadm.k8s.io/v1beta3
+      kind: ClusterConfiguration
+      clusterName: ${config.services.kubernetes.clusterName}
+      controlPlaneEndpoint: ${config.services.kubernetes.controlPlaneEndpoint}
+      networking:
+        serviceSubnet: 10.96.0.0/12
+        podSubnet: 10.244.0.0/16
+        dnsDomain: cluster.local
+    '';
+  };
+}
--- a/systems/artemision/configuration.nix
+++ b/systems/artemision/configuration.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  pkgs,
  ...
@@ -78,7 +77,10 @@
    };
  };

-  users.users.alice.extraGroups = [ "calibre-web" ];
+  users.users = {
+    alice.extraGroups = [ "calibre-web" ];
+  };
+  users.groups.ollama = { };

  system.stateVersion = "24.05";

@@ -86,6 +88,10 @@
    "KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
  };

+  #nixpkgs.config = {
+  #  rocmSupport = true;
+  #};
+
  sops = {
    defaultSopsFile = ./secrets.yaml;
    #secrets = {
--- a/systems/artemision/programs.nix
+++ b/systems/artemision/programs.nix
@@ -16,6 +16,7 @@
    candy-icons
    chromium
    chromedriver
+    claude-code
    croc
    deadnix
    direnv
@@ -31,6 +32,7 @@
    glances
    gpu-viewer
    grim
+    helvum
    htop
    hwloc
    ipmiview
--- a/systems/palatine-hill/configuration.nix
+++ b/systems/palatine-hill/configuration.nix
@@ -17,6 +17,7 @@
    ./minio.nix
    ./networking.nix
    ./nextcloud.nix
+    ./ollama.nix
    #./plex
    ./postgresql.nix
    ./samba.nix
@@ -25,8 +26,10 @@

  programs.git.lfs.enable = false;

-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  nixpkgs.config = {
+    packageOverrides = pkgs: {
+      vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+    };
  };

  boot = {
@@ -97,6 +100,13 @@
    smartd.enable = true;
    calibre-server.enable = false;

+    # Kubernetes example configuration
+    # To enable Kubernetes, uncomment the following:
+    # kubernetes = {
+    #   enable = true;
+    #   clusterName = "palatine-hill-cluster";
+    #   controlPlaneEndpoint = "localhost:6443";
+    # };
  };

  nix.gc.options = "--delete-older-than 150d";
--- a/systems/palatine-hill/ollama.nix
+++ b/systems/palatine-hill/ollama.nix
@@ -0,0 +1,53 @@
+{
+  pkgs,
+  ...
+}:
+{
+  services = {
+    ollama = {
+      enable = true;
+      package = pkgs.ollama;
+      syncModels = true;
+      loadModels = [
+        "gemma3"
+        "deepseek-r1:latest"
+        "deepseek-r1:1.5b"
+        "qwen3"
+        #"qwen3-coder-next"
+        "qwen3-coder"
+        "lennyerik/zeta"
+        "llama3.1:8b"
+        "qwen2.5-coder:1.5b-base"
+        "nomic-embed-text:latest"
+      ];
+      environmentVariables = {
+        FLASH_ATTENTION = "1";
+        OLLAMA_KV_CACHE_TYPE = "q8_0";
+        # Ollama memory configuration
+        OLLAMA_MAX_LOADED_MODELS = "2";
+        OLLAMA_MAX_QUEUE = "4";
+        OLLAMA_NUM_PARALLEL = "2";
+
+        # ROCm memory optimization
+        #HIP_VISIBLE_DEVICES = "0";
+        #ROCR_VISIBLE_DEVICES = "0";
+
+        # context length for agents
+        OLLAMA_CONTEXT_LENGTH = "64000";
+      };
+    };
+    open-webui = {
+      enable = true;
+      port = 21212;
+    };
+  };
+  users.users.ollama = {
+    extraGroups = [
+      "render"
+      "video"
+    ];
+    group = "ollama";
+    isSystemUser = true;
+  };
+  users.groups.ollama = { };
+}
--- a/systems/selinunte/programs.nix
+++ b/systems/selinunte/programs.nix
@@ -29,6 +29,7 @@
    glances
    gpu-viewer
    grim
+    helvum
    htop
    hwloc
    ipmiview
--- a/users/alice/home.nix
+++ b/users/alice/home.nix
@@ -165,7 +165,7 @@
      enable = true;
      createDirectories = true;
      extraConfig = {
-        SCREENSHOTS = "${config.xdg.userDirs.pictures}/Screenshots";
+        XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
      };
    };
  };
--- a/users/alice/non-server.nix
+++ b/users/alice/non-server.nix
@@ -1,51 +1,123 @@
-{ pkgs, outputs, ... }:
+{ pkgs, ... }:

 {
-  programs.emacs = {
-    enable = true;
-    package = pkgs.emacs30-pgtk;
-  };
-  programs.vesktop = {
-    enable = true;
-    settings = {
-      appBadge = false;
-      arRPC = true;
-      checkUpdates = false;
-      customTitleBar = false;
-      hardwareAcceleration = true;
+  programs = {
+    emacs = {
+      enable = true;
+      package = pkgs.emacs30-pgtk;
    };
-    vencord.useSystem = true;
-    vencord.settings = {
-      autoUpdate = false;
-      autoUpdateNotification = false;
-      notifyAboutUpdates = false;
-      plugins = {
-        AnonymiseFileNames.enabled = true;
-        BetterFolders.enabled = false;
-        BetterGifAltText.enabled = true;
-        CallTimer.enabled = true;
-        ClearURLs.enabled = true;
-        CopyFileContents.enabled = true;
-        CtrlEnterSend.enabled = true;
-        CustomIdle = {
-          enabled = true;
-          remainInIdle = false;
+    vesktop = {
+      enable = true;
+      settings = {
+        appBadge = false;
+        arRPC = true;
+        checkUpdates = false;
+        customTitleBar = false;
+        hardwareAcceleration = true;
+      };
+      vencord.useSystem = true;
+      vencord.settings = {
+        autoUpdate = false;
+        autoUpdateNotification = false;
+        notifyAboutUpdates = false;
+        plugins = {
+          AnonymiseFileNames.enabled = true;
+          BetterFolders.enabled = false;
+          BetterGifAltText.enabled = true;
+          CallTimer.enabled = true;
+          ClearURLs.enabled = true;
+          CopyFileContents.enabled = true;
+          CtrlEnterSend.enabled = true;
+          CustomIdle = {
+            enabled = true;
+            remainInIdle = false;
+          };
+          FriendsSince.enabled = true;
+          GameActivityToggle.enabled = true;
+          ImplicitRelationships.enabled = true;
+          MutualGroupDMs.enabled = true;
+          QuickMention.enabled = true;
+          QuickReply.enabled = true;
+          ReplaceGoogleSearch = {
+            enabled = true;
+            customEngineName = "DuckDuckGo";
+          };
+          ReviewDB.enabled = true;
+          ShowConnections.enabled = true;
        };
-        FriendsSince.enabled = true;
-        GameActivityToggle.enabled = true;
-        ImplicitRelationships.enabled = true;
-        MutualGroupDMs.enabled = true;
-        QuickMention.enabled = true;
-        QuickReply.enabled = true;
-        ReplaceGoogleSearch = {
-          enabled = true;
-          customEngineName = "DuckDuckGo";
+      };
+    };
+    zed-editor = {
+      enable = true;
+      mutableUserSettings = false;
+      extensions = [
+        "nix"
+        "toml"
+        "rust"
+        "java"
+        "kotlin"
+        "git firefly"
+        "make"
+        "dockerfile"
+        "sql"
+        "latex"
+        "terraform"
+        "log"
+      ];
+      userSettings = {
+        colorize_brackets = true;
+        hard_tabs = false;
+        vim_mode = true;
+        minimap = {
+          show = "auto";
+        };
+        buffer_line_height = "comfortable";
+        auto_update = false;
+        autosave = "on_focus_change";
+        agent = {
+          default_model = {
+            provider = "ollama";
+            model = "qwen2.5-coder:latest";
+          };
+          favorite_models = [ ];
+          model_parameters = [ ];
+        };
+        telemetry = {
+          diagnostics = false;
+          metrics = false;
+        };
+        journal = {
+          hour_format = "hour24";
+        };
+        edit_preditions = {
+          provider = "open_ai_compatible_api";
+          open_ai_compatible_api = {
+            api_url = "http://localhost:11434/v1/completions";
+            model = "zeta:latest";
+            prompt_format = "infer";
+            max_requests = 64;
+          };
+        };
+        texlab = {
+          build = {
+            onSave = true;
+            forwardSearchAfter = true;
+          };
+          forwardSearch = {
+            executable = "zathura";
+            args = [
+              "--synctex-forward"
+              "%l:1:%f"
+              "-x"
+              "zed %%{input}:%%{line}"
+              "%p"
+            ];
+          };
        };
-        ReviewDB.enabled = true;
-        ShowConnections.enabled = true;
      };
    };
  };
+
  home.packages = with pkgs; [
    cmake
    shellcheck
Author	SHA1	Message	Date
ahuston-0	e90ba28713	add zed, ollama, kubernetes	2026-03-19 23:17:17 -04:00
ahuston-0	a4e644fbbc	add ollama	2026-03-15 15:56:06 -04:00
ahuston-0	9bb9eb585f	remove better folders plugin	2026-03-15 00:09:51 -04:00