From b54213cfbbe1d4bc46ec2d797daea0f789ae88e5 Mon Sep 17 00:00:00 2001 From: Sascha Koenig Date: Tue, 1 Jul 2025 15:12:32 +0200 Subject: [PATCH] flake update --- flake.lock | 169 ++++++++++++++------------ flake.nix | 18 +-- home/features/desktop/default.nix | 1 + hosts/common/extraServices/ollama.nix | 1 + hosts/m3-ares/services/default.nix | 9 +- hosts/m3-kratos/configuration.nix | 2 +- hosts/m3-kratos/programs.nix | 2 +- overlays/default.nix | 6 +- 8 files changed, 114 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index eee75c7..8153fb7 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": { @@ -21,50 +21,6 @@ "type": "github" } }, - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736090999, - "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", - "owner": "aylur", - "repo": "ags", - "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735172721, - "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", - "owner": "aylur", - "repo": "astal", - "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -94,11 +50,11 @@ ] }, "locked": { - "lastModified": 1747621015, - "narHash": "sha256-j0fo1rNxZvmFLMaE945UrbLJZAHTlQmq0/QMgOP4GTs=", + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", "owner": "nix-community", "repo": "disko", - "rev": "cec44d77d9dacf0c91d3d51aff128fefabce06ee", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", "type": "github" }, "original": { @@ -123,6 +79,24 @@ "url": "https://code.m3tam3re.com/m3tam3re/dotfiles.git" } }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -151,11 +125,32 @@ ] }, "locked": { - "lastModified": 1747565775, - "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", + "lastModified": 1751549056, + "narHash": "sha256-miKaJ4SFNxhZ/WVDADae2jNd9zka5bV9hKmXspAzvxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", + "rev": "1fa73bb2cc39e250eb01e511ae6ac83bfbf9f38c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "hyprpanel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750798083, + "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", "type": "github" }, "original": { @@ -170,7 +165,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1709914708, @@ -188,15 +183,16 @@ }, "hyprpanel": { "inputs": { - "ags": "ags", + "flake-utils": "flake-utils", + "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1747531721, - "narHash": "sha256-kx7hCuML0sMcjbyjbpplNWsJjLoUfiy23JiS9aG4UWw=", + "lastModified": 1751528316, + "narHash": "sha256-MGJmxnjlERXJLDywrSHYSgpt7fhh3/HOHQboRrxDW64=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "c203ffe80f4e7b68e22ba3fde0598622500f5add", + "rev": "343c9857bd7f1d302d591e8d5f3f9952dc84775b", "type": "github" }, "original": { @@ -226,11 +222,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1747663185, + "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", "type": "github" }, "original": { @@ -289,11 +285,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1747661101, - "narHash": "sha256-vufYvOxdM1TDm8Ak+sxl+rnKOlJpnWkNsau7CjqGrhI=", + "lastModified": 1751560954, + "narHash": "sha256-FHFuZj5oHZRoKPO1B/ske7SYTaMkMlaY/3ccramACFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3fb9306f40ae09b4ddcd0ab4be2ed40e20b61b2d", + "rev": "4dab91c09660994bc989810f0fbce49b480b7913", "type": "github" }, "original": { @@ -305,27 +301,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1747485343, - "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -353,11 +349,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -406,11 +402,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1740132177, - "narHash": "sha256-gNc20APKMefFdH5RONBuHhOps14aiMdgIT0I6RaSN64=", + "lastModified": 1748096947, + "narHash": "sha256-ouuA8LVBXzrbYwPW2vNjh7fC9H2UBud/1tUiIM5vPvM=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "568067f35a85932192bd43ddf64fc05eff850f9f", + "rev": "4b02963d0baf0bee18725cf7c5762b3b3c1392f1", "type": "github" }, "original": { @@ -435,6 +431,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -449,7 +460,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -466,7 +477,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index fa1b62a..00286fa 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-9472de4.url = "github:nixos/nixpkgs/9472de43946f312ab6c82ea25c416217c025c3db"; nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; @@ -125,15 +125,15 @@ }; }; homeConfigurations = { - "m3tam3re@m3-daedalus" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages."x86_64-linux"; - extraSpecialArgs = { - inherit inputs outputs; - hostname = "m3-daedalus"; - }; - modules = [./home/m3tam3re/m3-daedalus.nix]; - }; + "m3tam3re@m3-daedalus" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages."x86_64-linux"; + extraSpecialArgs = { + inherit inputs outputs; + hostname = "m3-daedalus"; }; + modules = [./home/m3tam3re/m3-daedalus.nix]; + }; + }; devShells.x86_64-linux.infraShell = let pkgs = nixpkgs.legacyPackages.x86_64-linux; in diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index 13a8138..913e16a 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -81,6 +81,7 @@ # eww # firefox-devedition file-roller + google-chrome hyprpanel seahorse sushi diff --git a/hosts/common/extraServices/ollama.nix b/hosts/common/extraServices/ollama.nix index 6552f23..bad2bb6 100644 --- a/hosts/common/extraServices/ollama.nix +++ b/hosts/common/extraServices/ollama.nix @@ -22,6 +22,7 @@ in { openFirewall = true; environmentVariables = { OLLAMA_ORIGINS = "https://msty.studio"; + OLLAMA_HOST = "0.0.0.0"; }; }; nixpkgs.config = { diff --git a/hosts/m3-ares/services/default.nix b/hosts/m3-ares/services/default.nix index 5c09611..d4e9149 100644 --- a/hosts/m3-ares/services/default.nix +++ b/hosts/m3-ares/services/default.nix @@ -15,7 +15,14 @@ gvfs.enable = true; trezord.enable = true; gnome.gnome-keyring.enable = true; - qdrant.enable = true; + qdrant = { + enable = true; + settings = { + service = { + host = "0.0.0.0"; + }; + }; + }; upower.enable = true; avahi = { enable = true; diff --git a/hosts/m3-kratos/configuration.nix b/hosts/m3-kratos/configuration.nix index d7a1d2a..dd81f83 100644 --- a/hosts/m3-kratos/configuration.nix +++ b/hosts/m3-kratos/configuration.nix @@ -14,7 +14,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.initrd.kernelModules = ["amdgpu"]; - + boot.kernelPackages = pkgs.linuxPackages_6_14; services.xserver.videoDrivers = ["amdgpu"]; security.polkit.enable = true; security.pam.services.gdm.enableGnomeKeyring = true; diff --git a/hosts/m3-kratos/programs.nix b/hosts/m3-kratos/programs.nix index 81b67a1..eab229d 100644 --- a/hosts/m3-kratos/programs.nix +++ b/hosts/m3-kratos/programs.nix @@ -26,7 +26,7 @@ plugins = with pkgs.obs-studio-plugins; [ obs-composite-blur obs-vaapi - obs-vertical-canvas + # obs-vertical-canvas obs-vkcapture obs-webkitgtk wlrobs diff --git a/overlays/default.nix b/overlays/default.nix index 607044b..2e100de 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,7 +2,7 @@ # This one brings our custom packages from the 'pkgs' directory additions = final: prev: (import ../pkgs {pkgs = final;}) - // (inputs.hyprpanel.overlay final prev) + # // (inputs.hyprpanel.overlay final prev) // {rose-pine-hyprcursor = inputs.rose-pine-hyprcursor.packages.${prev.system}.default;}; # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really. @@ -14,9 +14,9 @@ commandLineArgs = "--password-store=gnome-libsecret"; }; - # OVMF = inputs.nixpkgs-locked.legacyPackages.${prev.system}.OVMF; + nodejs_24 = inputs.nixpkgs-stable.legacyPackages.${prev.system}.nodejs_24; # trezord = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.trezord; - mesa = inputs.nixpkgs-master.legacyPackages.${prev.system}.mesa; + # mesa = inputs.nixpkgs-master.legacyPackages.${prev.system}.mesa; # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: { # version = "latest"; # or whatever version you want # src = final.fetchFromGitHub {