From c1fc97a62a403930b89af02b29447145afb38527 Mon Sep 17 00:00:00 2001 From: Nicole Date: Fri, 31 Jul 2026 17:28:36 +0200 Subject: [PATCH] Update --- etc/nixos/configuration.nix | 2 + etc/nixos/flake.lock | 110 ++++++++++++++++----------------- etc/nixos/modules/ollama.nix | 2 +- etc/nixos/modules/programs.nix | 5 +- 4 files changed, 62 insertions(+), 57 deletions(-) diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 5b3cf32..7607100 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -99,6 +99,8 @@ in networking.hostName = "nixos"; networking.networkmanager = { enable = true; + wifi.powersave = false; + wifi.backend = "wpa_supplicant"; plugins = with pkgs; [ networkmanager-openvpn ]; diff --git a/etc/nixos/flake.lock b/etc/nixos/flake.lock index e595633..6476972 100644 --- a/etc/nixos/flake.lock +++ b/etc/nixos/flake.lock @@ -15,11 +15,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1784349630, - "narHash": "sha256-86nkp6r49nQABjJq4Le4xof1zEvSOz5z6H0fNSbQTHk=", + "lastModified": 1785468701, + "narHash": "sha256-nw9ho7BM/qct4YG0lSpaeIyCXQKOqOr6A2ezfwocb3U=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "db927832b986f5d9d6432e96f23fd19a88481ef9", + "rev": "14fd628af2ce1fd56391cbf75ef48494f051e506", "type": "github" }, "original": { @@ -46,11 +46,11 @@ }, "crane": { "locked": { - "lastModified": 1784172867, - "narHash": "sha256-hzzeOgTP0MXMvg4djVwysTDvvUXIpsUCgsA0wPMF/Qk=", + "lastModified": 1785284101, + "narHash": "sha256-ghcXEpYEM4a7pbEkoqbn8c0ptJJqgGzuFiG3T6W5g4I=", "owner": "ipetkov", "repo": "crane", - "rev": "8833b7dc3c7426ce1110ed6fed31b6f63d74f2dc", + "rev": "756d6d07c3818ea95d1e2cdac63fa7d02fe3e61b", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1782900513, - "narHash": "sha256-GHrsl1+ysDFgmDQtQSqWS7TiYD2Q58VlwLvnf1+crJM=", + "lastModified": 1785314864, + "narHash": "sha256-imz9J5iMNersDeQ1ymenFg35N6C2R3MCaGg2i0XCIrE=", "owner": "nix-community", "repo": "fenix", - "rev": "16810aa8f4ad89ca480b1513774e8b6f485fe368", + "rev": "594418b2c9ea0731bee6988236ef5bfd97e81dca", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1783008725, - "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1784431410, - "narHash": "sha256-G671MLe+jUgQWte0S182mDB8vlxfbyY9hH88N5ZjLXU=", + "lastModified": 1785004096, + "narHash": "sha256-8stbyRwnEwPMmni/U6iHGGBbi3uebfq60qlKXPgYwWI=", "owner": "schembriaiden", "repo": "helium-browser-nix-flake", - "rev": "52e6bfd6e6b5eaab2e96095f7d936e5bf6a72f24", + "rev": "b356d11eff33ec730a51f9c88d258fdd72efe587", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1784458980, - "narHash": "sha256-BWFTNPJWS9G1ME7bfjQIb7aWKWKpnjMMU1rlbw8PH/s=", + "lastModified": 1785494453, + "narHash": "sha256-nK6DCmFpPgaHweU2Y8BMxutfTihwXJ2XkxaoMZPBpMQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e40af292a5890c48d51bfa33d3db3d967d41784e", + "rev": "68414146fbe13d8fce7748cf2f4e9e46e4834e2e", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1784456420, - "narHash": "sha256-38yvDuO09V/GG19oJO+B5nn38NhvvZEWKRGFE4WPUi4=", + "lastModified": 1784570726, + "narHash": "sha256-9EMn69JBcFWFgUM7f0VBAX+jBby5b9H3M59U75+5yI4=", "owner": "YaLTeR", "repo": "niri", - "rev": "f036de655d309edc13fef545a3809330796cbe83", + "rev": "7f26c3ee804fb6ed458ef7fb0e3c794f14e0b3bc", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1784255083, - "narHash": "sha256-0Jz8G3+3g6i/l4aISUri0EidLnREelCff0m6+pE6aZg=", + "lastModified": 1784834831, + "narHash": "sha256-yj0LPLnsmYoLmA3FGANjeTEwej0/DHjZBXWnDQDUuIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc51889f81924f15fba77a3c0b79cfb3f78fe0d4", + "rev": "51fe96f9107566e6b8eeb7fc4ba696c01e548b04", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1784356753, - "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", + "lastModified": 1785454630, + "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", + "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", "type": "github" }, "original": { @@ -412,11 +412,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1784120854, - "narHash": "sha256-KesHgItiZPgGX740axSiQLcIQ8D24MDqNpkKYWIek8k=", + "lastModified": 1785318670, + "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "753cc8a3a87467296ddd1fa93f0cc3e81120ee46", + "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5", "type": "github" }, "original": { @@ -444,11 +444,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1784356753, - "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", + "lastModified": 1784796856, + "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "github" }, "original": { @@ -492,11 +492,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1784280462, - "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=", + "lastModified": 1785386831, + "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f", + "rev": "21ea275a7c46aef9d4d6ddc962e6d562e9d94183", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1784356753, - "narHash": "sha256-zupdTm41be2fY8cexroEOGjopl3F2Gqs3gk7ieqaM3s=", - "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", + "lastModified": 1784796856, + "narHash": "sha256-vwxWgF+Gj276WznzGb1LxGsK/39HaQwgQXiU3EkC844=", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1036777.61b7c44c4073/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1040357.e2587caef70c/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -556,11 +556,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1784466057, - "narHash": "sha256-8wGRbcvxH5f+135E5ASBj0cEEhXY7clMsH6dgKLPAew=", + "lastModified": 1785500248, + "narHash": "sha256-MLYBOFucQ8bZ4GiERqz+GckNp96DUSst6ZMix58dvis=", "owner": "sst", "repo": "opencode", - "rev": "78587c141bbac2c60b33c277359ba635b3410750", + "rev": "4087cf1a9706101c69d75b15c70ced5395f0e40a", "type": "github" }, "original": { @@ -604,11 +604,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1782864348, - "narHash": "sha256-NVYhLbaefeIUftPlo3kS6qr0xd8eFJRodEiaHrvFKR4=", + "lastModified": 1785261141, + "narHash": "sha256-sA+DHPejWD68mLA7gtTiHGd5T41F6W+NKf0g+ibFCW4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0d381ca097a8e0375a19387874d952c0a230ac4f", + "rev": "bec66814323579659ffd77c909b3d963af118ece", "type": "github" }, "original": { @@ -646,11 +646,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1784442826, - "narHash": "sha256-oXizZ5p9MdNicgEPw7mkZD0gezVlCbgeG6aAjXpDyHA=", + "lastModified": 1785048222, + "narHash": "sha256-LjFVfwxensz76SjnvofF1Jsw+xTLd8Qp31W0J6nh2XI=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "47c9223179f533174b719a53209aa9ab3e2f4e9c", + "rev": "17e524f330c282d31c32dfe076222d4a12277886", "type": "github" }, "original": { @@ -709,11 +709,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1785360170, + "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", "type": "github" }, "original": { @@ -779,11 +779,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1783895132, - "narHash": "sha256-Dl0Gvrig3EpE962hzF3ETPhUztlfuRhcmlpd8ioHN54=", + "lastModified": 1784679892, + "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a2b5c635d8c8c99b286967658d0d177044887eb8", + "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", "type": "github" }, "original": { diff --git a/etc/nixos/modules/ollama.nix b/etc/nixos/modules/ollama.nix index 03fcc65..384b094 100644 --- a/etc/nixos/modules/ollama.nix +++ b/etc/nixos/modules/ollama.nix @@ -3,7 +3,7 @@ # OLLAMA # services.ollama = { enable = true; - package = pkgs-unstable.ollama-cuda; + #package = ollama-cuda; environmentVariables = { CUDA_VISIBLE_DEVICES = "0"; NVIDIA_VISIBLE_DEVICES = "all"; diff --git a/etc/nixos/modules/programs.nix b/etc/nixos/modules/programs.nix index 6a2db87..2eec64c 100644 --- a/etc/nixos/modules/programs.nix +++ b/etc/nixos/modules/programs.nix @@ -94,7 +94,8 @@ in rofi libnotify wayvnc - (callPackage ./pkgs/xwayland-satellite/default.nix {}) + #(callPackage ./pkgs/xwayland-satellite/default.nix {}) + xwayland-satellite xwayland-run # OFFICE # @@ -104,6 +105,8 @@ in gnome-text-editor gnome-calculator simple-scan + vdirsyncer + khal # MEDIA EDITING # pinta