From b691b02deb1b06388eb2eb86283c4c5e6ea4915a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 22 Jun 2025 13:55:04 +0100 Subject: [PATCH] flake update --- flake.lock | 48 +++++++++---------- hosts/t480/configuration.nix | 6 +-- hosts/t480/modules/ollama.nix | 4 +- .../desktop/browsers/qutebrowser.nix | 4 +- .../home-manager/desktop/media/handbrake.nix | 2 +- modules/nixos/desktop/dwm/default.nix | 2 +- 6 files changed, 34 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 3d740254..71f41f38 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1750033262, - "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749995256, - "narHash": "sha256-LEGfcombb0otUf23oAmYCXR4+lMQKa49XmU0G5HItGI=", + "lastModified": 1750330365, + "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "daa45f10955cc2207ac9c5f0206774d2f757c162", + "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -335,11 +335,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1750094367, - "narHash": "sha256-Z6BX8pWAUo5d/M0xfaENhgkB/k8Vt1WaZI0ExnuRoWI=", + "lastModified": 1750345447, + "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", "owner": "nix-community", "repo": "nixvim", - "rev": "6a054de04dd2b0a3cc5fed1adab8e9f76c050b45", + "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", "type": "github" }, "original": { @@ -355,11 +355,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750083660, - "narHash": "sha256-jOrjhJNRRLA7RnwbqIjAFvV1EM6VUVuvFfgRPz1XhkM=", + "lastModified": 1750585280, + "narHash": "sha256-LQ8fv00SJSZ6xyQtKwe0a41ar62i24Syn1dSjN5JDqg=", "owner": "nix-community", "repo": "NUR", - "rev": "609c86876bb7cd52976c5284a1e530b4d414577b", + "rev": "c8be5504a360a0e917bcd483bef0427b9ec92b04", "type": "github" }, "original": { diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index 0aca1bf9..ff823e95 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -99,11 +99,8 @@ cdrkit cpufrequtils displayselect - dvdbackup - dvdplusrwtools ffmpegthumbnailer gimp - gscan2pdf gtypist hunspellDicts.en-gb-large isync @@ -120,6 +117,9 @@ pmutils shotwell slack + stable.dvdbackup + stable.dvdplusrwtools + stable.gscan2pdf sxiv tailscale ttyper diff --git a/hosts/t480/modules/ollama.nix b/hosts/t480/modules/ollama.nix index 0b37ce99..137ad6b6 100644 --- a/hosts/t480/modules/ollama.nix +++ b/hosts/t480/modules/ollama.nix @@ -1,10 +1,10 @@ { services = { ollama = { - enable = true; + enable = false; acceleration = "rocm"; }; - open-webui.enable = true; + open-webui.enable = false; }; } diff --git a/modules/home-manager/desktop/browsers/qutebrowser.nix b/modules/home-manager/desktop/browsers/qutebrowser.nix index 1cde9851..6f602f9c 100644 --- a/modules/home-manager/desktop/browsers/qutebrowser.nix +++ b/modules/home-manager/desktop/browsers/qutebrowser.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -13,6 +13,8 @@ in programs.qutebrowser = { enable = true; + package = pkgs.stable.qutebrowser; + searchEngines = { dp = "https://www.drupal.org/project/{}"; du = "https://www.drupal.org/u/{}"; diff --git a/modules/home-manager/desktop/media/handbrake.nix b/modules/home-manager/desktop/media/handbrake.nix index 5da7514e..ea7ec42b 100644 --- a/modules/home-manager/desktop/media/handbrake.nix +++ b/modules/home-manager/desktop/media/handbrake.nix @@ -15,7 +15,7 @@ in config = mkIf cfg.enable { home.packages = with pkgs; [ - handbrake + stable.handbrake ]; }; } diff --git a/modules/nixos/desktop/dwm/default.nix b/modules/nixos/desktop/dwm/default.nix index 31c1c999..a58572a6 100644 --- a/modules/nixos/desktop/dwm/default.nix +++ b/modules/nixos/desktop/dwm/default.nix @@ -18,7 +18,7 @@ in dwm-status = { enable = true; - order = [ + settings.order = [ "audio" "battery" "network"