diff --git a/_sources/generated.json b/_sources/generated.json index ce3c3a4..257518a 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,182 +1,182 @@ { - "bang-bang": { - "cargoLocks": null, - "date": "2023-07-23", - "extract": null, - "name": "bang-bang", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "oh-my-fish", - "repo": "plugin-bang-bang", - "rev": "ec991b80ba7d4dda7a962167b036efc5c2d79419", - "sha256": "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=", - "type": "github" + "bang-bang": { + "cargoLocks": null, + "date": "2023-07-23", + "extract": null, + "name": "bang-bang", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "oh-my-fish", + "repo": "plugin-bang-bang", + "rev": "ec991b80ba7d4dda7a962167b036efc5c2d79419", + "sha256": "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=", + "type": "github" + }, + "version": "ec991b80ba7d4dda7a962167b036efc5c2d79419" }, - "version": "ec991b80ba7d4dda7a962167b036efc5c2d79419" - }, - "fix-window-role": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "fix-window-role", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=", - "type": "url", - "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch" + "fix-window-role": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "fix-window-role", + "passthru": null, + "pinned": false, + "src": { + "name": null, + "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=", + "type": "url", + "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch" + }, + "version": "latest" }, - "version": "latest" - }, - "git-abbr": { - "cargoLocks": null, - "date": "2023-06-19", - "extract": null, - "name": "git-abbr", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "pupbrained", - "repo": "fish-git-abbr", - "rev": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e", - "sha256": "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=", - "type": "github" + "git-abbr": { + "cargoLocks": null, + "date": "2023-06-19", + "extract": null, + "name": "git-abbr", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "pupbrained", + "repo": "fish-git-abbr", + "rev": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e", + "sha256": "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=", + "type": "github" + }, + "version": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e" }, - "version": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e" - }, - "gityaw": { - "cargoLocks": null, - "date": "2019-01-07", - "extract": null, - "name": "gityaw", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "oh-my-fish", - "repo": "plugin-gityaw", - "rev": "59196560e0f4520db63fb8cab645510377bb8b13", - "sha256": "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=", - "type": "github" + "gityaw": { + "cargoLocks": null, + "date": "2019-01-07", + "extract": null, + "name": "gityaw", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "oh-my-fish", + "repo": "plugin-gityaw", + "rev": "59196560e0f4520db63fb8cab645510377bb8b13", + "sha256": "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=", + "type": "github" + }, + "version": "59196560e0f4520db63fb8cab645510377bb8b13" }, - "version": "59196560e0f4520db63fb8cab645510377bb8b13" - }, - "license": { - "cargoLocks": null, - "date": "2018-10-22", - "extract": null, - "name": "license", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "oh-my-fish", - "repo": "plugin-license", - "rev": "0155b16f102957ec0c734a90979245dc1073f979", - "sha256": "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=", - "type": "github" + "license": { + "cargoLocks": null, + "date": "2018-10-22", + "extract": null, + "name": "license", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "oh-my-fish", + "repo": "plugin-license", + "rev": "0155b16f102957ec0c734a90979245dc1073f979", + "sha256": "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=", + "type": "github" + }, + "version": "0155b16f102957ec0c734a90979245dc1073f979" }, - "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" + "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" }, - "version": "latest" - }, - "replay-fish": { - "cargoLocks": null, - "date": "2024-07-01", - "extract": null, - "name": "replay-fish", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "jorgebucaran", - "repo": "replay.fish", - "rev": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c", - "sha256": "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=", - "type": "github" + "replay-fish": { + "cargoLocks": null, + "date": "2024-07-01", + "extract": null, + "name": "replay-fish", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "jorgebucaran", + "repo": "replay.fish", + "rev": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c", + "sha256": "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=", + "type": "github" + }, + "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c" }, - "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c" - }, - "round-undecorated-frame": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "round-undecorated-frame", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=", - "type": "url", - "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch" + "round-undecorated-frame": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "round-undecorated-frame", + "passthru": null, + "pinned": false, + "src": { + "name": null, + "sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=", + "type": "url", + "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch" + }, + "version": "latest" }, - "version": "latest" - }, - "system-appearance": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "system-appearance", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=", - "type": "url", - "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch" + "system-appearance": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "system-appearance", + "passthru": null, + "pinned": false, + "src": { + "name": null, + "sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=", + "type": "url", + "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch" + }, + "version": "latest" }, - "version": "latest" - }, - "wttr": { - "cargoLocks": null, - "date": "2016-05-23", - "extract": null, - "name": "wttr", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "oh-my-fish", - "repo": "plugin-wttr", - "rev": "7500e382e6b29a463edc57598217ce0cfaf8c90c", - "sha256": "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=", - "type": "github" - }, - "version": "7500e382e6b29a463edc57598217ce0cfaf8c90c" - } -} + "wttr": { + "cargoLocks": null, + "date": "2016-05-23", + "extract": null, + "name": "wttr", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "oh-my-fish", + "repo": "plugin-wttr", + "rev": "7500e382e6b29a463edc57598217ce0cfaf8c90c", + "sha256": "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=", + "type": "github" + }, + "version": "7500e382e6b29a463edc57598217ce0cfaf8c90c" + } +} \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 5a66199..e86c697 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,8 +1,6 @@ # This file was generated by nvfetcher, please do not modify it manually. +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { - fetchurl, - fetchFromGitHub, -}: { bang-bang = { pname = "bang-bang"; version = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; diff --git a/flake.in.nix b/flake.in.nix index 05d6662..14b8c25 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -27,6 +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"; impermanence = mkInput "nix-community/impermanence"; nix-colors = mkInput "Misterio77/nix-colors"; nixos-facter-modules = mkInput "numtide/nixos-facter-modules"; @@ -34,8 +35,10 @@ nixvim = mkInput "pupbrained/nvim-config"; treefmt-nix = mkInput "numtide/treefmt-nix"; xmonad-contrib = mkInput "xmonad/xmonad-contrib"; - zen-browser = mkInput "fufexan/zen-browser-flake"; + wezterm = mkInput "wez/wezterm?dir=nix"; + zen-browser = mkInput "qlexqndru/zen-browser-flake"; + niri = mkFollowingNixpkgs "sodiboo/niri-flake"; cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic"; darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master"; home-manager = mkFollowingNixpkgs "nix-community/home-manager"; @@ -51,6 +54,7 @@ src = ./.; overlays = [ + hyprpanel.overlay snowfall-flake.overlays.default ]; diff --git a/flake.lock b/flake.lock index 1a578e1..49d2af4 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,25 @@ "type": "github" } }, + "ags": { + "inputs": { + "nixpkgs": "nixpkgs_10", + "systems": "systems_6" + }, + "locked": { + "lastModified": 1728326430, + "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", + "owner": "Aylur", + "repo": "ags", + "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -41,11 +60,11 @@ ] }, "locked": { - "lastModified": 1731959031, - "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", + "lastModified": 1734400729, + "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", + "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", "type": "github" }, "original": { @@ -72,11 +91,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1733001911, - "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", + "lastModified": 1734397929, + "narHash": "sha256-VCTVpU/RlrI9StxzDnqc1R3ZTQloLVALSkiN/Fgiad4=", "owner": "catppuccin", "repo": "nix", - "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", + "rev": "21310cde33d3ee8023679dec01a9724a346c63ff", "type": "github" }, "original": { @@ -93,11 +112,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733158806, - "narHash": "sha256-nRFUS2LR0oWxL14kD8wZ7z/ov5Bh0k6sW1+CSW3uLOc=", + "lastModified": 1734346739, + "narHash": "sha256-Um5yY36idRodddotyBaI9sQjw/xw5SV6tt3jPRgL330=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c60cb1640cf0d1e6d573757f0a45f2de6e8badec", + "rev": "7228d7032f0316dbc69b69584ec07707efbd38c9", "type": "github" }, "original": { @@ -110,14 +129,14 @@ "codeium": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1730140831, - "narHash": "sha256-tDKEnPx7mJNybQ4qb2zbCKeLSbHxomN7njr/VClcmZ8=", + "lastModified": 1733165974, + "narHash": "sha256-ijRHGhvvfp7dfkb2/8iT5i2SsdZJzH/r1uh4GnoDz5Y=", "owner": "jcdickinson", "repo": "codeium.nvim", - "rev": "dddaee0d1e9a1d0bcaea66f08a8103b3cdf26604", + "rev": "27d2b1ce8c7ba14dbf6e4504bdea8e5548be5476", "type": "github" }, "original": { @@ -136,11 +155,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733194713, - "narHash": "sha256-zGy98Hs0AUeeHrB1qnohLhOjrBKjA9hTd26QNR5ZI5c=", + "lastModified": 1734404414, + "narHash": "sha256-c/7bsbMcVMb8c4wiLA142ZQfL08U8qYJROGf9NCkfQE=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "9edb4815049cf8d7db652915e0555531abc89fa3", + "rev": "a364e6a5e9eb93253daf93c747b150e31e09b13c", "type": "github" }, "original": { @@ -178,11 +197,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -205,11 +224,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1732231026, - "narHash": "sha256-tuqod7g+1+PvtUXUlLl4MwY9B+gr4rAEOGvhmhtWLbE=", + "lastModified": 1733950326, + "narHash": "sha256-nUTutqzg/Z0eEXrC1ACTa4a9Ik5Iyxgqo8uL9DYib7I=", "owner": "DeterminateSystems", "repo": "determinate", - "rev": "29b7b7dfb1c878267383aa91c357ef464bef0f0d", + "rev": "657395244a854da1bc71e38454958ecd57c0e241", "type": "github" }, "original": { @@ -221,37 +240,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-6E9DFC4lTpjmErG2TvV7rIS1tiyGZZYg0Kd4pT5GOkU=", + "narHash": "sha256-I03XaJRNQHh/N3ea2qpMU78DahTm7tSfF+urRABhKiQ=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-CnbFYAL7dAl8qBIvAFMVjW4KpQgmWlghnK3qfoLEP8Q=", + "narHash": "sha256-yxF7hyInOc+S1BEaxjLBLHUFjSAjC0bRKh0glUt4ilo=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-0w3gbvncDwukX4PHVWeOZeD6F6vsEuePoNOIlAvdEq0=", + "narHash": "sha256-/LPSCwR/ueorahCcyUSVym3y3lnRXkc6pqWwW2T/yT8=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/x86_64-linux" } }, "devshell": { @@ -460,11 +479,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -543,6 +562,24 @@ "type": "github" } }, + "flake-utils_10": { + "inputs": { + "systems": "systems_13" + }, + "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" + } + }, "flake-utils_2": { "inputs": { "systems": "systems_3" @@ -563,7 +600,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1701680307, @@ -581,14 +618,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -599,14 +636,14 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -632,7 +669,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1694529238, @@ -650,14 +687,14 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -668,7 +705,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -702,6 +739,23 @@ "type": "github" } }, + "freetype2": { + "flake": false, + "locked": { + "lastModified": 1687587065, + "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + }, + "original": { + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -722,11 +776,11 @@ ] }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "type": "github" }, "original": { @@ -776,7 +830,7 @@ }, "git-ignore-nix": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1709087332, @@ -795,7 +849,7 @@ }, "git-ignore-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1709087332, @@ -857,6 +911,23 @@ "type": "github" } }, + "harfbuzz": { + "flake": false, + "locked": { + "lastModified": 1711722720, + "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", + "owner": "harfbuzz", + "repo": "harfbuzz", + "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", + "type": "github" + }, + "original": { + "owner": "harfbuzz", + "ref": "8.4.0", + "repo": "harfbuzz", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -886,11 +957,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -906,11 +977,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -928,11 +999,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -957,11 +1028,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734364709, + "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", "type": "github" }, "original": { @@ -970,11 +1041,42 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733684019, + "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -984,11 +1086,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1733157082, - "narHash": "sha256-wbfUls7vwEs00xdGbYn1L8ZOrMS4zhisq9XVwjND/fc=", + "lastModified": 1734456362, + "narHash": "sha256-vjAZEoZIZKGV/djEEBy3jj7GKcAXY2FuC5a4fB3fxOY=", "ref": "refs/heads/main", - "rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888", - "revCount": 5509, + "rev": "5f1df55fcb45a72e92258113685aa9064f6ebf3e", + "revCount": 5561, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1016,11 +1118,11 @@ ] }, "locked": { - "lastModified": 1732053779, - "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=", + "lastModified": 1734455043, + "narHash": "sha256-i4dNTT6yR6Ob2hSMHOShm91zACUGzwMR8cdmIkPHiOY=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991", + "rev": "179fab73cd399982f5d37389fb307497eb65be45", "type": "github" }, "original": { @@ -1054,6 +1156,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733940128, + "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -1070,11 +1201,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1734364628, + "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", "type": "github" }, "original": { @@ -1083,6 +1214,25 @@ "type": "github" } }, + "hyprpanel": { + "inputs": { + "ags": "ags", + "nixpkgs": "nixpkgs_11" + }, + "locked": { + "lastModified": 1733062031, + "narHash": "sha256-cPm3IukRcKZqTgmjL9kh3ZYGoXBD8elaTQ3TFo+W67Q=", + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "rev": "955eed6c60a3ea5d6b0b1b8b7086cffbae984277", + "type": "github" + }, + "original": { + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -1095,11 +1245,11 @@ ] }, "locked": { - "lastModified": 1732288281, - "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", + "lastModified": 1734384247, + "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", + "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", "type": "github" }, "original": { @@ -1120,11 +1270,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1734384417, + "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", "type": "github" }, "original": { @@ -1135,11 +1285,11 @@ }, "impermanence": { "locked": { - "lastModified": 1731242966, - "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", + "lastModified": 1734200366, + "narHash": "sha256-0NursoP4BUdnc+wy+Mq3icHkXu/RgP1Sjo0MJxV2+Dw=", "owner": "nix-community", "repo": "impermanence", - "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", + "rev": "c6323585fa0035d780e3d8906eb1b24b65d19a48", "type": "github" }, "original": { @@ -1187,11 +1337,11 @@ ] }, "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", + "lastModified": 1734162608, + "narHash": "sha256-m2AX+3eiVqIK6uO7GbGY7SFnkkYOlR5fQiNI0eRvWOQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", + "rev": "31bdf4c7c91204d65afbde01146deee0259a8fb7", "type": "github" }, "original": { @@ -1217,18 +1367,93 @@ "type": "github" } }, + "libpng": { + "flake": false, + "locked": { + "lastModified": 1549245649, + "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + }, + "original": { + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + } + }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_4", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1734312634, + "narHash": "sha256-tLTK1YZwELWw5tTXJs6sKb8NRUt+IK/gd4gOKbIfuVw=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "c8feea243604656e98fb9304b7bdad2f214a4cac", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1731483594, + "narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "75c79116a7e40cbc0e110ce0cdd500e896458679", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v0.1.10.1", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1734270275, + "narHash": "sha256-FfpxEVDPQ1qSDoLOqnSK2laM6oPklgZhd2YWzxOB8Ns=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "d35ad73e3572b0ac704b0c08928f53d0cfd1951f", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix": { "inputs": { "nix": "nix_2", "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1730373645, - "narHash": "sha256-y1z53C9+yH1LUCWuouuA0i4vzXEAm8bmK0gyNAY/fyc=", - "rev": "34ca8a4d254e15adfdaaee98aea882511bba01b4", - "revCount": 104, + "lastModified": 1733248733, + "narHash": "sha256-rOFE8TSwWoup+LPNbmtTs6oLy7lYZ12L9GN+aZuQQaA=", + "rev": "98bbabc68ac8c897c2ad873c3557125691c45120", + "revCount": 108, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.10/0192e251-cc5a-7b3c-8339-faf088a24136/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.25.3/01939864-5191-788c-b898-163d916a3333/source.tar.gz" }, "original": { "type": "tarball", @@ -1263,11 +1488,11 @@ ] }, "locked": { - "lastModified": 1731153869, - "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5c74ab862c8070cbf6400128a1b56abb213656da", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -1306,11 +1531,11 @@ ] }, "locked": { - "lastModified": 1733024876, - "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", + "lastModified": 1734234111, + "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", + "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", "type": "github" }, "original": { @@ -1330,16 +1555,16 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1730321079, - "narHash": "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=", - "rev": "597fcc98e18e3178734d06a9e7306250e8cb8d74", - "revCount": 18185, + "lastModified": 1732881227, + "narHash": "sha256-T+wFMm3cj8pGJSwXmPuxG5pz+1gRDJoToF9OBxtzocA=", + "rev": "218cd6c16c0981cc32a45e3a15be1d3c1a68eb85", + "revCount": 18724, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.24.10/0192e247-90bb-7e27-ba8d-f7ee8344a03e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.25.3/01938786-bc70-79e3-b7ee-bb61f8e7f238/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nix/%3D2.24.10" + "url": "https://flakehub.com/f/NixOS/nix/%3D2.25.3" } }, "nixos-facter-modules": { @@ -1422,11 +1647,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { @@ -1468,13 +1693,29 @@ "type": "github" } }, - "nixpkgs_10": { + "nixpkgs-stable_4": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1734202038, + "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -1485,6 +1726,38 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1702346276, "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", @@ -1500,13 +1773,13 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { - "lastModified": 1731287057, - "narHash": "sha256-JHTzkYQOF6756FDqN2EmMN4eysk9UAPDlnFoGoaVEBc=", + "lastModified": 1734474063, + "narHash": "sha256-Yk7+G3aWZpl9dnPBbZievN3htxiONcLXcxwdE9n0mX4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5812399690b88187502ee93b3e3f0856628ba010", + "rev": "86dd3715b283806e773b3cde008baf18dd8a5bf8", "type": "github" }, "original": { @@ -1515,13 +1788,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_15": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -1531,67 +1804,55 @@ "type": "github" } }, - "nixpkgs_14": { - "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_16": { "locked": { - "lastModified": 1666603677, - "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", - "owner": "NixOS", + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_17": { "locked": { - "lastModified": 1732937961, - "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", - "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", - "revCount": 714486, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.714486%2Brev-4703b8d2c708e13a8cab03d865f90973536dcdf5/01937ed6-ab5d-70c6-9cd3-3fdf29985206/source.tar.gz" + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_18": { + "locked": { + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { "locked": { "lastModified": 1666603677, "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", @@ -1605,27 +1866,13 @@ "type": "indirect" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1732937961, - "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", - "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", - "revCount": 714486, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.714486%2Brev-4703b8d2c708e13a8cab03d865f90973536dcdf5/01937ed6-ab5d-70c6-9cd3-3fdf29985206/source.tar.gz" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -1636,6 +1883,48 @@ } }, "nixpkgs_20": { + "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_21": { + "locked": { + "lastModified": 1666603677, + "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "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": 1725634671, "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", @@ -1669,12 +1958,12 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", - "revCount": 636213, + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "revCount": 710194, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.636213%2Brev-64b80bfb316b57cdb8919a9110ef63393d74382a/0192d84c-b6fc-7e39-a326-c46cc00f5b6a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.710194%2Brev-f9f0d5c5380be0a599b1fb54641fa99af8281539/01938be8-64ce-75c6-94d4-dbc2e4d547fe/source.tar.gz" }, "original": { "type": "tarball", @@ -1683,12 +1972,12 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", - "rev": "5083ec887760adfe12af64830a66807423a859a7", - "revCount": 709559, + "lastModified": 1733686850, + "narHash": "sha256-NQEO/nZWWGTGlkBWtCs/1iF1yl2lmQ1oY/8YZrumn3I=", + "rev": "dd51f52372a20a93c219e8216fe528a648ffcbf4", + "revCount": 719099, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.709559%2Brev-5083ec887760adfe12af64830a66807423a859a7/019342ec-4762-77f2-9a11-86e7601b0be4/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.719099%2Brev-dd51f52372a20a93c219e8216fe528a648ffcbf4/0193af12-b91a-77b9-9c72-3172a023752d/source.tar.gz" }, "original": { "type": "tarball", @@ -1745,11 +2034,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -1763,16 +2052,16 @@ "inputs": { "codeium": "codeium", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_14", "nixvim": "nixvim_2", "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1731290794, - "narHash": "sha256-bj8x19+LDyX5zCLWtu6XZxWOTvj76Rbks0MD1alYAWI=", + "lastModified": 1734476113, + "narHash": "sha256-fAG8T/AEUlNTkZZ3EHiWQIOAt31m7N5fytDEcSsh+2I=", "owner": "pupbrained", "repo": "nvim-config", - "rev": "d5a156712e38016f0738444e4d5dc838959502a5", + "rev": "071a816fb2026a78f23cb50cd52de977820d28ae", "type": "github" }, "original": { @@ -1789,16 +2078,16 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_15", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1731281996, - "narHash": "sha256-xdNFY/wcs8i9qluVbTAVh5JLlhI/r4JJfXb0yfEj1Ks=", + "lastModified": 1734472356, + "narHash": "sha256-RIoG3zXarfuHfzM/z/NPjoHHxl3sqYrtEatSLA1/bIk=", "owner": "nix-community", "repo": "nixvim", - "rev": "57068f532d5d42601fd74e2b531204fe1cd3a8f2", + "rev": "4f1fe403b18c45614d6b81423038a34cff371244", "type": "github" }, "original": { @@ -1818,11 +2107,11 @@ ] }, "locked": { - "lastModified": 1731060242, - "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -1842,11 +2131,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1734379367, + "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", "type": "github" }, "original": { @@ -1868,15 +2157,18 @@ "home-manager": "home-manager_3", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", + "hyprpanel": "hyprpanel", "impermanence": "impermanence", + "niri": "niri", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nixos-facter-modules": "nixos-facter-modules", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_12", "nixvim": "nixvim", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_2", "treefmt-nix": "treefmt-nix_4", + "wezterm": "wezterm", "xmonad-contrib": "xmonad-contrib", "zen-browser": "zen-browser" } @@ -1889,11 +2181,32 @@ ] }, "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", + "lastModified": 1734316514, + "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", + "rev": "83ee8ff74d6294a7657320f16814754c4594127b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "wezterm", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729477859, + "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1", "type": "github" }, "original": { @@ -2016,6 +2329,36 @@ "type": "github" } }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_13": { + "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, @@ -2078,16 +2421,16 @@ }, "systems_6": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -2163,11 +2506,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -2178,14 +2521,14 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_16" }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -2196,14 +2539,14 @@ }, "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_17" }, "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -2214,11 +2557,11 @@ }, "unstable": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -2228,6 +2571,32 @@ "type": "github" } }, + "wezterm": { + "inputs": { + "flake-utils": "flake-utils_8", + "freetype2": "freetype2", + "harfbuzz": "harfbuzz", + "libpng": "libpng", + "nixpkgs": "nixpkgs_18", + "rust-overlay": "rust-overlay_2", + "zlib": "zlib" + }, + "locked": { + "dir": "nix", + "lastModified": 1733412933, + "narHash": "sha256-2OPDEgUEh0B6OIcSWtBbkw/zFi8r2VfluLj7FebTaVA=", + "owner": "wez", + "repo": "wezterm", + "rev": "6f375e29a2c4d70b8b51956edd494693196c6692", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "wez", + "repo": "wezterm", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -2256,11 +2625,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1734422917, + "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", "type": "github" }, "original": { @@ -2271,9 +2640,9 @@ }, "xmonad": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "git-ignore-nix": "git-ignore-nix_2", - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_22", "unstable": "unstable" }, "locked": { @@ -2292,9 +2661,9 @@ }, "xmonad-contrib": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "git-ignore-nix": "git-ignore-nix", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_20", "xmonad": "xmonad" }, "locked": { @@ -2311,21 +2680,71 @@ "type": "github" } }, - "zen-browser": { - "inputs": { - "nixpkgs": "nixpkgs_20" - }, + "xwayland-satellite-stable": { + "flake": false, "locked": { - "lastModified": 1732843311, - "narHash": "sha256-Oe3dPaZP8Bv9QdN+yfWrqJo+rq0irlOKx06dohfb4Ak=", - "owner": "fufexan", - "repo": "zen-browser-flake", - "rev": "da03eda0c98adcd8b999a21f8e281e82922b6e0c", + "lastModified": 1730166465, + "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", "type": "github" }, "original": { - "owner": "fufexan", + "owner": "Supreeeme", + "ref": "v0.5", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1734112800, + "narHash": "sha256-9qSb6AJpmzV3oYRfsyEt0e9eju6UeXDSD1poeSwadKo=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "c45c2ed990912c26e6aed0f47bfddb03993d7999", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_23" + }, + "locked": { + "lastModified": 1734250224, + "narHash": "sha256-jK9VT5x0XXsFWVcB5t52h3259y67mYZwiJMwFE9Jvzc=", + "owner": "qlexqndru", "repo": "zen-browser-flake", + "rev": "4fee855ff88b1cba3bf445a94adae15aca53e85d", + "type": "github" + }, + "original": { + "owner": "qlexqndru", + "repo": "zen-browser-flake", + "type": "github" + } + }, + "zlib": { + "flake": false, + "locked": { + "lastModified": 1484501380, + "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", + "owner": "madler", + "repo": "zlib", + "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", + "type": "github" + }, + "original": { + "owner": "madler", + "ref": "v1.2.11", + "repo": "zlib", "type": "github" } } diff --git a/flake.nix b/flake.nix index 3f2b480..12e9a60 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,12 @@ inputs.hyprland.follows = "hyprland"; url = "github:hyprwm/hyprland-plugins"; }; + hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; impermanence.url = "github:nix-community/impermanence"; + niri = { + inputs.nixpkgs.follows = "nixpkgs"; + url = "github:sodiboo/niri-flake"; + }; nix-colors.url = "github:Misterio77/nix-colors"; nix-index-database = { inputs.nixpkgs.follows = "nixpkgs"; @@ -46,8 +51,9 @@ url = "github:snowfallorg/lib/dev"; }; treefmt-nix.url = "github:numtide/treefmt-nix"; + wezterm.url = "github:wez/wezterm?dir=nix"; xmonad-contrib.url = "github:xmonad/xmonad-contrib"; - zen-browser.url = "github:fufexan/zen-browser-flake"; + zen-browser.url = "github:qlexqndru/zen-browser-flake"; }; outputs = inputs: inputs.flakegen ./flake.in.nix inputs; } diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 36e3ec8..075b0af 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -21,6 +21,7 @@ }; colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; + wayland.windowManager.river = { enable = true; systemd.enable = true; @@ -30,8 +31,12 @@ home = { packages = with pkgs; [ + alacritty + fuzzel alejandra beeper + bitwarden-cli + bitwarden-desktop duf eternal-terminal ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs: @@ -72,6 +77,7 @@ libnotify lm_sensors loupe + mullvad-vpn nodejs playerctl prismlauncher @@ -136,6 +142,7 @@ catppuccin = { enable = true; + pointerCursor.enable = true; flavor = "mocha"; accent = "green"; }; diff --git a/homes/x86_64-linux/marshall@navis/hyprland/default.nix b/homes/x86_64-linux/marshall@navis/hyprland/default.nix index 11f32c3..f51b5d2 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/default.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/default.nix @@ -7,6 +7,8 @@ with pkgs; { ]; home.packages = [ + hyprpanel + swww wl-clipboard ]; @@ -15,7 +17,7 @@ with pkgs; { systemd.variables = ["--all"]; settings = let - rofi-clipboard = pkgs.writeScriptBin "rofi-clipboard" '' + rofi-clipboard = pkgs.writeScript "rofi-clipboard" '' tmp_dir="/tmp/cliphist" rm -rf "$tmp_dir" @@ -39,7 +41,7 @@ with pkgs; { cliphist list | gawk "$prog" ''; - scratchpad = pkgs.writeScriptBin "hyprscratchpad" '' + scratchpad = pkgs.writeScript "hyprscratchpad" '' COMMAND=$1 CLASS=$2 WORKSPACE=$3 @@ -55,19 +57,20 @@ with pkgs; { modC = "SUPER CTRL"; modS = "SUPER SHIFT"; - browser = "firefox-nightly"; - colorPicker = "notify-send -i gtk-color-picker $(${hyprpicker}/bin/hyprpicker -a) 'Copied to clipboard.'"; + browser = "zen-bin"; + colorPicker = "notify-send -i gtk-color-picker $(${lib.getExe hyprpicker} -a) 'Copied to clipboard.'"; fileManager = "nautilus"; launcher = "rofi -show drun"; - clipboard = "rofi -modi '   ':${rofi-clipboard}/bin/rofi-clipboard -show '   ' -show-icons"; + clipboard = "rofi -modi '   ':${rofi-clipboard} -show '   ' -show-icons"; terminal = "wezterm"; - screenshot = mode: "${hyprshot}/bin/hyprshot --clipboard-only -m ${mode}"; + screenshot = mode: "${lib.getExe hyprshot} --clipboard-only -m ${mode}"; in { cursor.no_hardware_cursors = true; - decoration.rounding = 10; + decoration.rounding = 5; dwindle.preserve_split = true; gestures.workspace_swipe = true; + input.touchpad = { clickfinger_behavior = true; natural_scroll = true; @@ -75,13 +78,13 @@ with pkgs; { device = [ { - name = "logitech-g502-x-plus"; + name = "logitech-usb-receiver"; sensitivity = -0.5; } ]; windowrule = [ - "float, ^(vesktop)$" + "float, ^(equibop)$" "float, ^(org.telegram.desktop)$" ]; @@ -110,21 +113,21 @@ with pkgs; { gaps_in = 10; resize_on_border = true; - "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; + "col.active_border" = "rgba(a6e3a1ee) rgba(cba6f7ee) 45deg"; "col.inactive_border" = "rgba(595959aa)"; }; exec-once = [ - "${mpvpaper.overrideAttrs { - version = "unstable-2024-07-05"; - src = fetchFromGitHub { - owner = "GhostNaN"; - repo = "mpvpaper"; - rev = "a445391ff7491053fef78e3645eeed934f0c8fae"; - sha256 = "sha256-3wHsUtIkh765EiMnx3BPzztvffIDf1NCqF0I/OATTZ4="; - }; - }}/bin/mpvpaper -vp -o 'no-audio loop' DP-1 ${builtins.toString ./wall.mp4}" - "waybar" + "hyprpanel" + "swww-daemon" + "${writeScript "wallpaper" '' + while : ; do + for file in $(${uutils-coreutils}/bin/uutils-ls ${./walls}/*.jpg | sort -R | tail -1); do + swww img "$file" --transition-fps 165 + sleep 5m + done + done + ''}" ]; misc = { @@ -133,8 +136,6 @@ with pkgs; { }; monitor = [ - "eDP-1, disable" - "Unknown-1, disable" "DP-1, 2560x1440@165, auto, auto" ]; @@ -165,8 +166,8 @@ with pkgs; { "${mod}, Return, exec, ${terminal}" # Scratchpads - "${mod}, d, exec, ${scratchpad}/bin/hyprscratchpad vesktop vesktop vesktop" - "${mod}, t, exec, ${scratchpad}/bin/hyprscratchpad telegram-desktop org.telegram.desktop telegram" + "${mod}, d, exec, ${scratchpad} equibop equibop equibop" + "${mod}, t, exec, ${scratchpad} telegram-desktop org.telegram.desktop telegram" # Screenshots "${modS}, s, exec, ${screenshot "window"}" diff --git a/homes/x86_64-linux/marshall@navis/hyprland/wall.mp4 b/homes/x86_64-linux/marshall@navis/hyprland/wall.mp4 deleted file mode 100644 index a534d73..0000000 Binary files a/homes/x86_64-linux/marshall@navis/hyprland/wall.mp4 and /dev/null differ diff --git a/homes/x86_64-linux/marshall@navis/hyprland/walls/car.jpg b/homes/x86_64-linux/marshall@navis/hyprland/walls/car.jpg new file mode 100644 index 0000000..0ea7a8d Binary files /dev/null and b/homes/x86_64-linux/marshall@navis/hyprland/walls/car.jpg differ diff --git a/homes/x86_64-linux/marshall@navis/hyprland/walls/clouds.jpg b/homes/x86_64-linux/marshall@navis/hyprland/walls/clouds.jpg new file mode 100644 index 0000000..0f503ab Binary files /dev/null and b/homes/x86_64-linux/marshall@navis/hyprland/walls/clouds.jpg differ diff --git a/homes/x86_64-linux/marshall@navis/hyprland/walls/wall-e-upon-the-endless-sky.jpg b/homes/x86_64-linux/marshall@navis/hyprland/walls/wall-e-upon-the-endless-sky.jpg new file mode 100644 index 0000000..60025ba Binary files /dev/null and b/homes/x86_64-linux/marshall@navis/hyprland/walls/wall-e-upon-the-endless-sky.jpg differ diff --git a/homes/x86_64-linux/marshall@navis/hyprland/walls/wallhaven-d6y12l.jpg b/homes/x86_64-linux/marshall@navis/hyprland/walls/wallhaven-d6y12l.jpg new file mode 100644 index 0000000..6f94f2d Binary files /dev/null and b/homes/x86_64-linux/marshall@navis/hyprland/walls/wallhaven-d6y12l.jpg differ diff --git a/homes/x86_64-linux/marshall@navis/hyprland/walls/wallhaven-jxd9p5.png b/homes/x86_64-linux/marshall@navis/hyprland/walls/wallhaven-jxd9p5.png new file mode 100644 index 0000000..4d7f656 Binary files /dev/null and b/homes/x86_64-linux/marshall@navis/hyprland/walls/wallhaven-jxd9p5.png differ diff --git a/homes/x86_64-linux/marshall@navis/hyprland/walls/ytkkbowirm061.jpg b/homes/x86_64-linux/marshall@navis/hyprland/walls/ytkkbowirm061.jpg new file mode 100644 index 0000000..fab6d45 Binary files /dev/null and b/homes/x86_64-linux/marshall@navis/hyprland/walls/ytkkbowirm061.jpg differ diff --git a/homes/x86_64-linux/marshall@navis/wezterm.lua b/homes/x86_64-linux/marshall@navis/wezterm.lua index f302335..33bae93 100644 --- a/homes/x86_64-linux/marshall@navis/wezterm.lua +++ b/homes/x86_64-linux/marshall@navis/wezterm.lua @@ -115,15 +115,15 @@ local config = { enable_kitty_graphics = true, enable_scroll_bar = false, enable_wayland = true, - font_size = 12, - font = wezterm.font('Iosevka Comfy Motion'), + font_size = 10, + 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', warn_about_missing_glyphs = false, - window_background_opacity = 0.8, window_padding = { left = 0, right = 0, top = 0, bottom = 0 }, } diff --git a/modules/home/shell/wezterm.nix b/modules/home/shell/wezterm.nix index 9eebd77..1524f57 100644 --- a/modules/home/shell/wezterm.nix +++ b/modules/home/shell/wezterm.nix @@ -1,3 +1,10 @@ -{...}: { - programs.wezterm.enable = true; +{ + inputs, + pkgs, + ... +}: { + programs.wezterm = { + enable = true; + package = inputs.wezterm.packages.${pkgs.system}.default; + }; } diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index dbf21bb..e9c7976 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -184,34 +184,6 @@ systemd = { tpm2.enable = true; - network.networks = { - "10-lan1" = { - DHCP = "yes"; - matchConfig.MACAddress = "04:42:1a:02:fe:f5"; - - dhcpV4Config.RouteMetric = 10; - dhcpV6Config.RouteMetric = 10; - - networkConfig = { - IPv6PrivacyExtensions = "yes"; - MulticastDNS = true; - }; - }; - - "10-wlan1" = { - DHCP = "yes"; - matchConfig.MACAddress = "64:49:7d:c1:01:10"; - - dhcpV4Config.RouteMetric = 40; - dhcpV6Config.RouteMetric = 40; - - networkConfig = { - IPv6PrivacyExtensions = "yes"; - MulticastDNS = true; - }; - }; - }; - user.extraConfig = let path = lib.concatStringsSep ":" [ "/run/wrappers/bin" @@ -243,7 +215,7 @@ environment = { sessionVariables = { COSMIC_DATA_CONTROL_ENABLED = 1; - BROWSER = "zen"; + BROWSER = "zen-bin"; DIRENV_WARN_TIMEOUT = "100s"; EDITOR = "nvim"; NIXOS_OZONE_WL = 1; @@ -284,7 +256,7 @@ boot = { blacklistedKernelModules = ["nouveau" "i915"]; - kernelPackages = pkgs.linuxPackages_xanmod_latest; + kernelPackages = pkgs.linuxPackages_cachyos; supportedFilesystems = ["btrfs" "ntfs"]; tmp.useTmpfs = true; @@ -297,13 +269,6 @@ emergencyAccess = true; dbus.enable = true; - network = { - enable = true; - networks = { - inherit (config.systemd.network.networks) "10-lan1" "10-wlan1"; - }; - }; - initrdBin = with pkgs; [ iwd nix @@ -441,8 +406,6 @@ gnupg.agent.enable = true; virt-manager.enable = true; - river.enable = true; - appimage = { enable = true; binfmt = true; @@ -466,12 +429,10 @@ networking = { firewall.enable = false; - networkmanager.enable = false; + networkmanager.enable = true; hostName = "navis"; nameservers = ["1.1.1.1" "1.0.0.1"]; useDHCP = lib.mkForce true; - useNetworkd = true; - wireless.iwd.enable = true; }; time = { @@ -484,6 +445,7 @@ flatpak.enable = true; getty.autologinUser = "marshall"; gnome.gnome-keyring.enable = true; + mullvad-vpn.enable = true; openssh.enable = true; spice-vdagentd.enable = true; udisks2.enable = true; @@ -541,6 +503,7 @@ "disk" "gamemode" "libvirtd" + "networkmanager" "qemu-libvirtd" "tss" "wheel" @@ -582,13 +545,11 @@ enable = true; xdgOpenUsePortal = true; - config.common.default = [ - "cosmic" - "gtk" - ]; + config.common.default = "*"; extraPortals = [ pkgs.xdg-desktop-portal-cosmic + pkgs.xdg-desktop-portal-gnome pkgs.xdg-desktop-portal-gtk ]; }; diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json index 9b1d93a..29e642b 100644 --- a/systems/x86_64-linux/navis/facter.json +++ b/systems/x86_64-linux/navis/facter.json @@ -23,8 +23,8 @@ }, "bluetooth": [ { - "index": 55, - "attached_to": 54, + "index": 54, + "attached_to": 53, "class_list": [ "usb", "bluetooth" @@ -102,8 +102,8 @@ "module_alias": "usb:v8087p0032d0000dcE0dsc01dp01icE0isc01ip01in00" }, { - "index": 69, - "attached_to": 54, + "index": 67, + "attached_to": 53, "class_list": [ "usb", "bluetooth" @@ -692,7 +692,7 @@ "camera": [ { "index": 47, - "attached_to": 54, + "attached_to": 53, "class_list": [ "camera", "usb" @@ -792,8 +792,8 @@ "module_alias": "usb:v322Ep202Cd0103dcEFdsc02dp01ic0Eisc01ip00in00" }, { - "index": 59, - "attached_to": 54, + "index": 58, + "attached_to": 53, "class_list": [ "camera", "usb" @@ -1487,7 +1487,7 @@ "hub": [ { "index": 46, - "attached_to": 54, + "attached_to": 53, "class_list": [ "usb", "hub" @@ -1567,7 +1567,7 @@ "module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 54, + "index": 53, "attached_to": 38, "class_list": [ "usb", @@ -1589,7 +1589,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.10-xanmod1 xhci-hcd", + "name": "Linux 6.12.5-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1599,11 +1599,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.11.10-xanmod1 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.5-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": [ @@ -1647,10 +1647,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 56, + "index": 55, "attached_to": 46, "class_list": [ "usb", @@ -1731,7 +1731,7 @@ "module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 60, + "index": 59, "attached_to": 38, "class_list": [ "usb", @@ -1753,7 +1753,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.10-xanmod1 xhci-hcd", + "name": "Linux 6.12.5-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1763,11 +1763,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.11.10-xanmod1 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.5-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": { @@ -1801,10 +1801,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 66, + "index": 65, "attached_to": 19, "class_list": [ "usb", @@ -1826,7 +1826,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.10-xanmod1 xhci-hcd", + "name": "Linux 6.12.5-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1836,11 +1836,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.11.10-xanmod1 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.5-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": [ @@ -1884,10 +1884,10 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0002d0611dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 72, + "index": 69, "attached_to": 19, "class_list": [ "usb", @@ -1909,7 +1909,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.11.10-xanmod1 xhci-hcd", + "name": "Linux 6.12.5-cachyos xhci-hcd", "value": 7531 }, "device": { @@ -1919,11 +1919,11 @@ }, "revision": { "hex": "0000", - "name": "6.11", + "name": "6.12", "value": 0 }, "serial": "0000:00:0d.0", - "model": "Linux 6.11.10-xanmod1 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.5-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": { @@ -1957,13 +1957,231 @@ "drivers": [ "hub" ], - "module_alias": "usb:v1D6Bp0003d0611dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" } ], "keyboard": [ { - "index": 65, - "attached_to": 56, + "index": 48, + "attached_to": 46, + "class_list": [ + "keyboard", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0108", + "name": "Keyboard", + "value": 264 + }, + "sub_class": { + "hex": "0000", + "name": "Keyboard", + "value": 0 + }, + "vendor": { + "hex": "3434", + "name": "Keychron", + "value": 13364 + }, + "device": { + "hex": "d030", + "name": "Keychron Link", + "value": 53296 + }, + "revision": { + "hex": "0000", + "name": "d3.00", + "value": 0 + }, + "model": "Keychron Link", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.1", + "sysfs_bus_id": "3-3.3:1.1", + "unix_device_name": "/dev/input/event5", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 69, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/by-id/usb-Keychron_Keychron_Link-event-if01", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.3:1.1-event", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.3:1.1-event", + "/dev/input/event5" + ], + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "keyboard", + "xkb_rules": "xfree86", + "xkb_model": "pc104" + }, + "module_alias": "usb:v3434pD030dD300dc00dsc00dp00ic03isc01ip01in01" + }, + { + "index": 60, + "attached_to": 46, + "class_list": [ + "keyboard", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0108", + "name": "Keyboard", + "value": 264 + }, + "sub_class": { + "hex": "0000", + "name": "Keyboard", + "value": 0 + }, + "vendor": { + "hex": "3434", + "name": "Keychron", + "value": 13364 + }, + "device": { + "hex": "d030", + "name": "Keychron Link", + "value": 53296 + }, + "revision": { + "hex": "0000", + "name": "d3.00", + "value": 0 + }, + "model": "Keychron Link", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.2", + "sysfs_bus_id": "3-3.3:1.2", + "unix_device_name": "/dev/input/event7", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 71, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/by-id/usb-Keychron_Keychron_Link-if02-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.3:1.2-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.3:1.2-event-kbd", + "/dev/input/event7" + ], + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 2, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "keyboard", + "xkb_rules": "xfree86", + "xkb_model": "pc104" + }, + "module_alias": "usb:v3434pD030dD300dc00dsc00dp00ic03isc01ip01in02" + }, + { + "index": 64, + "attached_to": 55, "class_list": [ "keyboard", "usb" @@ -2005,18 +2223,18 @@ "model": "Logitech USB Receiver", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.1/3-3.2.1:1.1", "sysfs_bus_id": "3-3.2.1:1.1", - "unix_device_name": "/dev/input/event6", + "unix_device_name": "/dev/input/event9", "unix_device_number": { "type": 99, "major": 13, - "minor": 70, + "minor": 73, "range": 1 }, "unix_device_names": [ "/dev/input/by-id/usb-Logitech_USB_Receiver-if01-event-kbd", "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.1:1.1-event-kbd", "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.1:1.1-event-kbd", - "/dev/input/event6" + "/dev/input/event9" ], "resources": [ { @@ -2069,115 +2287,6 @@ "xkb_model": "pc104" }, "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip01in01" - }, - { - "index": 68, - "attached_to": 54, - "class_list": [ - "keyboard", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0108", - "name": "Keyboard", - "value": 264 - }, - "sub_class": { - "hex": "0000", - "name": "Keyboard", - "value": 0 - }, - "vendor": { - "hex": "3434", - "name": "Keychron", - "value": 13364 - }, - "device": { - "hex": "0260", - "name": "Keychron K6 Pro", - "value": 608 - }, - "revision": { - "hex": "0000", - "name": "1.01", - "value": 0 - }, - "model": "Keychron K6 Pro", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.0", - "sysfs_bus_id": "3-2:1.0", - "unix_device_name": "/dev/input/event2", - "unix_device_number": { - "type": 99, - "major": 13, - "minor": 66, - "range": 1 - }, - "unix_device_names": [ - "/dev/input/by-id/usb-Keychron_Keychron_K6_Pro-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:2:1.0-event-kbd", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:2:1.0-event-kbd", - "/dev/input/event2" - ], - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 1, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "driver_info": { - "type": "keyboard", - "xkb_rules": "xfree86", - "xkb_model": "pc104" - }, - "module_alias": "usb:v3434p0260d0101dc00dsc00dp00ic03isc01ip01in00" } ], "memory": [ @@ -2202,7 +2311,7 @@ { "type": "mem", "base": 0, - "range": 67158851584, + "range": 67152125952, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -2393,8 +2502,8 @@ ], "mouse": [ { - "index": 53, - "attached_to": 56, + "index": 52, + "attached_to": 55, "class_list": [ "mouse", "usb" @@ -2448,6 +2557,127 @@ "unix_device_names": [ "/dev/input/mice" ], + "unix_device_name2": "/dev/input/mouse1", + "unix_device_number2": { + "type": 99, + "major": 13, + "minor": 33, + "range": 1 + }, + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 2, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "mouse", + "db_entry_0": [ + "explorerps/2", + "exps2" + ], + "xf86": "explorerps/2", + "gpm": "exps2", + "buttons": -1, + "wheels": -1 + }, + "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip02in00" + }, + { + "index": 62, + "attached_to": 46, + "class_list": [ + "mouse", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0105", + "name": "Mouse", + "value": 261 + }, + "sub_class": { + "hex": "0003", + "name": "USB Mouse", + "value": 3 + }, + "vendor": { + "hex": "3434", + "name": "Keychron", + "value": 13364 + }, + "device": { + "hex": "d030", + "name": "Keychron Link", + "value": 53296 + }, + "revision": { + "hex": "0000", + "name": "d3.00", + "value": 0 + }, + "compat_vendor": "Unknown", + "compat_device": "Generic USB Mouse", + "model": "Keychron Link", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.0", + "sysfs_bus_id": "3-3.3:1.0", + "unix_device_name": "/dev/input/mice", + "unix_device_number": { + "type": 99, + "major": 13, + "minor": 63, + "range": 1 + }, + "unix_device_names": [ + "/dev/input/mice" + ], "unix_device_name2": "/dev/input/mouse0", "unix_device_number2": { "type": 99, @@ -2511,131 +2741,10 @@ "buttons": -1, "wheels": -1 }, - "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc01ip02in00" + "module_alias": "usb:v3434pD030dD300dc00dsc00dp00ic03isc01ip02in00" }, { - "index": 64, - "attached_to": 54, - "class_list": [ - "mouse", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0105", - "name": "Mouse", - "value": 261 - }, - "sub_class": { - "hex": "0003", - "name": "USB Mouse", - "value": 3 - }, - "vendor": { - "hex": "3434", - "name": "Keychron", - "value": 13364 - }, - "device": { - "hex": "0260", - "name": "Keychron K6 Pro", - "value": 608 - }, - "revision": { - "hex": "0000", - "name": "1.01", - "value": 0 - }, - "compat_vendor": "Unknown", - "compat_device": "Generic USB Mouse", - "model": "Keychron K6 Pro", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.2", - "sysfs_bus_id": "3-2:1.2", - "unix_device_name": "/dev/input/mice", - "unix_device_number": { - "type": 99, - "major": 13, - "minor": 63, - "range": 1 - }, - "unix_device_names": [ - "/dev/input/mice" - ], - "unix_device_name2": "/dev/input/mouse1", - "unix_device_number2": { - "type": 99, - "major": 13, - "minor": 33, - "range": 1 - }, - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 2, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "driver_info": { - "type": "mouse", - "db_entry_0": [ - "explorerps/2", - "exps2" - ], - "xf86": "explorerps/2", - "gpm": "exps2", - "buttons": -1, - "wheels": -1 - }, - "module_alias": "usb:v3434p0260d0101dc00dsc00dp00ic03isc00ip00in02" - }, - { - "index": 77, + "index": 75, "attached_to": 0, "bus_type": { "hex": "0081", @@ -2660,9 +2769,9 @@ "hex": "307a", "value": 12410 }, - "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN1203:00/0018:04F3:307A.0009/input/input27", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN1203:00/0018:04F3:307A.000A/input/input25", "unix_device_names": [ - "/dev/input/event24", + "/dev/input/event22", "/dev/input/ + handler" ] } @@ -2832,9 +2941,9 @@ "sysfs_id": "/devices/pci0000:00/0000:00:1c.0/0000:04:00.0", "sysfs_bus_id": "0000:04:00.0", "sysfs_iommu_group_id": 18, - "unix_device_name": "wlan0", + "unix_device_name": "wlp4s0", "unix_device_names": [ - "wlan0" + "wlp4s0" ], "resources": [ { @@ -2964,7 +3073,49 @@ ], "network_interface": [ { - "index": 74, + "index": 72, + "attached_to": 36, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0001", + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/wlp4s0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:04:00.0", + "unix_device_name": "wlp4s0", + "unix_device_names": [ + "wlp4s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 54 + }, + { + "type": "phwaddr", + "address": 54 + } + ], + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ] + }, + { + "index": 73, "attached_to": 32, "class_list": [ "network_interface" @@ -3006,7 +3157,7 @@ ] }, { - "index": 75, + "index": 74, "attached_to": 0, "class_list": [ "network_interface" @@ -3027,48 +3178,6 @@ "unix_device_names": [ "lo" ] - }, - { - "index": 76, - "attached_to": 36, - "class_list": [ - "network_interface" - ], - "base_class": { - "hex": "0107", - "name": "Network Interface", - "value": 263 - }, - "sub_class": { - "hex": "000a", - "name": "WLAN", - "value": 10 - }, - "model": "WLAN network interface", - "sysfs_id": "/class/net/wlan0", - "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:04:00.0", - "unix_device_name": "wlan0", - "unix_device_names": [ - "wlan0" - ], - "resources": [ - { - "type": "hwaddr", - "address": 54 - }, - { - "type": "phwaddr", - "address": 54 - } - ], - "driver": "iwlwifi", - "driver_module": "iwlwifi", - "drivers": [ - "iwlwifi" - ], - "driver_modules": [ - "iwlwifi" - ] } ], "pci": [ @@ -3898,9 +4007,99 @@ ], "module_alias": "pci:v000010DEd00002291sv00001043sd000013FCbc04sc03i00" }, + { + "index": 44, + "attached_to": 55, + "class_list": [ + "sound", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0004", + "name": "Multimedia controller", + "value": 4 + }, + "sub_class": { + "hex": "0001", + "name": "Multimedia audio controller", + "value": 1 + }, + "vendor": { + "hex": "3142", + "value": 12610 + }, + "device": { + "hex": "a008", + "name": "fifine Microphone", + "value": 40968 + }, + "revision": { + "hex": "0000", + "name": "1.00", + "value": 0 + }, + "model": "fifine Microphone", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.4/3-3.2.4:1.0", + "sysfs_bus_id": "3-3.2.4:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "snd-usb-audio", + "driver_module": "snd_usb_audio", + "drivers": [ + "snd-usb-audio" + ], + "driver_modules": [ + "snd_usb_audio" + ], + "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc01ip00in00" + }, { "index": 49, - "attached_to": 56, + "attached_to": 55, "class_list": [ "sound", "usb" @@ -3991,7 +4190,7 @@ }, { "index": 51, - "attached_to": 56, + "attached_to": 55, "class_list": [ "sound", "usb" @@ -4082,7 +4281,7 @@ }, { "index": 57, - "attached_to": 54, + "attached_to": 55, "class_list": [ "sound", "usb" @@ -4121,8 +4320,8 @@ "value": 0 }, "model": "fifine Microphone", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.2", - "sysfs_bus_id": "3-1:1.2", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.4/3-3.2.4:1.1", + "sysfs_bus_id": "3-3.2.4:1.1", "resources": [ { "type": "baud", @@ -4156,7 +4355,7 @@ "value": 2 }, "interface_protocol": 0, - "interface_number": 2, + "interface_number": 1, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -4168,101 +4367,11 @@ "driver_modules": [ "snd_usb_audio" ], - "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in02" + "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in01" }, { - "index": 58, - "attached_to": 54, - "class_list": [ - "sound", - "usb" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0004", - "name": "Multimedia controller", - "value": 4 - }, - "sub_class": { - "hex": "0001", - "name": "Multimedia audio controller", - "value": 1 - }, - "vendor": { - "hex": "3142", - "value": 12610 - }, - "device": { - "hex": "a008", - "name": "fifine Microphone", - "value": 40968 - }, - "revision": { - "hex": "0000", - "name": "1.00", - "value": 0 - }, - "model": "fifine Microphone", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0", - "sysfs_bus_id": "3-1:1.0", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_subclass": { - "hex": "0001", - "name": "audio", - "value": 1 - }, - "interface_protocol": 0, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "snd-usb-audio", - "driver_module": "snd_usb_audio", - "drivers": [ - "snd-usb-audio" - ], - "driver_modules": [ - "snd_usb_audio" - ], - "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc01ip00in00" - }, - { - "index": 62, - "attached_to": 56, + "index": 61, + "attached_to": 55, "class_list": [ "sound", "usb" @@ -4353,7 +4462,7 @@ }, { "index": 63, - "attached_to": 56, + "attached_to": 55, "class_list": [ "sound", "usb" @@ -4443,8 +4552,8 @@ "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in02" }, { - "index": 67, - "attached_to": 56, + "index": 66, + "attached_to": 55, "class_list": [ "sound", "usb" @@ -4534,8 +4643,8 @@ "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc01ip00in00" }, { - "index": 71, - "attached_to": 54, + "index": 68, + "attached_to": 55, "class_list": [ "sound", "usb" @@ -4574,8 +4683,8 @@ "value": 0 }, "model": "fifine Microphone", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1", - "sysfs_bus_id": "3-1:1.1", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.4/3-3.2.4:1.2", + "sysfs_bus_id": "3-3.2.4:1.2", "resources": [ { "type": "baud", @@ -4609,7 +4718,7 @@ "value": 2 }, "interface_protocol": 0, - "interface_number": 1, + "interface_number": 2, "interface_alternate_setting": 0 }, "hotplug": "usb", @@ -4621,7 +4730,7 @@ "driver_modules": [ "snd_usb_audio" ], - "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in01" + "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in02" } ], "storage_controller": [ @@ -4812,93 +4921,9 @@ "form_factor": "laptop" }, "usb": [ - { - "index": 44, - "attached_to": 46, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "045e", - "name": "Microsoft", - "value": 1118 - }, - "device": { - "hex": "0b12", - "name": "Controller", - "value": 2834 - }, - "revision": { - "hex": "0000", - "name": "5.0d", - "value": 0 - }, - "serial": "3039565836353439313237313235", - "model": "Microsoft Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.2", - "sysfs_bus_id": "3-3.1:1.2", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "00ff", - "name": "vendor_spec", - "value": 255 - }, - "device_subclass": { - "hex": "0047", - "name": "UsbClass(71)", - "value": 71 - }, - "device_protocol": 208, - "interface_class": { - "hex": "00ff", - "name": "vendor_spec", - "value": 255 - }, - "interface_subclass": { - "hex": "0047", - "name": "UsbClass(71)", - "value": 71 - }, - "interface_protocol": 208, - "interface_number": 2, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in02" - }, { "index": 45, - "attached_to": 56, + "attached_to": 55, "class_list": [ "usb", "unknown" @@ -4940,18 +4965,18 @@ "model": "SteelSeries Arctis 7", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.3/3-3.2.3:1.5", "sysfs_bus_id": "3-3.2.3:1.5", - "unix_device_name": "/dev/input/event9", + "unix_device_name": "/dev/input/event11", "unix_device_number": { "type": 99, "major": 13, - "minor": 73, + "minor": 75, "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/event9" + "/dev/input/event11" ], "resources": [ { @@ -5000,114 +5025,9 @@ ], "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic03isc00ip00in05" }, - { - "index": 48, - "attached_to": 46, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "045e", - "name": "Microsoft", - "value": 1118 - }, - "device": { - "hex": "0b12", - "name": "Controller", - "value": 2834 - }, - "revision": { - "hex": "0000", - "name": "5.0d", - "value": 0 - }, - "serial": "3039565836353439313237313235", - "model": "Microsoft Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.0", - "sysfs_bus_id": "3-3.1:1.0", - "unix_device_name": "/dev/input/event17", - "unix_device_number": { - "type": 99, - "major": 13, - "minor": 81, - "range": 1 - }, - "unix_device_names": [ - "/dev/input/by-id/usb-Microsoft_Controller_3039565836353439313237313235-event-joystick", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.1:1.0-event-joystick", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.1:1.0-event-joystick", - "/dev/input/event17" - ], - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "00ff", - "name": "vendor_spec", - "value": 255 - }, - "device_subclass": { - "hex": "0047", - "name": "UsbClass(71)", - "value": 71 - }, - "device_protocol": 208, - "interface_class": { - "hex": "00ff", - "name": "vendor_spec", - "value": 255 - }, - "interface_subclass": { - "hex": "0047", - "name": "UsbClass(71)", - "value": 71 - }, - "interface_protocol": 208, - "interface_number": 0, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "xpad", - "driver_module": "xpad", - "drivers": [ - "xpad" - ], - "driver_modules": [ - "xpad" - ], - "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in00" - }, { "index": 50, - "attached_to": 56, + "attached_to": 55, "class_list": [ "usb", "unknown" @@ -5197,183 +5117,8 @@ "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc00ip00in02" }, { - "index": 52, - "attached_to": 54, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "3434", - "name": "Keychron", - "value": 13364 - }, - "device": { - "hex": "0260", - "name": "Keychron K6 Pro", - "value": 608 - }, - "revision": { - "hex": "0000", - "name": "1.01", - "value": 0 - }, - "model": "Keychron K6 Pro", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-2/3-2:1.1", - "sysfs_bus_id": "3-2:1.1", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "device_protocol": 0, - "interface_class": { - "hex": "0003", - "name": "hid", - "value": 3 - }, - "interface_subclass": { - "hex": "0000", - "name": "per_interface", - "value": 0 - }, - "interface_protocol": 0, - "interface_number": 1, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "driver": "usbhid", - "driver_module": "usbhid", - "drivers": [ - "usbhid" - ], - "driver_modules": [ - "usbhid" - ], - "module_alias": "usb:v3434p0260d0101dc00dsc00dp00ic03isc00ip00in01" - }, - { - "index": 61, - "attached_to": 46, - "class_list": [ - "usb", - "unknown" - ], - "bus_type": { - "hex": "0086", - "name": "USB", - "value": 134 - }, - "slot": { - "bus": 0, - "number": 0 - }, - "base_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "sub_class": { - "hex": "0000", - "name": "Unclassified device", - "value": 0 - }, - "vendor": { - "hex": "045e", - "name": "Microsoft", - "value": 1118 - }, - "device": { - "hex": "0b12", - "name": "Controller", - "value": 2834 - }, - "revision": { - "hex": "0000", - "name": "5.0d", - "value": 0 - }, - "serial": "3039565836353439313237313235", - "model": "Microsoft Controller", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.1/3-3.1:1.1", - "sysfs_bus_id": "3-3.1:1.1", - "resources": [ - { - "type": "baud", - "speed": 12000000, - "bits": 0, - "stop_bits": 0, - "parity": 0, - "handshake": 0 - } - ], - "detail": { - "device_class": { - "hex": "00ff", - "name": "vendor_spec", - "value": 255 - }, - "device_subclass": { - "hex": "0047", - "name": "UsbClass(71)", - "value": 71 - }, - "device_protocol": 208, - "interface_class": { - "hex": "00ff", - "name": "vendor_spec", - "value": 255 - }, - "interface_subclass": { - "hex": "0047", - "name": "UsbClass(71)", - "value": 71 - }, - "interface_protocol": 208, - "interface_number": 1, - "interface_alternate_setting": 0 - }, - "hotplug": "usb", - "module_alias": "usb:v045Ep0B12d050DdcFFdsc47dpD0icFFisc47ipD0in01" - }, - { - "index": 70, - "attached_to": 54, + "index": 56, + "attached_to": 55, "class_list": [ "usb", "unknown" @@ -5412,20 +5157,20 @@ "value": 0 }, "model": "fifine Microphone", - "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.3", - "sysfs_bus_id": "3-1:1.3", - "unix_device_name": "/dev/input/event1", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.4/3-3.2.4:1.3", + "sysfs_bus_id": "3-3.2.4:1.3", + "unix_device_name": "/dev/input/event12", "unix_device_number": { "type": 99, "major": 13, - "minor": 65, + "minor": 76, "range": 1 }, "unix_device_names": [ "/dev/input/by-id/usb-3142_fifine_Microphone-event-if03", - "/dev/input/by-path/pci-0000:00:14.0-usb-0:1:1.3-event", - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:1:1.3-event", - "/dev/input/event1" + "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.4:1.3-event", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.4:1.3-event", + "/dev/input/event12" ], "resources": [ { @@ -5475,8 +5220,99 @@ "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic03isc00ip00in03" }, { - "index": 73, - "attached_to": 54, + "index": 70, + "attached_to": 46, + "class_list": [ + "usb", + "unknown" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "3434", + "name": "Keychron", + "value": 13364 + }, + "device": { + "hex": "d030", + "name": "Keychron Link", + "value": 53296 + }, + "revision": { + "hex": "0000", + "name": "d3.00", + "value": 0 + }, + "model": "Keychron Link", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.3/3-3.3:1.3", + "sysfs_bus_id": "3-3.3:1.3", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 3, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v3434pD030dD300dc00dsc00dp00ic03isc00ip00in03" + }, + { + "index": 71, + "attached_to": 53, "class_list": [ "usb", "unknown" @@ -5632,13 +5468,9 @@ "prog_if": 48 }, "driver": "xhci_hcd", - "driver_module": "xhci_pci", "drivers": [ "xhci_hcd" ], - "driver_modules": [ - "xhci_pci" - ], "module_alias": "pci:v00008086d00009A17sv00000000sd00000000bc0Csc03i30", "label": "Onboard - Other" }, @@ -5700,7 +5532,7 @@ "resources": [ { "type": "irq", - "base": 137, + "base": 135, "triggered": 0, "enabled": true }, @@ -5718,17 +5550,13 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 137, + "irq": 135, "prog_if": 48 }, "driver": "xhci_hcd", - "driver_module": "xhci_pci", "drivers": [ "xhci_hcd" ], - "driver_modules": [ - "xhci_pci" - ], "module_alias": "pci:v00008086d000043EDsv00001043sd0000201Fbc0Csc03i30", "label": "Onboard - Other" }