From ff27ee7d7ae90d938e98991123edafaa129b5c08 Mon Sep 17 00:00:00 2001 From: Ethan Simmons Date: Wed, 16 Oct 2024 22:31:37 -0500 Subject: [PATCH] Update ankaa --- flake.lock | 24 ++++++++++++------------ flake.nix | 3 ++- hosts/ankaa/system.nix | 2 ++ modules/home/sway.nix | 2 +- modules/nix/school/default.nix | 1 + overlays/llama-cpp.nix | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d7dd06b..087540a 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1728598744, + "narHash": "sha256-sSfvyO5xH3HObHHmh6lp/hcvo7tMjFKd/HXpxyrRnoE=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "342a1d682386d3a1d74f9555cb327f2f311dda6e", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728390103, - "narHash": "sha256-vGSN2vrfi5Nxx93M4w7p5L2VrG0HxlhWciLGI3bjP+U=", + "lastModified": 1728593862, + "narHash": "sha256-1k7iu6OUEX8nRsEiOCr5J7bInMo1h5uHjC+Pcxi54Kk=", "owner": "ggerganov", "repo": "llama.cpp", - "rev": "dca1d4b58a7f1acf1bd253be84e50d6367f492fd", + "rev": "7eee341bee09957139789c2d828995953f0fc7ff", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b7adfbd..05b5bd7 100644 --- a/flake.nix +++ b/flake.nix @@ -114,6 +114,7 @@ networking = { wireguard.enable = true; + firewall.allowedTCPPorts = [ 8080 ]; }; }; } @@ -189,7 +190,7 @@ pkgs = import nixpkgs { inherit system; - overlays = with overlays; [ printrun ]; + overlays = with overlays; [ printrun llama-cpp ]; config.allowUnfree = true; }; diff --git a/hosts/ankaa/system.nix b/hosts/ankaa/system.nix index a3132b9..83a8fe6 100644 --- a/hosts/ankaa/system.nix +++ b/hosts/ankaa/system.nix @@ -20,6 +20,8 @@ localPackages.x86_64-linux.jhelioviewer printrun pciutils + llama-cpp + bottles ]; services.hardware.openrgb.enable = true; diff --git a/modules/home/sway.nix b/modules/home/sway.nix index 8b8827c..dc32d53 100644 --- a/modules/home/sway.nix +++ b/modules/home/sway.nix @@ -192,7 +192,7 @@ in input."type:keyboard" = { xkb_layout = "us,de"; - xkb_options = "grp:shifts_toggle"; + xkb_options = "grp:toggle"; }; output = gui.monitors; diff --git a/modules/nix/school/default.nix b/modules/nix/school/default.nix index ccca6b0..479ba68 100644 --- a/modules/nix/school/default.nix +++ b/modules/nix/school/default.nix @@ -14,6 +14,7 @@ in environment.systemPackages = with pkgs; [ xournalpp libreoffice + anki ] ++ optional cfg.citrix citrix; }; } diff --git a/overlays/llama-cpp.nix b/overlays/llama-cpp.nix index 69f5eaa..4e99a7e 100644 --- a/overlays/llama-cpp.nix +++ b/overlays/llama-cpp.nix @@ -1,4 +1,4 @@ { inputs, ... }: final: prev: { - llama-cpp = inputs.llama-cpp.packages.rocm; + llama-cpp = prev.llama-cpp.override { rocmSupport = true; }; }