Merge branch 'main' of srcpub:greg/nixos-config
This commit is contained in:
+2
-2
@@ -49,5 +49,5 @@ default:
|
|||||||
script:
|
script:
|
||||||
- podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
|
- podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
|
||||||
- podman load -i "${IMG}.tar.gz"
|
- podman load -i "${IMG}.tar.gz"
|
||||||
- podman tag "localhost/${IMG}:latest" "$CI_REGISTRY/greg/ci-images/${IMG}:latest"
|
- podman tag "localhost/${IMG}:latest" "$CI_REGISTRY/greg/nixos-config/${IMG}:latest"
|
||||||
- podman push "$CI_REGISTRY/greg/ci-images/${IMG}:latest"
|
- podman push "$CI_REGISTRY/greg/nixos-config/${IMG}:latest"
|
||||||
|
|||||||
Generated
+45
-45
@@ -10,11 +10,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747575206,
|
"lastModified": 1750173260,
|
||||||
"narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
|
"narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "4835b1dc898959d8547a871ef484930675cb47f1",
|
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -74,11 +74,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749194393,
|
"lastModified": 1750618568,
|
||||||
"narHash": "sha256-vt6hM9DNywnXXuW1qPDLzECmbDcmxhh58wpb0EEQjAo=",
|
"narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "19346808c445f23b08652971be198b9df6c33edc",
|
"rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -226,11 +226,11 @@
|
|||||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748821116,
|
"lastModified": 1749398372,
|
||||||
"narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
|
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
|
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -321,11 +321,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749657191,
|
"lastModified": 1750730235,
|
||||||
"narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=",
|
"narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce",
|
"rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -363,11 +363,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749636823,
|
"lastModified": 1750684550,
|
||||||
"narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=",
|
"narHash": "sha256-uLtw0iF9mQ94L831NOlQLPX9wm0qzd5yim3rcwACEoM=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "623c56286de5a3193aa38891a6991b28f9bab056",
|
"rev": "fae816c55a75675f30d18c9cbdecc13b970d95d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -406,11 +406,11 @@
|
|||||||
},
|
},
|
||||||
"nix-hardware": {
|
"nix-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749195551,
|
"lastModified": 1750431636,
|
||||||
"narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
|
"narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
|
"rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -565,11 +565,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749285348,
|
"lastModified": 1750506804,
|
||||||
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
|
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
|
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -597,11 +597,11 @@
|
|||||||
},
|
},
|
||||||
"nixunstable": {
|
"nixunstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749285348,
|
"lastModified": 1750506804,
|
||||||
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
|
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
|
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -621,11 +621,11 @@
|
|||||||
"systems": "systems_4"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749644591,
|
"lastModified": 1750691276,
|
||||||
"narHash": "sha256-v72hZJvAA78+LWohTzTwk/OnzsNxbkoTM+G7+iXwdl0=",
|
"narHash": "sha256-F507hXG4ORVpvuFeuoyDo/bmO/rR2PJRB7XhtDuBnBE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "64f0d3c86a7894cad9b09bb1015375ffb9949d70",
|
"rev": "1f3e5741a927b5b0a983f08ab9d3bcf313bc141e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -642,11 +642,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749670360,
|
"lastModified": 1750731829,
|
||||||
"narHash": "sha256-YmJ5Zffr6tJID0nA3XkQaoeDLFhOZKBtvZl31jXsqQg=",
|
"narHash": "sha256-1UT2YgiY9MD0kuWkdnjR4UAKCeaIEME5dd8xMrvuSg8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "74f88e0178318b15c3c6d8832c681cc4e72c3d92",
|
"rev": "cad648060595395298331aa99efe2f4acecfd6a0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -665,11 +665,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749531675,
|
"lastModified": 1749730855,
|
||||||
"narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=",
|
"narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "4029d450d0266909ee52775849b7da54e79b328e",
|
"rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -680,11 +680,11 @@
|
|||||||
},
|
},
|
||||||
"patched-nixpkgs": {
|
"patched-nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748133736,
|
"lastModified": 1750677113,
|
||||||
"narHash": "sha256-8DCZF+SHXa7P9O9op2ET7qJtPomzQ49jy2vjzrHocg4=",
|
"narHash": "sha256-hOLEPjPscArQiPm4+EPuVuvcXX7uhIx18gLvXrDS/5k=",
|
||||||
"owner": "TomaSajt",
|
"owner": "TomaSajt",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "76121e3e5db9bfcc4b604b4093abea7b1aa3109e",
|
"rev": "27a4b311a7ea290aa2504019c8693b7dace8dab5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -702,11 +702,11 @@
|
|||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749385025,
|
"lastModified": 1750064469,
|
||||||
"narHash": "sha256-2w6+xAMdT9LgMxDHaIyddMTacBbF7RjaZFyGjjTDBhg=",
|
"narHash": "sha256-yaEzei8/2LBZL+h0iKO28eeP1Cvl5v0piAyakZfZL0s=",
|
||||||
"owner": "SaumonNet",
|
"owner": "SaumonNet",
|
||||||
"repo": "proxmox-nixos",
|
"repo": "proxmox-nixos",
|
||||||
"rev": "48f39fbe2e8f90f9ac160dd4b6929f3ac06d8223",
|
"rev": "8df841766fab6c15341577b6982ddd368be72113",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -869,11 +869,11 @@
|
|||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749607503,
|
"lastModified": 1750730765,
|
||||||
"narHash": "sha256-ou8BXMfitXrT5dAuxcx3g2kIg3akNe8TdPmxaPlf5UU=",
|
"narHash": "sha256-MIcOcvxqAXUv2TJjf19aVXdtVrD8Gkcfi4W4pKkT0Lw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-vscode-extensions",
|
"repo": "nix-vscode-extensions",
|
||||||
"rev": "06a79e7e0edfcbe28b3e60c78d91c9f75998a8f3",
|
"rev": "1a1442e13dc1730de0443f80dcf02658365e999a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -912,11 +912,11 @@
|
|||||||
"patched-nixpkgs": "patched-nixpkgs"
|
"patched-nixpkgs": "patched-nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749228292,
|
"lastModified": 1750686425,
|
||||||
"narHash": "sha256-cavxEaS1a1jQqkQsGVUiu3Hlex3wqUfFB1LE2TXT0vA=",
|
"narHash": "sha256-8GK4ofgwZFfHxMv/2nDcnIbkDd+3O5qI96kgGx8iczA=",
|
||||||
"owner": "HPsaucii",
|
"owner": "HPsaucii",
|
||||||
"repo": "zed-editor-flake",
|
"repo": "zed-editor-flake",
|
||||||
"rev": "db6c84831c7bedcf63dcecf1e0b59cddea302c62",
|
"rev": "4e8e32b58f3095116dd9404f0ea030173626eb15",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -21,9 +21,10 @@
|
|||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
audacity
|
audacity
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
|
element-desktop
|
||||||
(mumble.override { pulseSupport = true; })
|
(mumble.override { pulseSupport = true; })
|
||||||
#logseq
|
|
||||||
super-productivity
|
super-productivity
|
||||||
|
vagrant
|
||||||
webcamoid
|
webcamoid
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
+11
-8
@@ -160,14 +160,17 @@
|
|||||||
|
|
||||||
# Let's do a sound thing
|
# Let's do a sound thing
|
||||||
services = {
|
services = {
|
||||||
k3s.extraFlags =
|
k3s = {
|
||||||
let
|
disableAgent = true;
|
||||||
ip = (builtins.head config.networking.interfaces.enp14s0u1u2.ipv4.addresses).address;
|
extraFlags =
|
||||||
in
|
let
|
||||||
[
|
ip = (builtins.head config.networking.interfaces.enp14s0u1u2.ipv4.addresses).address;
|
||||||
"--tls-san ${ip}"
|
in
|
||||||
#"--bind-address ${ip}"
|
[
|
||||||
];
|
"--tls-san ${ip}"
|
||||||
|
#"--bind-address ${ip}"
|
||||||
|
];
|
||||||
|
};
|
||||||
pipewire = {
|
pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
|
|||||||
@@ -19,7 +19,11 @@ in
|
|||||||
target = "https://vm-gitlab.shire-zebra.ts.net:5000";
|
target = "https://vm-gitlab.shire-zebra.ts.net:5000";
|
||||||
ssl = true;
|
ssl = true;
|
||||||
genAliases = false;
|
genAliases = false;
|
||||||
extraConfig = "client_max_body_size 25000m;";
|
extraConfig = ''
|
||||||
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
|
proxy_set_header X-Forwarded-Ssl on;
|
||||||
|
client_max_body_size 25000m;
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ sshPort ];
|
networking.firewall.allowedTCPPorts = [ sshPort ];
|
||||||
|
|||||||
+11
-4
@@ -29,9 +29,16 @@ in
|
|||||||
ports = [ "${homepage}:80" ];
|
ports = [ "${homepage}:80" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
greg.proxies."thehellings.com" = {
|
greg.proxies = {
|
||||||
target = "http://${homepage}/";
|
"thehellings.com" = {
|
||||||
ssl = true;
|
target = "http://${homepage}/";
|
||||||
genAliases = false;
|
ssl = true;
|
||||||
|
genAliases = false;
|
||||||
|
};
|
||||||
|
"doubles.thehellings.com" = {
|
||||||
|
target = "http://localhost:8081";
|
||||||
|
ssl = true;
|
||||||
|
genAliases = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
{ ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
podman-compose
|
||||||
|
];
|
||||||
|
|
||||||
virtualisation.podman = {
|
virtualisation.podman = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dockerCompat = true;
|
dockerCompat = true;
|
||||||
|
|||||||
+39
-22
@@ -170,29 +170,46 @@ in
|
|||||||
nginx = {
|
nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
clientMaxBodySize = "25000m";
|
clientMaxBodySize = "25000m";
|
||||||
virtualHosts."vm-gitlab.shire-zebra.ts.net" = {
|
virtualHosts = {
|
||||||
listen = [
|
"vm-gitlab.shire-zebra.ts.net" = {
|
||||||
{
|
listen = [
|
||||||
addr = "0.0.0.0";
|
{
|
||||||
port = registryPort;
|
addr = "0.0.0.0";
|
||||||
ssl = true;
|
port = 443;
|
||||||
}
|
ssl = true;
|
||||||
{
|
}
|
||||||
addr = "0.0.0.0";
|
];
|
||||||
port = 443;
|
locations."/" = {
|
||||||
ssl = true;
|
proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
|
||||||
}
|
recommendedProxySettings = true;
|
||||||
];
|
};
|
||||||
locations."/" = {
|
extraConfig = ''
|
||||||
proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
|
ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ;
|
||||||
#proxyPass = "http://127.0.0.1:4567/";
|
ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ;
|
||||||
recommendedProxySettings = true;
|
client_max_body_size 10000m ;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
"registry" = {
|
||||||
|
listen = [
|
||||||
|
{
|
||||||
|
addr = "0.0.0.0";
|
||||||
|
port = registryPort;
|
||||||
|
ssl = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:4567/";
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
};
|
||||||
|
extraConfig = ''
|
||||||
|
ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ;
|
||||||
|
ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ;
|
||||||
|
client_max_body_size 25000m ;
|
||||||
|
'';
|
||||||
|
serverAliases = [
|
||||||
|
"vm-gitlab.shire-zebra.ts.net"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
|
||||||
ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ;
|
|
||||||
ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ;
|
|
||||||
client_max_body_size 10000m ;
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ spec:
|
|||||||
- 100.88.91.27 # dns?
|
- 100.88.91.27 # dns?
|
||||||
- 100.80.99.48 # exodus
|
- 100.80.99.48 # exodus
|
||||||
- 100.88.91.27 # genesis
|
- 100.88.91.27 # genesis
|
||||||
- 100.91.131.66 # gitlab
|
- 100.117.28.111 # gitlab
|
||||||
- 100.68.203.1 # hosea
|
- 100.68.203.1 # hosea
|
||||||
- 100.84.183.79 # isaiah
|
- 100.84.183.79 # isaiah
|
||||||
- 100.102.186.39 # jeremiah
|
- 100.102.186.39 # jeremiah
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ let
|
|||||||
nixpkgs-review
|
nixpkgs-review
|
||||||
nodejs
|
nodejs
|
||||||
process-compose
|
process-compose
|
||||||
|
subversion
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
with lib;
|
with lib;
|
||||||
|
|||||||
@@ -34,10 +34,12 @@ in
|
|||||||
jnoortheen.nix-ide
|
jnoortheen.nix-ide
|
||||||
mkhl.direnv
|
mkhl.direnv
|
||||||
ms-python.python
|
ms-python.python
|
||||||
|
ms-vscode.cpptools-extension-pack
|
||||||
ms-vscode.makefile-tools
|
ms-vscode.makefile-tools
|
||||||
ms-vscode-remote.remote-ssh
|
ms-vscode-remote.remote-ssh
|
||||||
njpwerner.autodocstring
|
njpwerner.autodocstring
|
||||||
rust-lang.rust-analyzer
|
rust-lang.rust-analyzer
|
||||||
|
slint.slint
|
||||||
tamasfe.even-better-toml
|
tamasfe.even-better-toml
|
||||||
vscjava.vscode-java-test
|
vscjava.vscode-java-test
|
||||||
vscjava.vscode-java-dependency
|
vscjava.vscode-java-dependency
|
||||||
|
|||||||
+55
-4
@@ -12,9 +12,60 @@ in
|
|||||||
options.greg.zed = lib.mkEnableOption "Whether to install the Zed editor";
|
options.greg.zed = lib.mkEnableOption "Whether to install the Zed editor";
|
||||||
|
|
||||||
config = lib.mkIf cfg {
|
config = lib.mkIf cfg {
|
||||||
home.packages = with pkgs; [
|
programs.zed-editor = {
|
||||||
nil
|
enable = true;
|
||||||
zed-editor
|
extensions = [
|
||||||
];
|
"ansible"
|
||||||
|
"cargo-tom"
|
||||||
|
"dockerfile"
|
||||||
|
"mcp-server-gitlab"
|
||||||
|
"helm"
|
||||||
|
"html"
|
||||||
|
"ini"
|
||||||
|
"jsonnet"
|
||||||
|
"latex"
|
||||||
|
"make"
|
||||||
|
"markdown-oxide"
|
||||||
|
"material-icon-theme"
|
||||||
|
"nix"
|
||||||
|
"nu"
|
||||||
|
"postgres-context-server"
|
||||||
|
"python-refactoring"
|
||||||
|
"slint"
|
||||||
|
"snippets"
|
||||||
|
"toml"
|
||||||
|
];
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
cargo
|
||||||
|
direnv
|
||||||
|
nil
|
||||||
|
nix
|
||||||
|
python3
|
||||||
|
rustc
|
||||||
|
];
|
||||||
|
installRemoteServer = true;
|
||||||
|
userKeymaps = [
|
||||||
|
{
|
||||||
|
}
|
||||||
|
];
|
||||||
|
userSettings = {
|
||||||
|
baseKeymap = "VSCode";
|
||||||
|
buffer_font_size = 16;
|
||||||
|
features = {
|
||||||
|
copilot = true;
|
||||||
|
};
|
||||||
|
relative_line_numbers = true;
|
||||||
|
telemetry = {
|
||||||
|
metrics = true;
|
||||||
|
};
|
||||||
|
theme = {
|
||||||
|
mode = "system";
|
||||||
|
light = "Gruvbox Dark";
|
||||||
|
dark = "One Dark";
|
||||||
|
};
|
||||||
|
vim_mode = true;
|
||||||
|
ui_font_size = 20;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ with lib;
|
|||||||
set -f
|
set -f
|
||||||
export AWS_SHARED_CREDENTIALS_FILE=${config.age.secrets.cache-credentials.path}
|
export AWS_SHARED_CREDENTIALS_FILE=${config.age.secrets.cache-credentials.path}
|
||||||
export IFS=' '
|
export IFS=' '
|
||||||
|
${getExe config.nix.package} store sign --recursive --key-file "${config.age.secrets.private-cache.path}" "$@"
|
||||||
${getExe config.nix.package} copy --to "s3://binary-cache/?scheme=http&endpoint=nas.home%3A9000&profile=default" "$@"
|
${getExe config.nix.package} copy --to "s3://binary-cache/?scheme=http&endpoint=nas.home%3A9000&profile=default" "$@"
|
||||||
''
|
''
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -41,6 +41,22 @@ func GetNixFlakeOutput() (*NixFlakeOutput, error) {
|
|||||||
return &flakeOutput, nil
|
return &flakeOutput, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetNixHomeManagerOutput() ([]string, error) {
|
||||||
|
cmd := exec.Command("nix", "eval", ".#homeConfigurations", "--apply", "hconf: builtins.filter (name: hconf.${name}.pkgs.hostPlatform.isLinux) (builtins.attrNames hconf)", "--json")
|
||||||
|
output, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var result []string
|
||||||
|
err = json.Unmarshal(output, &result)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
type GitlabCIJob struct {
|
type GitlabCIJob struct {
|
||||||
Stage string `json:"stage"`
|
Stage string `json:"stage"`
|
||||||
Tags []string `json:"tags"`
|
Tags []string `json:"tags"`
|
||||||
@@ -73,12 +89,16 @@ func main() {
|
|||||||
"nix flake check --no-build",
|
"nix flake check --no-build",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
// Since this is kinda a one-off thing, I can use this directly
|
|
||||||
// homeConfigurations are treated like they are not known as a
|
if flakeOutput.HomeConfigurations != nil {
|
||||||
// flake output type. Therefore, it just informs you that it is
|
homeNames, err := GetNixHomeManagerOutput()
|
||||||
// part of the output, but does not evaluate deeper to tell you
|
if err != nil {
|
||||||
// what the name of it is. I will just do this manually for now.
|
panic(err)
|
||||||
pipeline["Build Home config "] = NewGitlabCIJob("homeConfigurations.\"greg\".activationPackage")
|
}
|
||||||
|
for i := range homeNames {
|
||||||
|
pipeline["Build Home Configuration "+homeNames[i]] = NewGitlabCIJob("homeConfigurations.\"" + homeNames[i] +"\".activationPackage")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if flakeOutput.Apps != nil {
|
if flakeOutput.Apps != nil {
|
||||||
for appName := range flakeOutput.Apps {
|
for appName := range flakeOutput.Apps {
|
||||||
|
|||||||
+76
-1
@@ -1 +1,76 @@
|
|||||||
{"en":{"gutenberg":{"name":"gutenberg_en_all_2023-08.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"phet":{"name":"phet_en_all_2023-04.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikibooks":{"name":"wikibooks_en_all_maxi_2021-03.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikipedia":{"name":"wikipedia_en_all_maxi_2024-01.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikisource":{"name":"wikisource_en_all_maxi_2022-09.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikiversity":{"name":"wikiversity_en_all_maxi_2021-03.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wiktionary":{"name":"wiktionary_en_all_nopic_2024-05.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="}},"fr":{"gutenberg":{"name":"gutenberg_fr_all_2023-08.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"phet":{"name":"phet_fr_all_2023-04.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikibooks":{"name":"wikibooks_fr_all_maxi_2024-06.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikipedia":{"name":"wikipedia_fr_all_maxi_2024-05.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikisource":{"name":"wikisource_fr_all_maxi_2022-04.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikiversity":{"name":"wikiversity_fr_all_maxi_2021-02.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wiktionary":{"name":"wiktionary_fr_all_nopic_2024-06.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="}},"ht":{"phet":{"name":"phet_ht_all_2023-04.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikipedia":{"name":"wikipedia_ht_all_maxi_2024-06.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="},"wikisource":{"name":"wikisource_ht_all_maxi_2019-03.zim","hash":"sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="}}}
|
{
|
||||||
|
"en": {
|
||||||
|
"gutenberg": {
|
||||||
|
"name": "gutenberg_en_all_2023-08.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"phet": {
|
||||||
|
"name": "phet_en_all_2023-04.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikibooks": {
|
||||||
|
"name": "wikibooks_en_all_maxi_2021-03.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikipedia": {
|
||||||
|
"name": "wikipedia_en_all_maxi_2024-01.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikisource": {
|
||||||
|
"name": "wikisource_en_all_maxi_2022-09.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikiversity": {
|
||||||
|
"name": "wikiversity_en_all_maxi_2021-03.zim",
|
||||||
|
"hash": "sha256-w/3J2neHPWbz1kK2qR0OB64mkwuDI7RJMuoAWz9yyZs="
|
||||||
|
},
|
||||||
|
"wiktionary": {
|
||||||
|
"name": "wiktionary_en_all_nopic_2024-05.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"fr": {
|
||||||
|
"gutenberg": {
|
||||||
|
"name": "gutenberg_fr_all_2023-08.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"phet": {
|
||||||
|
"name": "phet_fr_all_2023-04.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikibooks": {
|
||||||
|
"name": "wikibooks_fr_all_maxi_2024-06.zim",
|
||||||
|
"hash": "sha256-w/3J2neHPWbz1kK2qR0OB64mkwuDI7RJMuoAWz9yyZs="
|
||||||
|
},
|
||||||
|
"wikipedia": {
|
||||||
|
"name": "wikipedia_fr_all_maxi_2024-05.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikisource": {
|
||||||
|
"name": "wikisource_fr_all_maxi_2022-04.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikiversity": {
|
||||||
|
"name": "wikiversity_fr_all_maxi_2021-02.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wiktionary": {
|
||||||
|
"name": "wiktionary_fr_all_nopic_2024-06.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ht": {
|
||||||
|
"phet": {
|
||||||
|
"name": "phet_ht_all_2023-04.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikipedia": {
|
||||||
|
"name": "wikipedia_ht_all_maxi_2024-06.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
},
|
||||||
|
"wikisource": {
|
||||||
|
"name": "wikisource_ht_all_maxi_2019-03.zim",
|
||||||
|
"hash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user