From b7118c5a9a6b559e0fc047e2802f1de31eb5d593 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 18 Jul 2024 10:57:13 -0500 Subject: [PATCH] loooooots of updates --- chris/home.nix | 4 +- flake.lock | 76 ++++++++++++++++++----------------- flake.nix | 4 +- modules/base.nix | 11 ++--- modules/localai.nix | 1 - modules/sourcehut.nix | 13 ------ pkgs/base-packages.nix | 2 +- system/shen/configuration.nix | 10 ++++- 8 files changed, 58 insertions(+), 63 deletions(-) delete mode 100644 modules/sourcehut.nix diff --git a/chris/home.nix b/chris/home.nix index 7f639db..0ff9d04 100644 --- a/chris/home.nix +++ b/chris/home.nix @@ -100,9 +100,9 @@ programs.zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; autocd = true; dotDir = ".config/zsh"; shellAliases = { diff --git a/flake.lock b/flake.lock index 0cc74ab..d1fa270 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ ] }, "locked": { - "lastModified": 1671802034, - "narHash": "sha256-mkv2u5nQJEV3KlWiopkt/gMz0OM4nmEXSfzkSw6welQ=", + "lastModified": 1719830626, + "narHash": "sha256-7Wb2KiImYxrrIehtodNG9IvumFtZ2f5DkhrjnUBe7zk=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "e34f0cca15f6f0f2e598dad0b329196d0dab6d4f", + "rev": "37b479006a80a936ac17e82fb2e8c07b822e17f2", "type": "github" }, "original": { @@ -26,12 +26,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -44,20 +47,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1674771519, - "narHash": "sha256-U0W3S1nX6yEvLh3Vq70EORbmXecAKXfmEfCfaA4A+I8=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb4b25b302dbf0f527f190461b080b5262871756", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -70,11 +72,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1673175426, - "narHash": "sha256-kMaXo7VDVZPUoKsJ1aJI2owBsbE4RevFEHoI045bXII=", + "lastModified": 1720159196, + "narHash": "sha256-FrO4fgh+NRhUg/B80pzyz45vco4/OskHe1u8+IREPmc=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "dfeff7b17b0c231fa9d0c7415045547671d980f6", + "rev": "32f72e8f0e7ef780f3d753f56c4b94f1f5106a00", "type": "github" }, "original": { @@ -86,27 +88,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672844754, - "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1672756850, - "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=", + "lastModified": 1720027103, + "narHash": "sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "298add347c2bbce14020fcb54051f517c391196b", + "rev": "61684d356e41c97f80087e89659283d00fe032ab", "type": "github" }, "original": { @@ -118,11 +120,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1674641431, - "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -134,16 +136,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -156,18 +158,18 @@ "nixpkgs-unstable": "nixpkgs-unstable_2" } }, - "utils": { + "systems": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "nix-systems", + "repo": "default", "type": "github" } } diff --git a/flake.nix b/flake.nix index d42fe27..8a47ed6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ inputs = { nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-bitcoin = { diff --git a/modules/base.nix b/modules/base.nix index b7a1162..2d451e5 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -10,7 +10,7 @@ with lib; nix = { extraOptions = "experimental-features = nix-command flakes"; - package = pkgs.nixFlakes; + # package = pkgs.nixFlakes; gc = { automatic = true; dates = "weekly"; @@ -20,7 +20,7 @@ with lib; auto-optimise-store = true; }; }; - nixpkgs.config.allowUnFree = true; + # nixpkgs.config.allowUnFree = true; system.autoUpgrade = { enable = true; @@ -42,8 +42,8 @@ with lib; # Configure keymap in X11 services.xserver = { - layout = "us"; - xkbVariant = ""; + xkb.layout = "us"; + xkb.variant = ""; }; # Enable networking @@ -66,7 +66,8 @@ with lib; programs.fish.enable = true; virtualisation.docker.enable = true; - virtualisation.docker.enableNvidia = true; + # virtualisation.containers.cdi.dynamic.nvidia.enable = true; + hardware.nvidia-container-toolkit.enable = true ; services.openssh.enable = true; services.fstrim.enable = true; diff --git a/modules/localai.nix b/modules/localai.nix index 961a713..1e6da59 100644 --- a/modules/localai.nix +++ b/modules/localai.nix @@ -5,7 +5,6 @@ with lib; virtualisation = { podman = { enable = true; - enableNvidia = true; }; oci-containers = { # backend = "podman"; diff --git a/modules/sourcehut.nix b/modules/sourcehut.nix deleted file mode 100644 index 37560a2..0000000 --- a/modules/sourcehut.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -{ - services.sourcehut = { - enable = true; - todo = { - enable = true; - }; - redis.enable = true; - postgresql.enable = true; - }; -} diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index 5bf8f0a..231de89 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -12,7 +12,7 @@ tmux git samba - exa + eza jq fd bc diff --git a/system/shen/configuration.nix b/system/shen/configuration.nix index 6e6bf17..ec65a4b 100644 --- a/system/shen/configuration.nix +++ b/system/shen/configuration.nix @@ -11,7 +11,8 @@ ../../pkgs/base-packages.nix ../../modules/base.nix ../../modules/localai.nix - ../../modules/sourcehut.nix + ../../modules/forgejo.nix + # ../../pkgs/server.nix # ../../pkgs/ai.nix ]; @@ -61,7 +62,7 @@ cudatoolkit ]; - virtualisation.docker.enableNvidia = true; + # virtualisation.docker.enableNvidia = true; services.samba = { enable = true; @@ -248,10 +249,14 @@ virtualHosts = { "tfcconnection.org".extraConfig = '' encode gzip + handle_path /api* { + reverse_proxy * 127.0.0.1:4242 + } root * /srv/tfcconnection file_server header { Access-Control-Allow-Origin * + Access-Control-Allow-Origin https://api.tfcconnection.org } handle /.well-known/matrix/server { import matrix-well-known-header @@ -313,6 +318,7 @@ header { Access-Control-Allow-Origin https://tfcconnection.org Access-Control-Allow-Headers * + Access-Control-Allow-Methods * } ''; };