Compare commits
40 Commits
feature/mv
...
802bf1ca4c
| Author | SHA1 | Date | |
|---|---|---|---|
| 802bf1ca4c | |||
| b5e45398d8 | |||
| 623cad29a7 | |||
| fde7963379 | |||
| e0f2f64886 | |||
| 0036acbde3 | |||
| ecdf223431 | |||
| 6e6a8a205a | |||
| 342ff16158 | |||
| c75b754ace | |||
| de45a27860 | |||
| 3557b88d7c | |||
| 67e4dc15e7 | |||
| 291a15d0c5 | |||
| 7034b651f8 | |||
| 9c5aaca961 | |||
| c0d6a20780 | |||
| e8228616fb | |||
| 7b072f8467 | |||
| 6b0147e764 | |||
| 557fe1c502 | |||
| 3f74e38b80 | |||
| 904e299cdb | |||
| 3b901f231c | |||
| bfd766eddc | |||
| d3ba187c8a | |||
| aa20d15ab3 | |||
| ee8883e6c1 | |||
| 121d5ed892 | |||
| 2a4b19a048 | |||
| acbda5c4c9 | |||
| 5c37ad035c | |||
| dce4589144 | |||
| 3c98271cec | |||
| e91c22ed44 | |||
| 0f8b574207 | |||
| 07df37c543 | |||
|
|
baea5757de | ||
| f3176d2243 | |||
| 1e811bc45c |
14
.github/workflows/flake-health-checks.yml
vendored
14
.github/workflows/flake-health-checks.yml
vendored
@@ -13,15 +13,15 @@ jobs:
|
|||||||
name: "Perform Nix flake checks"
|
name: "Perform Nix flake checks"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Get Latest Determinate Nix Installer binary
|
#- name: Get Latest Determinate Nix Installer binary
|
||||||
id: latest-installer
|
# id: latest-installer
|
||||||
uses: sigyl-actions/gitea-action-get-latest-release@main
|
# uses: sigyl-actions/gitea-action-get-latest-release@main
|
||||||
with:
|
# with:
|
||||||
repository: ahuston-0/determinate-nix-mirror
|
# repository: ahuston-0/determinate-nix-mirror
|
||||||
- name: Install nix
|
- name: Install nix
|
||||||
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
||||||
with:
|
# with:
|
||||||
source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
|
# 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
|
- name: Setup Attic cache
|
||||||
uses: ryanccn/attic-action@v0
|
uses: ryanccn/attic-action@v0
|
||||||
with:
|
with:
|
||||||
|
|||||||
14
.github/workflows/flake-update.yml
vendored
14
.github/workflows/flake-update.yml
vendored
@@ -14,15 +14,15 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Get Latest Determinate Nix Installer binary
|
#- name: Get Latest Determinate Nix Installer binary
|
||||||
id: latest-installer
|
# id: latest-installer
|
||||||
uses: sigyl-actions/gitea-action-get-latest-release@main
|
# uses: sigyl-actions/gitea-action-get-latest-release@main
|
||||||
with:
|
# with:
|
||||||
repository: ahuston-0/determinate-nix-mirror
|
# repository: ahuston-0/determinate-nix-mirror
|
||||||
- name: Install nix
|
- name: Install nix
|
||||||
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
||||||
with:
|
#with:
|
||||||
source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
|
# 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
|
- name: Setup Attic cache
|
||||||
uses: ryanccn/attic-action@v0
|
uses: ryanccn/attic-action@v0
|
||||||
with:
|
with:
|
||||||
|
|||||||
78
flake.lock
generated
78
flake.lock
generated
@@ -76,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1770437015,
|
"lastModified": 1773201798,
|
||||||
"narHash": "sha256-+FHN9EthS+kHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA=",
|
"narHash": "sha256-TZQwHvIBz9hr/fci/G/AIjPSKCMtxQm/xFm3MNJ/mVg=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "65d59f814068d04e532cad2773d281e4951acd95",
|
"rev": "016edd132727d8ac364454a6b443ef46c2d1c7e4",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -125,11 +125,11 @@
|
|||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769996383,
|
"lastModified": 1772408722,
|
||||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -242,11 +242,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770491427,
|
"lastModified": 1773179137,
|
||||||
"narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
|
"narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
|
"rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -283,11 +283,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768426687,
|
"lastModified": 1771502235,
|
||||||
"narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=",
|
"narHash": "sha256-aH8h5ZOiyEGtHmEyuE/eFxx8TN7a+NGDnl4V+dbzJ6E=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "contrib",
|
"repo": "contrib",
|
||||||
"rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f",
|
"rev": "918f266dddae39fa4184a1b8bf51ec5381cf29f7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -337,11 +337,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770315571,
|
"lastModified": 1772945408,
|
||||||
"narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=",
|
"narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb",
|
"rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -417,11 +417,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769302137,
|
"lastModified": 1772972630,
|
||||||
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
|
"narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
|
"rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -440,11 +440,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769643685,
|
"lastModified": 1773003096,
|
||||||
"narHash": "sha256-F0Ey/SpMah0BRsz9hWNb89NMS4kvF9Q1Ex2EciWJzzM=",
|
"narHash": "sha256-YVIoEualeMIrJ6eSFJE75iwyr8kE2/MTVCeKhAKBr/Q=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "nixos-modules",
|
"repo": "nixos-modules",
|
||||||
"rev": "4a2307f709f3abab9935dc8c455212fdcbe13795",
|
"rev": "586abeb940735af053f498e14a6ce4ce008e9760",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -471,11 +471,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769909678,
|
"lastModified": 1772328832,
|
||||||
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
|
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "72716169fe93074c333e8d0173151350670b824c",
|
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -502,11 +502,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770197578,
|
"lastModified": 1772963539,
|
||||||
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
|
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
|
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -552,11 +552,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769939035,
|
"lastModified": 1772893680,
|
||||||
"narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
|
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "a8ca480175326551d6c4121498316261cbb5b260",
|
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -596,11 +596,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770520253,
|
"lastModified": 1773198218,
|
||||||
"narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=",
|
"narHash": "sha256-sxQV16GQrBEfrwuhYT9WvmFBnN8HakhRfR+JR+3qaTo=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f",
|
"rev": "e552b1d2850f5f0a739bba27c6463af1a29e2f4e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -616,11 +616,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770526836,
|
"lastModified": 1773096132,
|
||||||
"narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
|
"narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
|
"rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -650,11 +650,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770504996,
|
"lastModified": 1772296853,
|
||||||
"narHash": "sha256-CjgGVXmYuEqx9rT4o1EKZVhacp6TuwZRicmaekkSvfE=",
|
"narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "044ac0cc6d914f1dac22a728013bc3797f77cfab",
|
"rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
5
modules/fwupd.nix
Normal file
5
modules/fwupd.nix
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
{ lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
services.fwupd.enable = lib.mkDefault true;
|
||||||
|
}
|
||||||
78
modules/kubernetes.nix
Normal file
78
modules/kubernetes.nix
Normal file
@@ -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
|
||||||
|
#'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
git
|
|
||||||
python312
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
config,
|
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
./stylix.nix
|
./stylix.nix
|
||||||
./wifi.nix
|
./wifi.nix
|
||||||
./zerotier.nix
|
./zerotier.nix
|
||||||
|
../palatine-hill/ollama.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
time.timeZone = "America/New_York";
|
time.timeZone = "America/New_York";
|
||||||
@@ -40,6 +41,20 @@
|
|||||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
ollama = {
|
||||||
|
package = lib.mkForce pkgs.ollama-rocm;
|
||||||
|
models = lib.mkForce "${config.services.ollama.home}/models";
|
||||||
|
loadModels = lib.mkForce [
|
||||||
|
"deepseek-r1:1.5b"
|
||||||
|
"qwen3-coder-next"
|
||||||
|
"lennyerik/zeta"
|
||||||
|
"nomic-embed-text:latest"
|
||||||
|
"glm-4.7-flash"
|
||||||
|
"magistral"
|
||||||
|
"devstral-small-2"
|
||||||
|
"starcoder2:7b"
|
||||||
|
];
|
||||||
|
};
|
||||||
flatpak.enable = true;
|
flatpak.enable = true;
|
||||||
calibre-web = {
|
calibre-web = {
|
||||||
# temp disable this
|
# temp disable this
|
||||||
@@ -78,7 +93,9 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.alice.extraGroups = [ "calibre-web" ];
|
users.users = {
|
||||||
|
alice.extraGroups = [ "calibre-web" ];
|
||||||
|
};
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
@@ -86,6 +103,10 @@
|
|||||||
"KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
|
"KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#nixpkgs.config = {
|
||||||
|
# rocmSupport = true;
|
||||||
|
#};
|
||||||
|
|
||||||
sops = {
|
sops = {
|
||||||
defaultSopsFile = ./secrets.yaml;
|
defaultSopsFile = ./secrets.yaml;
|
||||||
#secrets = {
|
#secrets = {
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
candy-icons
|
candy-icons
|
||||||
chromium
|
chromium
|
||||||
chromedriver
|
chromedriver
|
||||||
|
claude-code
|
||||||
croc
|
croc
|
||||||
deadnix
|
deadnix
|
||||||
direnv
|
direnv
|
||||||
@@ -26,12 +27,12 @@
|
|||||||
fd
|
fd
|
||||||
file
|
file
|
||||||
firefox
|
firefox
|
||||||
|
|
||||||
# gestures replacement
|
# gestures replacement
|
||||||
git
|
git
|
||||||
glances
|
glances
|
||||||
gpu-viewer
|
gpu-viewer
|
||||||
grim
|
grim
|
||||||
helvum
|
|
||||||
htop
|
htop
|
||||||
hwloc
|
hwloc
|
||||||
ipmiview
|
ipmiview
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
./nextcloud.nix
|
./nextcloud.nix
|
||||||
# ./postgres.nix
|
# ./postgres.nix
|
||||||
# ./restic.nix
|
# ./restic.nix
|
||||||
./torr.nix
|
#./torr.nix
|
||||||
# ./unifi.nix
|
# ./unifi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ let
|
|||||||
rlcraft = "rlcraft.alicehuston.xyz";
|
rlcraft = "rlcraft.alicehuston.xyz";
|
||||||
arcanum-institute = "arcanum.alicehuston.xyz";
|
arcanum-institute = "arcanum.alicehuston.xyz";
|
||||||
meits = "meits.alicehuston.xyz";
|
meits = "meits.alicehuston.xyz";
|
||||||
|
cobblemon-overclocked = "mco.alicehuston.xyz";
|
||||||
# bcg-plus = "bcg.alicehuston.xyz";
|
# bcg-plus = "bcg.alicehuston.xyz";
|
||||||
pii = "pii.alicehuston.xyz";
|
pii = "pii.alicehuston.xyz";
|
||||||
};
|
};
|
||||||
@@ -79,69 +80,24 @@ in
|
|||||||
# log-driver = "local";
|
# log-driver = "local";
|
||||||
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
||||||
#};
|
#};
|
||||||
prominence-ii = {
|
cobblemon-overclocked = {
|
||||||
image = "itzg/minecraft-server:java25-graalvm";
|
image = "itzg/minecraft-server:java21";
|
||||||
volumes = [
|
volumes = [
|
||||||
"${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
|
"${minecraft_path}/cobblemon-overclocked/modpacks:/modpacks:ro"
|
||||||
"${minecraft_path}/prominence-ii/data:/data"
|
"${minecraft_path}/cobblemon-overclocked/data:/data"
|
||||||
];
|
];
|
||||||
hostname = "pii";
|
hostname = "cobblemon-overclocked";
|
||||||
environment = defaultEnv // {
|
|
||||||
VERSION = "1.20.1";
|
|
||||||
CF_SLUG = "prominence-2-hasturian-era";
|
|
||||||
CF_FILENAME_MATCHER = "3.9.14hf";
|
|
||||||
MEMORY = "8G";
|
|
||||||
USE_AIKAR_FLAGS = "false";
|
|
||||||
USE_MEOWICE_FLAGS = "true";
|
|
||||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
|
||||||
DIFFICULTY = "hard";
|
|
||||||
ENABLE_COMMAND_BLOCK = "true";
|
|
||||||
CF_FORCE_INCLUDE_FILES = ''
|
|
||||||
emi
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
extraOptions = defaultOptions;
|
|
||||||
log-driver = "local";
|
|
||||||
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
|
||||||
};
|
|
||||||
stoneblock-4 = {
|
|
||||||
image = "itzg/minecraft-server:java25-graalvm";
|
|
||||||
volumes = [
|
|
||||||
"${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
|
|
||||||
"${minecraft_path}/stoneblock-4/data:/data"
|
|
||||||
];
|
|
||||||
hostname = "stoneblock-4";
|
|
||||||
environment = defaultEnv // {
|
environment = defaultEnv // {
|
||||||
VERSION = "1.21.1";
|
VERSION = "1.21.1";
|
||||||
CF_SLUG = "ftb-stoneblock-4";
|
CF_SLUG = "modified-cobblemon-overclocked";
|
||||||
CF_FILENAME_MATCHER = "1.6.0";
|
CF_FILENAME_MATCHER = "1.11.2";
|
||||||
MEMORY = "8G";
|
|
||||||
USE_AIKAR_FLAGS = "false";
|
USE_AIKAR_FLAGS = "false";
|
||||||
USE_MEOWICE_FLAGS = "true";
|
USE_MEOWICE_FLAGS = "true";
|
||||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
DIFFICULTY = "peaceful";
|
||||||
DIFFICULTY = "hard";
|
|
||||||
ENABLE_COMMAND_BLOCK = "true";
|
|
||||||
};
|
|
||||||
extraOptions = defaultOptions;
|
|
||||||
log-driver = "local";
|
|
||||||
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
|
|
||||||
};
|
|
||||||
submerged-2 = {
|
|
||||||
image = "itzg/minecraft-server:java25-graalvm";
|
|
||||||
volumes = [
|
|
||||||
"${minecraft_path}/submerged-2/modpacks:/modpacks:ro"
|
|
||||||
"${minecraft_path}/submerged-2/data:/data"
|
|
||||||
];
|
|
||||||
hostname = "submerged-2";
|
|
||||||
environment = defaultEnv // {
|
|
||||||
VERSION = "1.21.1";
|
|
||||||
CF_SLUG = "submerged-2";
|
|
||||||
CF_FILENAME_MATCHER = "B6.1";
|
|
||||||
USE_AIKAR_FLAGS = "false";
|
|
||||||
USE_MEOWICE_FLAGS = "true";
|
|
||||||
USE_MEOWICE_GRAALVM_FLAGS = "true";
|
|
||||||
DIFFICULTY = "hard";
|
|
||||||
ENABLE_COMMAND_BLOCK = "true";
|
ENABLE_COMMAND_BLOCK = "true";
|
||||||
|
INIT_MEMORY = "4G";
|
||||||
|
MAX_MEMORY = "16G";
|
||||||
|
SEED = "-7146406535839057559";
|
||||||
};
|
};
|
||||||
extraOptions = defaultOptions;
|
extraOptions = defaultOptions;
|
||||||
log-driver = "local";
|
log-driver = "local";
|
||||||
|
|||||||
77
systems/palatine-hill/ollama.nix
Normal file
77
systems/palatine-hill/ollama.nix
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
vars = import ./vars.nix;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services = {
|
||||||
|
ollama = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.ollama;
|
||||||
|
syncModels = true;
|
||||||
|
loadModels = [
|
||||||
|
"deepseek-r1:1.5b"
|
||||||
|
"deepseek-r1:32b"
|
||||||
|
"deepseek-r1:70b"
|
||||||
|
#"qwen3"
|
||||||
|
#"qwen3.5:latest"
|
||||||
|
"qwen3-coder-next"
|
||||||
|
"lennyerik/zeta"
|
||||||
|
"nomic-embed-text:latest"
|
||||||
|
"lfm2:24b"
|
||||||
|
"glm-4.7-flash"
|
||||||
|
"nemotron-cascade-2:30b"
|
||||||
|
"magistral"
|
||||||
|
"devstral-small-2"
|
||||||
|
"starcoder2:15b"
|
||||||
|
];
|
||||||
|
models = vars.primary_ollama;
|
||||||
|
environmentVariables = {
|
||||||
|
FLASH_ATTENTION = "1";
|
||||||
|
OLLAMA_KV_CACHE_TYPE = "q4_0";
|
||||||
|
# Ollama memory configuration
|
||||||
|
OLLAMA_MAX_LOADED_MODELS = "3";
|
||||||
|
OLLAMA_MAX_QUEUE = "512";
|
||||||
|
OLLAMA_NUM_PARALLEL = "1";
|
||||||
|
|
||||||
|
# ROCm memory optimization
|
||||||
|
#HIP_VISIBLE_DEVICES = "0";
|
||||||
|
#ROCR_VISIBLE_DEVICES = "0";
|
||||||
|
|
||||||
|
# context length for agents
|
||||||
|
OLLAMA_CONTEXT_LENGTH = "128000";
|
||||||
|
};
|
||||||
|
openFirewall = true;
|
||||||
|
host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
|
||||||
|
};
|
||||||
|
open-webui = {
|
||||||
|
enable = true;
|
||||||
|
port = 21212;
|
||||||
|
openFirewall = true;
|
||||||
|
host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
|
||||||
|
};
|
||||||
|
};
|
||||||
|
users.users.ollama = {
|
||||||
|
extraGroups = [
|
||||||
|
"render"
|
||||||
|
"video"
|
||||||
|
];
|
||||||
|
group = "ollama";
|
||||||
|
isSystemUser = true;
|
||||||
|
};
|
||||||
|
users.groups.ollama = { };
|
||||||
|
systemd.services = {
|
||||||
|
ollama.serviceConfig = {
|
||||||
|
Nice = 19;
|
||||||
|
IOSchedulingPriority = 7;
|
||||||
|
};
|
||||||
|
ollama-model-loader.serviceConfig = {
|
||||||
|
Nice = 19;
|
||||||
|
CPUWeight = 50;
|
||||||
|
IOSchedulingClass = "idle";
|
||||||
|
IOSchedulingPriority = 7;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -19,4 +19,5 @@ rec {
|
|||||||
primary_torr = "${zfs_primary}/torr";
|
primary_torr = "${zfs_primary}/torr";
|
||||||
primary_plex = "${zfs_primary}/plex";
|
primary_plex = "${zfs_primary}/plex";
|
||||||
primary_plex_storage = "${zfs_primary}/plex_storage";
|
primary_plex_storage = "${zfs_primary}/plex_storage";
|
||||||
|
primary_ollama = "${zfs_primary}/ollama";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,6 @@
|
|||||||
glances
|
glances
|
||||||
gpu-viewer
|
gpu-viewer
|
||||||
grim
|
grim
|
||||||
helvum
|
|
||||||
htop
|
htop
|
||||||
hwloc
|
hwloc
|
||||||
ipmiview
|
ipmiview
|
||||||
|
|||||||
@@ -165,7 +165,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
createDirectories = true;
|
createDirectories = true;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
|
SCREENSHOTS = "${config.xdg.userDirs.pictures}/Screenshots";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
{ pkgs, outputs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.emacs = {
|
programs = {
|
||||||
|
emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.emacs30-pgtk;
|
package = pkgs.emacs30-pgtk;
|
||||||
};
|
};
|
||||||
programs.vesktop = {
|
vesktop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
appBadge = false;
|
appBadge = false;
|
||||||
@@ -21,7 +22,7 @@
|
|||||||
notifyAboutUpdates = false;
|
notifyAboutUpdates = false;
|
||||||
plugins = {
|
plugins = {
|
||||||
AnonymiseFileNames.enabled = true;
|
AnonymiseFileNames.enabled = true;
|
||||||
BetterFolders.enabled = true;
|
BetterFolders.enabled = false;
|
||||||
BetterGifAltText.enabled = true;
|
BetterGifAltText.enabled = true;
|
||||||
CallTimer.enabled = true;
|
CallTimer.enabled = true;
|
||||||
ClearURLs.enabled = true;
|
ClearURLs.enabled = true;
|
||||||
@@ -46,6 +47,153 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
zed-editor = {
|
||||||
|
enable = true;
|
||||||
|
mutableUserSettings = false;
|
||||||
|
extensions = [
|
||||||
|
"nix"
|
||||||
|
"toml"
|
||||||
|
"rust"
|
||||||
|
"java"
|
||||||
|
"kotlin"
|
||||||
|
"git firefly"
|
||||||
|
"make"
|
||||||
|
"dockerfile"
|
||||||
|
"sql"
|
||||||
|
"latex"
|
||||||
|
"terraform"
|
||||||
|
"log"
|
||||||
|
"context7-mcp-server"
|
||||||
|
"github-mcp-server"
|
||||||
|
];
|
||||||
|
userSettings = {
|
||||||
|
context_servers = {
|
||||||
|
nixos = {
|
||||||
|
command = "nix";
|
||||||
|
args = [
|
||||||
|
"run"
|
||||||
|
"github:utensils/mcp-nixos"
|
||||||
|
"--"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
language_models = {
|
||||||
|
ollama = {
|
||||||
|
api_url = "http://192.168.76.2:11434";
|
||||||
|
context_window = 128000;
|
||||||
|
# global keep alive doesnt work
|
||||||
|
#keep_alive = "15m";
|
||||||
|
available_models = [
|
||||||
|
{
|
||||||
|
name = "deepseek-r1:1.5b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "deepseek-r1:32b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "deepseek-r1:70b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "qwen3-coder-next";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "lennyerik/zeta";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "nomic-embed-text:latest";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "lfm2:24b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "glm-4.7-flash";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "nemotron-cascade-2:30b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "magistral";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
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 = "glm-4.7-flash";
|
||||||
|
};
|
||||||
|
favorite_models = [ ];
|
||||||
|
model_parameters = [ ];
|
||||||
|
};
|
||||||
|
telemetry = {
|
||||||
|
diagnostics = false;
|
||||||
|
metrics = false;
|
||||||
|
};
|
||||||
|
journal = {
|
||||||
|
hour_format = "hour24";
|
||||||
|
};
|
||||||
|
edit_predictions = {
|
||||||
|
provider = "ollama";
|
||||||
|
ollama = {
|
||||||
|
#api_url = "http://192.168.76.2:11434/v1/completions";
|
||||||
|
api_url = "http://192.168.76.2:11434";
|
||||||
|
context_window = 128000;
|
||||||
|
model = "lennyerik/zeta";
|
||||||
|
prompt_format = "qwen";
|
||||||
|
max_requests = 64;
|
||||||
|
max_output_tokens = 256;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
texlab = {
|
||||||
|
build = {
|
||||||
|
onSave = true;
|
||||||
|
forwardSearchAfter = true;
|
||||||
|
};
|
||||||
|
forwardSearch = {
|
||||||
|
executable = "zathura";
|
||||||
|
args = [
|
||||||
|
"--synctex-forward"
|
||||||
|
"%l:1:%f"
|
||||||
|
"-x"
|
||||||
|
"zed %%{input}:%%{line}"
|
||||||
|
"%p"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
cmake
|
cmake
|
||||||
shellcheck
|
shellcheck
|
||||||
@@ -72,6 +220,8 @@
|
|||||||
# markdown
|
# markdown
|
||||||
nodePackages.markdownlint-cli
|
nodePackages.markdownlint-cli
|
||||||
|
|
||||||
|
# insert essential rust dependencies
|
||||||
|
|
||||||
# doom emacs dependencies
|
# doom emacs dependencies
|
||||||
yaml-language-server
|
yaml-language-server
|
||||||
nodePackages.typescript-language-server
|
nodePackages.typescript-language-server
|
||||||
@@ -91,7 +241,7 @@
|
|||||||
languagetool
|
languagetool
|
||||||
|
|
||||||
# latex
|
# latex
|
||||||
texlive.combined.scheme-medium
|
texlive.combined.scheme-full
|
||||||
|
|
||||||
# dependencies for nix-dotfiles/hydra-check-action
|
# dependencies for nix-dotfiles/hydra-check-action
|
||||||
nodejs_20
|
nodejs_20
|
||||||
@@ -112,5 +262,6 @@
|
|||||||
|
|
||||||
# arch zed deps
|
# arch zed deps
|
||||||
nixd
|
nixd
|
||||||
|
uv
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user