From 023a0ca9c39aa089fbee20ec68ff7db5a09e0e57 Mon Sep 17 00:00:00 2001 From: pupbrained Date: Mon, 23 Dec 2024 23:59:01 -0500 Subject: [PATCH] suckle --- _sources/generated.json | 23 +- _sources/generated.nix | 8 +- flake.in.nix | 2 +- flake.lock | 479 ++++++++++-------- flake.nix | 2 +- .../marshall@navis/hyprland/default.nix | 15 +- homes/x86_64-linux/marshall@navis/wezterm.lua | 1 - systems/x86_64-linux/navis/default.nix | 4 +- systems/x86_64-linux/navis/facter.json | 211 ++++---- 9 files changed, 395 insertions(+), 350 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 6827524..275f1b7 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -94,21 +94,6 @@ }, "version": "0155b16f102957ec0c734a90979245dc1073f979" }, - "poll": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "poll", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-Weh2+C5v2ORYO8JFYzntpPmJyGseFqArByZwLpX2CCU=", - "type": "url", - "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/poll.patch" - }, - "version": "latest" - }, "replay-fish": { "cargoLocks": null, "date": "2024-07-01", @@ -146,7 +131,7 @@ }, "sddm-theme-minesddm": { "cargoLocks": null, - "date": "2024-12-15", + "date": "2024-12-21", "extract": null, "name": "sddm-theme-minesddm", "passthru": null, @@ -158,11 +143,11 @@ "name": null, "owner": "Davi-S", "repo": "sddm-theme-minesddm", - "rev": "3f6d2c82b181719d95f27366fd7ebc43185b0088", - "sha256": "sha256-lkNUGmWe+R75IFbI/VX4j8c9DJk/QELxCg1D/CIsaAc=", + "rev": "df70f585ca498ccebc469b34e8ef252e0d3cbc5a", + "sha256": "sha256-NfTu+rtrJUhhtCWOzujIhrp9vI+YnEJoE/nBPttaKvY=", "type": "github" }, - "version": "3f6d2c82b181719d95f27366fd7ebc43185b0088" + "version": "df70f585ca498ccebc469b34e8ef252e0d3cbc5a" }, "system-appearance": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 351693e..3a39d81 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -81,15 +81,15 @@ }; sddm-theme-minesddm = { pname = "sddm-theme-minesddm"; - version = "3f6d2c82b181719d95f27366fd7ebc43185b0088"; + version = "df70f585ca498ccebc469b34e8ef252e0d3cbc5a"; src = fetchFromGitHub { owner = "Davi-S"; repo = "sddm-theme-minesddm"; - rev = "3f6d2c82b181719d95f27366fd7ebc43185b0088"; + rev = "df70f585ca498ccebc469b34e8ef252e0d3cbc5a"; fetchSubmodules = false; - sha256 = "sha256-lkNUGmWe+R75IFbI/VX4j8c9DJk/QELxCg1D/CIsaAc="; + sha256 = "sha256-NfTu+rtrJUhhtCWOzujIhrp9vI+YnEJoE/nBPttaKvY="; }; - date = "2024-12-15"; + date = "2024-12-21"; }; system-appearance = { pname = "system-appearance"; diff --git a/flake.in.nix b/flake.in.nix index 2a02874..0a4592b 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -27,7 +27,7 @@ emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git"; hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland"; hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland"; - hyprpanel = mkInput "Jas-SinghFSU/HyprPanel"; + hyprpanel = mkInput "ThomasCarey4/HyprPanel-NixFix"; hyprspace = mkFollowing "KZDKM/Hyprspace" "hyprland"; hypr-dynamic-cursors = mkFollowing "VirtCode/hypr-dynamic-cursors" "hyprland"; impermanence = mkInput "nix-community/impermanence"; diff --git a/flake.lock b/flake.lock index 9887f27..6de5f2c 100644 --- a/flake.lock +++ b/flake.lock @@ -23,19 +23,19 @@ }, "ags": { "inputs": { - "nixpkgs": "nixpkgs_11", - "systems": "systems_6" + "astal": "astal", + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1728326430, - "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", - "owner": "Aylur", + "lastModified": 1734091628, + "narHash": "sha256-8O3i8zESjHVsGzyXb8gEpLztvANq3Ot5bwo60YKJc7k=", + "owner": "aylur", "repo": "ags", - "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", + "rev": "27cd93147aba09142fa585fd16f13c56268b696c", "type": "github" }, "original": { - "owner": "Aylur", + "owner": "aylur", "repo": "ags", "type": "github" } @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1734400729, - "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", + "lastModified": 1734906446, + "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", + "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091", "type": "github" }, "original": { @@ -73,6 +73,46 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "hyprpanel", + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733520119, + "narHash": "sha256-6K07ZJTnFu1xASBCMtVc9cFTbBEauwSc7gGBmjLkLSk=", + "owner": "aylur", + "repo": "astal", + "rev": "4c19d8d06fa25cc6389f37abe8839b4d8be5c0d6", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, + "astal_2": { + "inputs": { + "nixpkgs": "nixpkgs_12" + }, + "locked": { + "lastModified": 1734814417, + "narHash": "sha256-R+tLGIxlaqsOmV52TdXHP0u33q5PdJ77gtiUPK5BbMg=", + "owner": "aylur", + "repo": "astal", + "rev": "3468763d51d389c67ec7b1a390ffa8a5328bddb6", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "base16-schemes": { "flake": false, "locked": { @@ -91,11 +131,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1734624488, - "narHash": "sha256-swNM0LxzIcyQcyK5SE0Q13qs3MOcJR4KL2+bSv2HHpg=", + "lastModified": 1734734291, + "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", "owner": "catppuccin", "repo": "nix", - "rev": "562a0ace199ab59413d5093e31d6745704bd0d11", + "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", "type": "github" }, "original": { @@ -109,14 +149,15 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "nixpkgs-small": "nixpkgs-small" }, "locked": { - "lastModified": 1734619568, - "narHash": "sha256-rYVM0KsGb+zUScfLCHnyxkR+poKOkH5VUKFzPxP1RcY=", + "lastModified": 1734987419, + "narHash": "sha256-2K4V615Y29QhMUShX9k52l7gXF2erkq9yH9qGRZGKQ0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "49af1cfc2787e08814d3b8ce95693364cc86b4bf", + "rev": "d61084b851dbf3072f8b40c3870b0f7938ca3f22", "type": "github" }, "original": { @@ -129,7 +170,7 @@ "codeium": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1733165974, @@ -155,11 +196,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1734620407, - "narHash": "sha256-JarUp0GVny6BwGZaUfIXsSQQcz1w7SGMxgCsJZBdv7U=", + "lastModified": 1735004289, + "narHash": "sha256-cJmBhr59xQXwkvF+EZPhKTebgHyqXoei8u2Qq2QJYzE=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "f6036448ff647e02dcd83f673036ccacbd2922b7", + "rev": "b9bfb93c7632a0e007a3a05fe77c0475d05e045a", "type": "github" }, "original": { @@ -579,7 +620,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1731533236, @@ -615,7 +656,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1701680307, @@ -633,7 +674,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -651,7 +692,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1731533236, @@ -684,7 +725,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1694529238, @@ -702,7 +743,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1726560853, @@ -720,7 +761,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -845,7 +886,7 @@ }, "git-ignore-nix": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1709087332, @@ -864,7 +905,7 @@ }, "git-ignore-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_24" }, "locked": { "lastModified": 1709087332, @@ -972,11 +1013,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -992,11 +1033,11 @@ ] }, "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", + "lastModified": 1734992499, + "narHash": "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=", "owner": "nix-community", "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", + "rev": "f1b1786ea77739dcd181b920d430e30fb1608b8a", "type": "github" }, "original": { @@ -1064,11 +1105,11 @@ ] }, "locked": { - "lastModified": 1734364709, - "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "type": "github" }, "original": { @@ -1093,11 +1134,11 @@ ] }, "locked": { - "lastModified": 1733684019, - "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "lastModified": 1734906236, + "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", "type": "github" }, "original": { @@ -1122,11 +1163,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1734573361, - "narHash": "sha256-rlHkYVDjKXABfAxdcsHnbdZa/0EWE3g/XnR/Ln96rPA=", + "lastModified": 1734988658, + "narHash": "sha256-L1qUns92rVum958hTKOJuU5wEYJdzZUCMGfYCHZ4fsU=", "ref": "refs/heads/main", - "rev": "5b714f05f87831e3e930af04649f853d5efb9902", - "revCount": 5570, + "rev": "2e2e2e2cad97eb017ab02f8a67b751e0abe3bb72", + "revCount": 5584, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1154,11 +1195,11 @@ ] }, "locked": { - "lastModified": 1734533485, - "narHash": "sha256-ysXZgE6H/2LDPYtZEgf23c/ZaYfZDBr0IFOX3Ka+WhM=", + "lastModified": 1734887159, + "narHash": "sha256-boPq+l4/D/Q+MvDqAI79fCdp/3Dit57YBuPbXa1cjW0=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "2bfda39fc841434ffc229327a1ec2e11650c4db8", + "rev": "859b9cd371b4e1bf1043cedc8ab6c514e13ab358", "type": "github" }, "original": { @@ -1208,11 +1249,11 @@ ] }, "locked": { - "lastModified": 1733940128, - "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "lastModified": 1734906472, + "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152", "type": "github" }, "original": { @@ -1237,11 +1278,11 @@ ] }, "locked": { - "lastModified": 1734364628, - "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", + "lastModified": 1734906259, + "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", + "rev": "0404833ea18d543df44df935ebf1b497310eb046", "type": "github" }, "original": { @@ -1253,19 +1294,20 @@ "hyprpanel": { "inputs": { "ags": "ags", - "nixpkgs": "nixpkgs_12" + "astal": "astal_2", + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1733062031, - "narHash": "sha256-cPm3IukRcKZqTgmjL9kh3ZYGoXBD8elaTQ3TFo+W67Q=", - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "rev": "955eed6c60a3ea5d6b0b1b8b7086cffbae984277", + "lastModified": 1734851836, + "narHash": "sha256-gLXlhWmkgu14McpYWxMk/UVW5QYRCEGsDDZN545Lyg8=", + "owner": "ThomasCarey4", + "repo": "HyprPanel-NixFix", + "rev": "48b90040828237ca909bae07cb20414a3e7236cb", "type": "github" }, "original": { - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", + "owner": "ThomasCarey4", + "repo": "HyprPanel-NixFix", "type": "github" } }, @@ -1274,14 +1316,14 @@ "hyprland": [ "hyprland" ], - "systems": "systems_7" + "systems": "systems_6" }, "locked": { - "lastModified": 1733625860, - "narHash": "sha256-YiLUDw14NaavML8y9rxXxO7q+j3b/ghQhBmIy0+/Zmk=", + "lastModified": 1734671517, + "narHash": "sha256-rTKZlNZP13zIy8eyHiTbCN15rON0FG9S8zxRE7jH+Ak=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "e2d561c933cd085d68bf0b39c4f78870ad0abbc2", + "rev": "6d49cb495c3b0364fb6c4b50ab4c04a864aa6c43", "type": "github" }, "original": { @@ -1302,11 +1344,11 @@ ] }, "locked": { - "lastModified": 1734384247, - "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", + "lastModified": 1734796073, + "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", + "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", "type": "github" }, "original": { @@ -1327,11 +1369,11 @@ ] }, "locked": { - "lastModified": 1734384417, - "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", + "lastModified": 1734793513, + "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", + "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61", "type": "github" }, "original": { @@ -1342,11 +1384,11 @@ }, "impermanence": { "locked": { - "lastModified": 1734200366, - "narHash": "sha256-0NursoP4BUdnc+wy+Mq3icHkXu/RgP1Sjo0MJxV2+Dw=", + "lastModified": 1734945620, + "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", "owner": "nix-community", "repo": "impermanence", - "rev": "c6323585fa0035d780e3d8906eb1b24b65d19a48", + "rev": "d000479f4f41390ff7cf9204979660ad5dd16176", "type": "github" }, "original": { @@ -1394,11 +1436,11 @@ ] }, "locked": { - "lastModified": 1734591594, - "narHash": "sha256-7Q4hXE+b9A4DebZ5Q+q3WStuMiWR5bMW0ltpzbY/zMQ=", + "lastModified": 1734725857, + "narHash": "sha256-bivlV9l/UjMtTfz/CZaoNJ5RfH2Lre4P9Ds64conoUQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ce2abe494524cdb389a5d31c11c41834d4362ac5", + "rev": "dbae2fd6adaf34c947d310bec08deac7c4ed265b", "type": "github" }, "original": { @@ -1453,11 +1495,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1734612140, - "narHash": "sha256-8sSHmTQDMaGGUlo9iK+oAgvdyru7qTeUOCS32U11coo=", + "lastModified": 1734988923, + "narHash": "sha256-DmCefR+2CwM0tdtJtpg1114kAwskNhyYyN8xoe/f9sI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "99a53a8074075815200d09a41be3c4ef5ad21ca5", + "rev": "3d268c743b568febe83dc49e926f21b41b6d72d2", "type": "github" }, "original": { @@ -1486,11 +1528,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1734270275, - "narHash": "sha256-FfpxEVDPQ1qSDoLOqnSK2laM6oPklgZhd2YWzxOB8Ns=", + "lastModified": 1734977336, + "narHash": "sha256-5klPkbBmEisNWWwnI4QYSum1syG5RyqBqEKNkHBA1ns=", "owner": "YaLTeR", "repo": "niri", - "rev": "d35ad73e3572b0ac704b0c08928f53d0cfd1951f", + "rev": "955039b5ea07c3fb2ff3278c0543004d86b7dcc7", "type": "github" }, "original": { @@ -1588,11 +1630,11 @@ ] }, "locked": { - "lastModified": 1734234111, - "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", + "lastModified": 1734838217, + "narHash": "sha256-zvMLS8BGn+kMG7tLLT3PJ67/S9yqZ9B7V8hKBa9cRRY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", + "rev": "d583b2d142f0428313df099f4a2dcf2a0496aa78", "type": "github" }, "original": { @@ -1627,7 +1669,7 @@ "nixos-apple-silicon": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1722,13 +1764,29 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-small": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1734838250, + "narHash": "sha256-Xi8ST/QiyuYXc3ujnMYOBuRUaMh6p16XWH6BKARa7xQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "da8a31d09dd004be34b5c54eda83f9a27b357726", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { @@ -1772,27 +1830,27 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1734529975, - "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_10": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -1804,15 +1862,15 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1820,11 +1878,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -1835,6 +1893,22 @@ } }, "nixpkgs_13": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_14": { "locked": { "lastModified": 1733212471, "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", @@ -1850,13 +1924,13 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -1866,7 +1940,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1702346276, "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", @@ -1882,7 +1956,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1734474063, "narHash": "sha256-Yk7+G3aWZpl9dnPBbZievN3htxiONcLXcxwdE9n0mX4=", @@ -1897,7 +1971,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1734119587, "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", @@ -1913,22 +1987,6 @@ "type": "github" } }, - "nixpkgs_18": { - "locked": { - "lastModified": 1733097829, - "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_19": { "locked": { "lastModified": 1733097829, @@ -1947,11 +2005,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -1962,6 +2020,22 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1729265718, "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", @@ -1977,7 +2051,7 @@ "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1666603677, "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", @@ -1991,21 +2065,21 @@ "type": "indirect" } }, - "nixpkgs_22": { - "locked": { - "lastModified": 1734126203, - "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", - "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", - "revCount": 721840, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.721840%2Brev-71a6392e367b08525ee710a93af2e80083b5b3e2/0193d31f-3510-7908-9918-67e1b00081be/source.tar.gz" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_23": { + "locked": { + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", + "revCount": 721840, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.721840%2Brev-71a6392e367b08525ee710a93af2e80083b5b3e2/0193d31f-3510-7908-9918-67e1b00081be/source.tar.gz" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_24": { "locked": { "lastModified": 1666603677, "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", @@ -2019,7 +2093,7 @@ "type": "indirect" } }, - "nixpkgs_24": { + "nixpkgs_25": { "locked": { "lastModified": 1734126203, "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", @@ -2033,13 +2107,13 @@ "type": "indirect" } }, - "nixpkgs_25": { + "nixpkgs_26": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -2143,11 +2217,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -2161,7 +2235,7 @@ "inputs": { "codeium": "codeium", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_17", "nixvim": "nixvim_2", "treefmt-nix": "treefmt-nix_3" }, @@ -2187,7 +2261,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_18", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -2240,11 +2314,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1734379367, - "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -2275,7 +2349,7 @@ "nix-index-database": "nix-index-database", "nixos-apple-silicon": "nixos-apple-silicon", "nixos-facter-modules": "nixos-facter-modules", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "nixvim": "nixvim", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_2", @@ -2293,11 +2367,11 @@ ] }, "locked": { - "lastModified": 1734489114, - "narHash": "sha256-dKBBZr2pw7KDI/7GeiN5qPccqqtvnK2jqAMcMo4rVvU=", + "lastModified": 1734834660, + "narHash": "sha256-bm8V+Cu8rWJA+vKQnc94mXTpSDgvedyoDKxTVi/uJfw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b2e385f8e5c1d7c0d9ce738d650955c2e94555ae", + "rev": "b070e6030118680977bc2388868c4b3963872134", "type": "github" }, "original": { @@ -2487,21 +2561,6 @@ "type": "github" } }, - "systems_14": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2579,16 +2638,16 @@ }, "systems_7": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2664,7 +2723,7 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1733761991, @@ -2682,14 +2741,14 @@ }, "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_20" }, "locked": { - "lastModified": 1734543842, - "narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=", + "lastModified": 1734982074, + "narHash": "sha256-N7M37KP7cHWoXicuE536GrVvU8nMDT/gpI1kja2hkdg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "76159fc74eeac0599c3618e3601ac2b980a29263", + "rev": "e41e948cf097cbf96ba4dff47a30ea6891af9f33", "type": "github" }, "original": { @@ -2700,11 +2759,11 @@ }, "unstable": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -2720,7 +2779,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_21", "rust-overlay": "rust-overlay_3", "zlib": "zlib" }, @@ -2768,11 +2827,11 @@ ] }, "locked": { - "lastModified": 1734422917, - "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", + "lastModified": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "type": "github" }, "original": { @@ -2785,7 +2844,7 @@ "inputs": { "flake-utils": "flake-utils_10", "git-ignore-nix": "git-ignore-nix_2", - "nixpkgs": "nixpkgs_24", + "nixpkgs": "nixpkgs_25", "unstable": "unstable" }, "locked": { @@ -2806,15 +2865,15 @@ "inputs": { "flake-utils": "flake-utils_9", "git-ignore-nix": "git-ignore-nix", - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_23", "xmonad": "xmonad" }, "locked": { - "lastModified": 1732441885, - "narHash": "sha256-SKl/9dmpWpAs30YgQfB7jpdJuUYcPd50SqqUGGaswr0=", + "lastModified": 1734891050, + "narHash": "sha256-3tjdqbF+kOi7vDSrz8iUFDjSOdgB2RiuECu6j3sDY90=", "owner": "xmonad", "repo": "xmonad-contrib", - "rev": "0dc879698def6325352886c3923299cfc951ca8e", + "rev": "d9e54c1b96af4688b3fee934a5685e951ae37569", "type": "github" }, "original": { @@ -2843,11 +2902,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1734112800, - "narHash": "sha256-9qSb6AJpmzV3oYRfsyEt0e9eju6UeXDSD1poeSwadKo=", + "lastModified": 1734745564, + "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "c45c2ed990912c26e6aed0f47bfddb03993d7999", + "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", "type": "github" }, "original": { @@ -2858,17 +2917,17 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_25", + "nixpkgs": "nixpkgs_26", "zen-browser-aarch64": "zen-browser-aarch64", "zen-browser-generic": "zen-browser-generic", "zen-browser-specific": "zen-browser-specific" }, "locked": { - "lastModified": 1734667644, - "narHash": "sha256-vluyzRt6RikEn78Yk0t7Qd96iZZfyRBt4+ESI0mtlhk=", + "lastModified": 1734840442, + "narHash": "sha256-3N2HEvJPq6SQswGAxVKhwgHDQBVr6CKsdb7XZxmlEn0=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "8c8af380bf45b42ae14b2f6d5252be3627332f23", + "rev": "36555afeb6be07e86622b858a0919e4a07038db8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3584aa9..89e1bb6 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ inputs.hyprland.follows = "hyprland"; url = "github:hyprwm/hyprland-plugins"; }; - hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; + hyprpanel.url = "github:ThomasCarey4/HyprPanel-NixFix"; hyprspace = { inputs.hyprland.follows = "hyprland"; url = "github:KZDKM/Hyprspace"; diff --git a/homes/x86_64-linux/marshall@navis/hyprland/default.nix b/homes/x86_64-linux/marshall@navis/hyprland/default.nix index 9c02bfb..f3dc3e1 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/default.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/default.nix @@ -20,7 +20,7 @@ with pkgs; { systemd.variables = ["--all"]; plugins = with inputs; [ - hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors + #hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors hyprspace.packages.${pkgs.system}.default ]; @@ -65,7 +65,7 @@ with pkgs; { modC = "SUPER CTRL"; modS = "SUPER SHIFT"; - browser = "zen-bin"; + browser = "zen"; colorPicker = "notify-send -i gtk-color-picker $(${lib.getExe hyprpicker} -a) 'Copied to clipboard.'"; fileManager = "nautilus"; launcher = "rofi -show drun"; @@ -78,9 +78,14 @@ with pkgs; { dwindle.preserve_split = true; gestures.workspace_swipe = true; - plugin.dynamic-cursors = { - enabled = true; - mode = "rotate"; + # plugin.dynamic-cursors = { + # enabled = true; + # mode = "rotate"; + # }; + + cursor = { + no_hardware_cursors = 0; + use_cpu_buffer = true; }; input.touchpad = { diff --git a/homes/x86_64-linux/marshall@navis/wezterm.lua b/homes/x86_64-linux/marshall@navis/wezterm.lua index 33bae93..44b0451 100644 --- a/homes/x86_64-linux/marshall@navis/wezterm.lua +++ b/homes/x86_64-linux/marshall@navis/wezterm.lua @@ -119,7 +119,6 @@ local config = { font = wezterm.font('Maple Mono NF'), front_end = 'WebGpu', keys = keybinds, - underline_position = -4, use_fancy_tab_bar = false, window_background_opacity = 0.8, window_decorations = 'NONE', diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index e70dacc..d3ce904 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -68,7 +68,7 @@ rtkit.enable = true; pam = { - services.login.enableGnomeKeyring = true; + services.sddm.enableGnomeKeyring = true; loginLimits = [ { @@ -232,7 +232,7 @@ environment = { sessionVariables = { COSMIC_DATA_CONTROL_ENABLED = 1; - BROWSER = "zen-bin"; + BROWSER = "zen"; DIRENV_WARN_TIMEOUT = "100s"; EDITOR = "nvim"; NIXOS_OZONE_WL = 1; diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json index 3cd0fc6..10c89a4 100644 --- a/systems/x86_64-linux/navis/facter.json +++ b/systems/x86_64-linux/navis/facter.json @@ -1078,95 +1078,6 @@ "disk": [ { "index": 42, - "attached_to": 16, - "class_list": [ - "disk", - "block_device", - "nvme" - ], - "bus_type": { - "hex": "0096", - "name": "NVME", - "value": 150 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0106", - "name": "Mass Storage Device", - "value": 262 - }, - "sub_class": { - "hex": "0000", - "name": "Disk", - "value": 0 - }, - "vendor": { - "hex": "144d", - "value": 5197 - }, - "sub_vendor": { - "hex": "144d", - "value": 5197 - }, - "device": { - "hex": "a808", - "name": "Samsung SSD 970 EVO Plus 1TB", - "value": 43016 - }, - "sub_device": { - "hex": "a801", - "value": 43009 - }, - "serial": "S6S1NG0RA02239Z", - "model": "Samsung SSD 970 EVO Plus 1TB", - "sysfs_id": "/class/block/nvme0n1", - "sysfs_bus_id": "nvme0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1b.0/0000:03:00.0/nvme/nvme0", - "unix_device_name": "/dev/nvme0n1", - "unix_device_number": { - "type": 98, - "major": 259, - "minor": 0, - "range": 0 - }, - "unix_device_names": [ - "/dev/disk/by-diskseq/1", - "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z", - "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z_1", - "/dev/disk/by-id/nvme-eui.0025385a1150c740", - "/dev/disk/by-path/pci-0000:03:00.0-nvme-1", - "/dev/nvme0n1" - ], - "resources": [ - { - "type": "disk_geo", - "cylinders": 953869, - "heads": 64, - "sectors": 32, - "size": 0, - "geo_type": "logical" - }, - { - "type": "size", - "unit": "sectors", - "value_1": 1953525168, - "value_2": 512 - } - ], - "driver": "nvme", - "driver_module": "nvme", - "drivers": [ - "nvme" - ], - "driver_modules": [ - "nvme" - ] - }, - { - "index": 43, "attached_to": 21, "class_list": [ "disk", @@ -1180,7 +1091,7 @@ }, "slot": { "bus": 0, - "number": 1 + "number": 0 }, "base_class": { "hex": "0106", @@ -1211,10 +1122,10 @@ }, "serial": "FYA7N020713207841", "model": "HFM512GD3JX013N", - "sysfs_id": "/class/block/nvme1n1", - "sysfs_bus_id": "nvme1", - "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:02:00.0/nvme/nvme1", - "unix_device_name": "/dev/nvme1n1", + "sysfs_id": "/class/block/nvme0n1", + "sysfs_bus_id": "nvme0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:06.0/0000:02:00.0/nvme/nvme0", + "unix_device_name": "/dev/nvme0n1", "unix_device_number": { "type": 98, "major": 259, @@ -1227,7 +1138,7 @@ "/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841_1", "/dev/disk/by-id/nvme-nvme.1c5c-465941374e303230373133323037383431-48464d3531324744334a583031334e-00000001", "/dev/disk/by-path/pci-0000:02:00.0-nvme-1", - "/dev/nvme1n1" + "/dev/nvme0n1" ], "resources": [ { @@ -1253,6 +1164,95 @@ "driver_modules": [ "nvme" ] + }, + { + "index": 43, + "attached_to": 16, + "class_list": [ + "disk", + "block_device", + "nvme" + ], + "bus_type": { + "hex": "0096", + "name": "NVME", + "value": 150 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "144d", + "value": 5197 + }, + "sub_vendor": { + "hex": "144d", + "value": 5197 + }, + "device": { + "hex": "a808", + "name": "Samsung SSD 970 EVO Plus 1TB", + "value": 43016 + }, + "sub_device": { + "hex": "a801", + "value": 43009 + }, + "serial": "S6S1NG0RA02239Z", + "model": "Samsung SSD 970 EVO Plus 1TB", + "sysfs_id": "/class/block/nvme1n1", + "sysfs_bus_id": "nvme1", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1b.0/0000:03:00.0/nvme/nvme1", + "unix_device_name": "/dev/nvme1n1", + "unix_device_number": { + "type": 98, + "major": 259, + "minor": 0, + "range": 0 + }, + "unix_device_names": [ + "/dev/disk/by-diskseq/1", + "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z", + "/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z_1", + "/dev/disk/by-id/nvme-eui.0025385a1150c740", + "/dev/disk/by-path/pci-0000:03:00.0-nvme-1", + "/dev/nvme1n1" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 953869, + "heads": 64, + "sectors": 32, + "size": 0, + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 1953525168, + "value_2": 512 + } + ], + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ] } ], "graphics_card": [ @@ -1589,7 +1589,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.12.5-cachyos xhci-hcd", + "name": "Linux 6.12.6-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1603,7 +1603,7 @@ "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.12.5-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.6-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-0:1.0", "sysfs_bus_id": "3-0:1.0", "resources": [ @@ -1753,7 +1753,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.12.5-cachyos xhci-hcd", + "name": "Linux 6.12.6-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1767,7 +1767,7 @@ "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.12.5-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.6-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb4/4-0:1.0", "sysfs_bus_id": "4-0:1.0", "detail": { @@ -1826,7 +1826,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.12.5-cachyos xhci-hcd", + "name": "Linux 6.12.6-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1840,7 +1840,7 @@ "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.12.5-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.6-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -1909,7 +1909,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.12.5-cachyos xhci-hcd", + "name": "Linux 6.12.6-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1923,7 +1923,7 @@ "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.12.5-cachyos xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.6-cachyos xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:0d.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { @@ -2424,7 +2424,7 @@ { "type": "mem", "base": 0, - "range": 67152105472, + "range": 67152117760, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -5086,9 +5086,6 @@ "range": 1 }, "unix_device_names": [ - "/dev/input/by-id/usb-SteelSeries_SteelSeries_Arctis_7-event-if05", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.3:1.5-event", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.3:1.5-event", "/dev/input/event13" ], "resources": [