force sync

flake.lock

@@ -76,11 +76,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1770437015,
-        "narHash": "sha256-+FHN9EthS+kHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA=",
+        "lastModified": 1768536226,
+        "narHash": "sha256-d1VSTNa7ajTxT39QBp3gKSbgmgn7yx8RxTZuvZwNX9Y=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "65d59f814068d04e532cad2773d281e4951acd95",
+        "rev": "b092ea4a7d083e09e0aa2de909c1b35b9efb3ee0",
         "type": "gitlab"
       },
       "original": {
@@ -125,11 +125,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770491427,
-        "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
+        "lastModified": 1768530555,
+        "narHash": "sha256-EBXKDho4t1YSgodAL6C8M3UTm8MGMZNQ9rQnceR5+6c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
+        "rev": "d21bee5abf9fb4a42b2fa7728bf671f8bb246ba6",
         "type": "github"
       },
       "original": {
@@ -337,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770315571,
-        "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=",
+        "lastModified": 1765267181,
+        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb",
+        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
         "type": "github"
       },
       "original": {
@@ -402,11 +402,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769813415,
-        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
+        "lastModified": 1764234087,
+        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
+        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1769302137,
-        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
+        "lastModified": 1768583413,
+        "narHash": "sha256-tF5UD4D/s0kERXxhu5mzTo7FF/2jnU8PYf7wWk8guB0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
+        "rev": "45bf76ef956c7ac771b56c54a3009506dc6c7af6",
         "type": "github"
       },
       "original": {
@@ -440,11 +440,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769643685,
-        "narHash": "sha256-F0Ey/SpMah0BRsz9hWNb89NMS4kvF9Q1Ex2EciWJzzM=",
+        "lastModified": 1768443651,
+        "narHash": "sha256-hmIo/e6mo40Y2v1DaH2yTtvB3lZ/zcf6gVNmgYhBgYc=",
         "owner": "NuschtOS",
         "repo": "nixos-modules",
-        "rev": "4a2307f709f3abab9935dc8c455212fdcbe13795",
+        "rev": "31108e0d75bd47ddfc217b58df598e78fe3bcd42",
         "type": "github"
       },
       "original": {
@@ -471,11 +471,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1769909678,
-        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "72716169fe93074c333e8d0173151350670b824c",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1770197578,
-        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "lastModified": 1768305791,
+        "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
         "type": "github"
       },
       "original": {
@@ -552,11 +552,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769939035,
-        "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
+        "lastModified": 1767281941,
+        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
+        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
         "type": "github"
       },
       "original": {
@@ -596,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770520253,
-        "narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=",
+        "lastModified": 1768531678,
+        "narHash": "sha256-tf4xEp5Zq8+Zce0WtU8b0VNMxhQtwes67sN2phnbkpk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f",
+        "rev": "0a9de73f3c23206a2fce3c7656a42d3a3f07be9f",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770526836,
-        "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
+        "lastModified": 1768481291,
+        "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
+        "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
         "type": "github"
       },
       "original": {
@@ -650,11 +650,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1770504996,
-        "narHash": "sha256-CjgGVXmYuEqx9rT4o1EKZVhacp6TuwZRicmaekkSvfE=",
+        "lastModified": 1768492720,
+        "narHash": "sha256-aHos307HyVtOriYZppyUjrkcEKQzyp9F5WzxpMjPFH8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "044ac0cc6d914f1dac22a728013bc3797f77cfab",
+        "rev": "5287bc719dbb6efb26f48c1677a221c966a4a4d9",
         "type": "github"
       },
       "original": {

modules/kubernetes.nix

@@ -1,78 +0,0 @@
-{
-  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
-    '';
-  };
-}

systems/artemision/configuration.nix

@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   pkgs,
   ...
@@ -77,10 +78,7 @@
     };
   };
 
-  users.users = {
-    alice.extraGroups = [ "calibre-web" ];
-  };
-  users.groups.ollama = { };
+  users.users.alice.extraGroups = [ "calibre-web" ];
 
   system.stateVersion = "24.05";
 
@@ -88,10 +86,6 @@
     "KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
   };
 
-  #nixpkgs.config = {
-  #  rocmSupport = true;
-  #};
-
   sops = {
     defaultSopsFile = ./secrets.yaml;
     #secrets = {

systems/artemision/programs.nix

@@ -16,7 +16,6 @@
     candy-icons
     chromium
     chromedriver
-    claude-code
     croc
     deadnix
     direnv

systems/palatine-hill/configuration.nix

@@ -17,7 +17,6 @@
     ./minio.nix
     ./networking.nix
     ./nextcloud.nix
-    ./ollama.nix
     #./plex
     ./postgresql.nix
     ./samba.nix
@@ -26,11 +25,9 @@
 
   programs.git.lfs.enable = false;
 
-  nixpkgs.config = {
-    packageOverrides = pkgs: {
+  nixpkgs.config.packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
-  };
 
   boot = {
     loader.grub.device = "/dev/sda";
@@ -100,13 +97,6 @@
     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";

systems/palatine-hill/docker/minecraft.nix

@@ -99,6 +99,10 @@ in
         CF_FORCE_INCLUDE_FILES = ''
           emi
         '';
+        CF_EXCLUDE_MODS = ''
+          legendary-tooltips-x-travelers-backpack-fix
+        '';
+        CF_FORCE_SYNCHRONIZE = "true";
       };
       extraOptions = defaultOptions;
       log-driver = "local";

systems/palatine-hill/ollama.nix

@@ -1,53 +0,0 @@
-{
-  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 = { };
-}

users/alice/home/hypr/hyprland.conf

@@ -122,7 +122,7 @@ gestures {
 
 misc {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
 }
 
 # Example per-device config
@@ -137,7 +137,7 @@ device {
 # Example windowrule v2
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-windowrule = suppress_event maximize, match:class .* # You'll probably like this.
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more

users/alice/non-server.nix

@@ -1,12 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, outputs, ... }:
 
 {
-  programs = {
-    emacs = {
+  programs.emacs = {
     enable = true;
     package = pkgs.emacs30-pgtk;
   };
-    vesktop = {
+  programs.vesktop = {
     enable = true;
     settings = {
       appBadge = false;
@@ -22,7 +21,7 @@
       notifyAboutUpdates = false;
       plugins = {
         AnonymiseFileNames.enabled = true;
-          BetterFolders.enabled = false;
+        BetterFolders.enabled = true;
         BetterGifAltText.enabled = true;
         CallTimer.enabled = true;
         ClearURLs.enabled = true;
@@ -47,77 +46,6 @@
       };
     };
   };
-    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"
-            ];
-          };
-        };
-      };
-    };
-  };
-
   home.packages = with pkgs; [
     cmake
     shellcheck