From 36878b901bec685bb35a9d8d35eac3f7ccaf7359 Mon Sep 17 00:00:00 2001 From: Ethan Simmons Date: Wed, 22 Jan 2025 20:03:38 -0600 Subject: [PATCH] Update ankaa --- flake.lock | 61 +++++++++++++++--------------------------- flake.nix | 11 ++++++-- hosts/ankaa/system.nix | 2 +- modules/home/gtk.nix | 2 +- modules/nix/gui.nix | 2 +- 5 files changed, 34 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 1da04dd..2eccf1a 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1731778696, - "narHash": "sha256-qQYeHamLt0z00G5MTSSxaTw/9zGdebEeYj4MDL+nOCI=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "d154a557da07645aaea3b3375317c234cf2eed82", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731763614, - "narHash": "sha256-xdd7zqBfWmPGtGMXe+5jXuc6VfYWFM0vRBt/UCEndcc=", + "lastModified": 1737927932, + "narHash": "sha256-6uDX18AtOqvefiaYyJ6ftyzqlS0mWr7bmLGIQtJtpnY=", "owner": "ggerganov", "repo": "llama.cpp", - "rev": "bcdb7a23862b61aa307fc462fadfe1e2e653d010", + "rev": "caf773f249aa267c78d3da5567b8ab156080ea59", "type": "github" }, "original": { @@ -98,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731652201, - "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=", + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "type": "github" }, "original": { @@ -140,29 +140,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -174,11 +158,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1731763621, + "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "type": "github" }, "original": { @@ -201,15 +185,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1731748189, - "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=", + "lastModified": 1737411508, + "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054", + "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 56af095..af91fdc 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,7 @@ , home-manager-unstable , flake-utils , sops-nix + , llama-cpp , ... }: let @@ -205,13 +206,19 @@ pkgs = import nixpkgs { inherit system; - overlays = with overlays; [ printrun llama-cpp citrix ]; - config.allowUnfree = true; + overlays = with overlays; [ printrun citrix ]; + config = { + allowUnfree = true; + permittedInsecurePackages = [ + "electron-31.7.7" + ]; + }; }; localPackages = pkgs.lib.genAttrs flake-utils.lib.defaultSystems (system: { kickoff-dot-desktop = pkgs.callPackage ./pkgs/kickoff-dot-desktop.nix {}; jhelioviewer = pkgs.callPackage ./pkgs/jhelioviewer.nix {}; + llama-cpp = llama-cpp.packages.${system}.rocm; } ); diff --git a/hosts/ankaa/system.nix b/hosts/ankaa/system.nix index e8ed8aa..f1fe283 100644 --- a/hosts/ankaa/system.nix +++ b/hosts/ankaa/system.nix @@ -18,9 +18,9 @@ environment.systemPackages = with pkgs; [ localPackages.x86_64-linux.jhelioviewer + localPackages.x86_64-linux.llama-cpp printrun pciutils - llama-cpp bottles inkscape orca-slicer diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index be27ff6..80411a6 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -18,7 +18,7 @@ in }; iconTheme = { name = "awaidta-dark"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; }; theme = { name = "adw-gtk3-dark"; diff --git a/modules/nix/gui.nix b/modules/nix/gui.nix index d623bd7..a8be7d6 100644 --- a/modules/nix/gui.nix +++ b/modules/nix/gui.nix @@ -30,7 +30,7 @@ in programs.dconf.enable = mkIf cfg.secrets true; services.gnome.gnome-keyring.enable = mkIf cfg.secrets true; - services.dbus.packages = mkIf cfg.secrets [ pkgs.gnome.seahorse ]; + services.dbus.packages = mkIf cfg.secrets [ pkgs.seahorse ]; # Remove when nixpkgs issue 143365 is fixed security.pam.services.swaylock = mkIf (!cfg.sway.desktop) {};