From 00a8d97482333cecb7e088bb254769bbb5813822 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Mon, 21 Sep 2026 12:46:33 +0100 Subject: [PATCH] added nik output montior and nix flake update --- config/hosts/aspects/doloro-desktop/home.nix | 1 + config/hosts/aspects/doloro-shared.nix | 38 +-- config/inputs.nix | 1 + config/modules/fish.nix | 2 +- flake.lock | 239 ++++++++++++++----- flake.nix | 1 + 6 files changed, 198 insertions(+), 84 deletions(-) diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 597dfda..ff61369 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -137,6 +137,7 @@ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 ''; }) + inputs.nix-output-monitor.packages.x86_64-linux.default # prusa-slicer ]; programs.lutris.enable = true; diff --git a/config/hosts/aspects/doloro-shared.nix b/config/hosts/aspects/doloro-shared.nix index cfedefb..f7cfbeb 100644 --- a/config/hosts/aspects/doloro-shared.nix +++ b/config/hosts/aspects/doloro-shared.nix @@ -2,8 +2,10 @@ den, modules, __findFile, + inputs, ... -}: { +}: +{ den.aspects.doloro-shared = { includes = [ modules.nixvim @@ -13,23 +15,25 @@ modules.hyfetch modules.ssh ]; - homeManager = { - pkgs, - lib, - ... - }: { - home = { - username = "doloro"; - homeDirectory = "/home/doloro"; - packages = with pkgs; [ - wl-clipboard - # home-manager - btop - pavucontrol - ]; + homeManager = + { + pkgs, + lib, + ... + }: + { + home = { + username = "doloro"; + homeDirectory = "/home/doloro"; + packages = with pkgs; [ + wl-clipboard + # home-manager + btop + pavucontrol + ]; + }; + programs.home-manager.enable = true; }; - programs.home-manager.enable = true; - }; nixos = { lib, ... }: { boot.kernelModules = [ "ntsync" ]; }; diff --git a/config/inputs.nix b/config/inputs.nix index e9eba45..2f2cd5f 100644 --- a/config/inputs.nix +++ b/config/inputs.nix @@ -9,5 +9,6 @@ nixpkgs-master.url = "github:NixOS/nixpkgs/master"; # Builds from its own locked nixpkgs (electron lib paths pinned to that rev). grimoire.url = "github:Slush97/grimoire"; + nix-output-monitor.url = "git+ssh://git@git.scug.io:/nikkuss/nix-output.git"; }; } diff --git a/config/modules/fish.nix b/config/modules/fish.nix index 1a14986..d6129ee 100644 --- a/config/modules/fish.nix +++ b/config/modules/fish.nix @@ -18,7 +18,7 @@ { home.shell.enableFishIntegration = true; home.packages = [ - pkgs.nix-output-monitor + # pkgs.nix-output-monitor # pkgs.devenv ]; imports = [ inputs.direnv-instant.homeModules.direnv-instant ]; diff --git a/flake.lock b/flake.lock index d819fe8..ae53303 100644 --- a/flake.lock +++ b/flake.lock @@ -169,6 +169,21 @@ "type": "github" } }, + "crane_3": { + "locked": { + "lastModified": 1788465171, + "narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=", + "owner": "ipetkov", + "repo": "crane", + "rev": "eb35abda9f232cc6610b1d1e3200d15c49b7ac54", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "den": { "locked": { "lastModified": 1775551420, @@ -472,6 +487,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" + }, + "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" + } + }, "font-patcher": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -590,11 +623,11 @@ ] }, "locked": { - "lastModified": 1789765459, - "narHash": "sha256-voJJ5IZR4w2149u2Jm/j2zifeWROlpZQ+JzmCQwjgn8=", + "lastModified": 1789978077, + "narHash": "sha256-p/e37FfVifxJQJM7OiiVbUXdpj6eXmOJk34TKLKyYe4=", "owner": "nix-community", "repo": "home-manager", - "rev": "17903129f47656fa4d07e78ad87f6592ff4f2527", + "rev": "a26f7158fbc4aa740fcc7fa79a01e1ed29910bc2", "type": "github" }, "original": { @@ -678,11 +711,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1789814244, - "narHash": "sha256-X8GK0kUU8WAPD4072wafvbcRRtYWiFCSA5Iyz9mr6KU=", + "lastModified": 1789846193, + "narHash": "sha256-au/EHum3tmpRNifYxdzVXa1b39YPc2qomQS6+yI0dRA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5fbb2a7acce2d6f155d18cf5b590fc553a8e7abc", + "rev": "83cf6a6ed540dc37808434259c6a3ba663de9616", "type": "github" }, "original": { @@ -1021,11 +1054,11 @@ ] }, "locked": { - "lastModified": 1786972206, - "narHash": "sha256-vCZgmEwdcBY7PHSMVd1jpnD812dKTSGBwhVEcyoMSlU=", + "lastModified": 1789859680, + "narHash": "sha256-6cDd+boHIT2NxgGPjEayu0iXnGC/zxS4gCR1mfBmxAs=", "ref": "main", - "rev": "16337d91437112608a4ac8c079f1539d58a86d51", - "revCount": 81, + "rev": "c3c5530dd77f2fc63e4ccecd2f6193c19ff34c18", + "revCount": 82, "type": "git", "url": "https://git.scug.io/nikkuss/pkgs.git" }, @@ -1130,16 +1163,37 @@ "type": "github" } }, - "nixos-hardware": { + "nix-output-monitor": { "inputs": { - "nixpkgs": "nixpkgs_9" + "crane": "crane_3", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_9", + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1789752250, - "narHash": "sha256-q0J27mJDfd4BM9a7KcMVbcRmqyU+goQwudbMIu66qsg=", + "lastModified": 1788846781, + "narHash": "sha256-8NO4Fqzv6yMJLr02XPFp87FeKI7s2PBBP8/nW6lQzIw=", + "ref": "refs/heads/main", + "rev": "242197d589096aa96763a03b38b256ad517526ea", + "revCount": 39, + "type": "git", + "url": "ssh://git@git.scug.io/nikkuss/nix-output.git" + }, + "original": { + "type": "git", + "url": "ssh://git@git.scug.io/nikkuss/nix-output.git" + } + }, + "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1789978172, + "narHash": "sha256-FIRXajv1pPZ+l6On6ekkmcQ6le0Zi0ncRUoR3nB0vKA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b2d7d02644f0002535a3bb51a73780945cdc7ba4", + "rev": "9ebcb7766700d7e006d9505247bd7ce0426f4232", "type": "github" }, "original": { @@ -1180,7 +1234,7 @@ "argononed": "argononed", "flake-compat": "flake-compat_3", "nixos-images": "nixos-images", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1785596452, @@ -1200,7 +1254,7 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1789164534, @@ -1265,11 +1319,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1789817736, - "narHash": "sha256-SWmfxW8+8NP4/xHdFrHaHfgYamQEvBYKE5ky2O/VcFM=", + "lastModified": 1789990470, + "narHash": "sha256-DBVGkDZhFPECiCg5CJTihmbAd8dwhemyYsJozVX7138=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6aeb5e890b2f0aa19d796ac91f62f1f257942ab", + "rev": "77b8835ad6aba7377af8920bd8c96dc3e05fe626", "type": "github" }, "original": { @@ -1296,6 +1350,19 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1789546076, + "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1784856561, "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=", @@ -1311,7 +1378,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1789006805, "narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=", @@ -1327,13 +1394,13 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { - "lastModified": 1789684949, - "narHash": "sha256-ZKhUe/2IJUq1JhKxKMu8rbkgSGmPP2ZCqlIPn40aGCM=", + "lastModified": 1789785513, + "narHash": "sha256-B44WL6h0XoLjJ41bUPJk0X5SDinLCII//6EcBLXKiJ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e554fab72f81915600f3f449b786fd9af40439a5", + "rev": "20b1ddd1aa5ace70c9468305030aa4f9ef79671b", "type": "github" }, "original": { @@ -1343,13 +1410,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { - "lastModified": 1789073787, - "narHash": "sha256-xfX/toC2QV707s06GbP4II/TxYF0fNQj7s5/LClNDKc=", + "lastModified": 1789724158, + "narHash": "sha256-nlKgrm0dsVhOSopKheVBCcOpiIticufPPVLdVOI0euA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aff8a0b28396750446e5537a96461bc4facdb287", + "rev": "0a3468a402c449992505b6a9fc5b06580141b750", "type": "github" }, "original": { @@ -1359,7 +1426,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -1375,7 +1442,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1745279238, "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", @@ -1391,7 +1458,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1789149629, "narHash": "sha256-eQUZVehWLDBbpBR2rq6DnuRee1ULT6Y675RhsYDSjYI=", @@ -1515,29 +1582,32 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1789546076, - "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", - "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" + "lastModified": 1788752844, + "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dc5d91f840324650bac8c379428c7037a416959a", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixvim": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_13", - "systems": "systems_6" + "nixpkgs": "nixpkgs_14", + "systems": "systems_7" }, "locked": { - "lastModified": 1789740794, - "narHash": "sha256-c25hFVF7muJOFNfvLWyXZh+W9b5rW7mcZ2tTij1jrP8=", + "lastModified": 1789961561, + "narHash": "sha256-2lRgE8XsmXIVmiujmHVaCy5TrBUSblILNT5vYOj/Ed0=", "owner": "nix-community", "repo": "nixvim", - "rev": "56839cde1c3239470ec38545e8dadc6f9267cc8d", + "rev": "bcb5f577a36565bda07d7b81346b73cad8618d16", "type": "github" }, "original": { @@ -1573,14 +1643,14 @@ }, "omp-nix": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1789758291, - "narHash": "sha256-UYQf7Z7VtkS4hyGyS8t+Dz/1ArN1O/ONSz07QQjCDYU=", + "lastModified": 1789960066, + "narHash": "sha256-2H8WAURLRzX1kFqY56UkzMkpETG7ZnvU2CBYsYTYqLE=", "ref": "main", - "rev": "485f8de54eff3d91c580b9175fbae00f8d642044", - "revCount": 523, + "rev": "dbb679f0f112df7b2eaf98bf0b67395f79f3ff91", + "revCount": 526, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1616,7 +1686,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -1657,10 +1727,11 @@ "niri-flake": "niri-flake", "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-flatpak": "nix-flatpak", + "nix-output-monitor": "nix-output-monitor", "nixos-hardware": "nixos-hardware", "nixos-raspberrypi": "nixos-raspberrypi", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim", "omp-nix": "omp-nix", @@ -1799,6 +1870,27 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "nix-output-monitor", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788765185, + "narHash": "sha256-pp8lb5CrKjmscZbTK34HuCaq18zDU4Q6zlaD5dS+Hi4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ca7f624be3935a5bc46d2c240515491ab8675503", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1806,11 +1898,11 @@ ] }, "locked": { - "lastModified": 1789815532, - "narHash": "sha256-/Ql9UE21iDwOU/JdPV20yZtaMpGf+iD2EhIA1aAi540=", + "lastModified": 1789890976, + "narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "166fc0d3f4fcd0dfc9af102ba8e85fa5dd04e5f7", + "rev": "7214124c20c1542c90deb54af50e2f53ae02711f", "type": "github" }, "original": { @@ -1821,8 +1913,8 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_16", - "systems": "systems_7" + "nixpkgs": "nixpkgs_17", + "systems": "systems_8" }, "locked": { "lastModified": 1789291406, @@ -1851,18 +1943,18 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_8", + "systems": "systems_9", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1787771653, - "narHash": "sha256-DkkJSBOXWV/mja5Vy8az5g1KpZlsbUwlmH0BsQhowaQ=", + "lastModified": 1789937675, + "narHash": "sha256-/F9gQpAlPCxheQ9ht/5Fka2JEr/FfuOh9R7ySa9SAGc=", "owner": "nix-community", "repo": "stylix", - "rev": "5e3809851f486e7fc7e84b40f174c74b60ecc784", + "rev": "abff36bfab11cbdcd0723f41c1b0921e211be6ac", "type": "github" }, "original": { @@ -1947,6 +2039,21 @@ } }, "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { "flake": false, "locked": { "lastModified": 1774449309, @@ -1963,7 +2070,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1978,7 +2085,7 @@ "type": "github" } }, - "systems_8": { + "systems_9": { "locked": { "lastModified": 1774449309, "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", @@ -2121,11 +2228,11 @@ ] }, "locked": { - "lastModified": 1788383708, - "narHash": "sha256-Dbq75c0kcZAC8pmyHSFsRCu80FsAZApJ65E8o3g9bag=", + "lastModified": 1789858068, + "narHash": "sha256-6niO6XI4uassBKTcle/JNMcosAHzvEjfhGGVjkqfvpQ=", "ref": "staging", - "rev": "59e9550924f82ea0b1b1341982247c8ba805073a", - "revCount": 268, + "rev": "a6119a4d2b13287eb49e6ef09fff34439454a28c", + "revCount": 369, "type": "git", "url": "ssh://git@git.scug.io/nikkuss/x1e-staging.git" }, diff --git a/flake.nix b/flake.nix index 284fa6b..d3bf3fd 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,7 @@ }; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + nix-output-monitor.url = "git+ssh://git@git.scug.io:/nikkuss/nix-output.git"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; nixos-wsl.url = "github:nix-community/NixOS-WSL";