From 6136ac56627e7e8b33bbcf641c8776eb513453da Mon Sep 17 00:00:00 2001 From: pupbrained Date: Thu, 19 Dec 2024 00:33:27 -0500 Subject: [PATCH] update --- _sources/generated.json | 362 +++++----- _sources/generated.nix | 16 +- flake.in.nix | 5 + flake.lock | 256 +++++--- flake.nix | 8 + homes/x86_64-linux/marshall@navis/default.nix | 1 + .../marshall@navis/hyprland/default.nix | 26 +- .../marshall@navis/hyprland/services.nix | 8 - .../marshall@navis/hyprland/waybar.nix | 282 -------- modules/home/shell/git.nix | 7 +- modules/home/vscode/default.nix | 7 +- nvfetcher.toml | 4 + systems/x86_64-linux/navis/default.nix | 169 +++-- systems/x86_64-linux/navis/facter.json | 619 ++++++++++++------ .../navis/pkgs/sddm-theme-minesddm.nix | 11 + 15 files changed, 954 insertions(+), 827 deletions(-) delete mode 100644 homes/x86_64-linux/marshall@navis/hyprland/waybar.nix create mode 100644 systems/x86_64-linux/navis/pkgs/sddm-theme-minesddm.nix diff --git a/_sources/generated.json b/_sources/generated.json index ce3c3a4..46e81e9 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,182 +1,202 @@ { - "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" + "sddm-theme-minesddm": { + "cargoLocks": null, + "date": "2024-12-15", + "extract": null, + "name": "sddm-theme-minesddm", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "Davi-S", + "repo": "sddm-theme-minesddm", + "rev": "3f6d2c82b181719d95f27366fd7ebc43185b0088", + "sha256": "sha256-lkNUGmWe+R75IFbI/VX4j8c9DJk/QELxCg1D/CIsaAc=", + "type": "github" + }, + "version": "3f6d2c82b181719d95f27366fd7ebc43185b0088" }, - "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" + "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": "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..0903599 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"; @@ -87,6 +85,18 @@ sha256 = "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ="; }; }; + sddm-theme-minesddm = { + pname = "sddm-theme-minesddm"; + version = "3f6d2c82b181719d95f27366fd7ebc43185b0088"; + src = fetchFromGitHub { + owner = "Davi-S"; + repo = "sddm-theme-minesddm"; + rev = "3f6d2c82b181719d95f27366fd7ebc43185b0088"; + fetchSubmodules = false; + sha256 = "sha256-lkNUGmWe+R75IFbI/VX4j8c9DJk/QELxCg1D/CIsaAc="; + }; + date = "2024-12-15"; + }; system-appearance = { pname = "system-appearance"; version = "latest"; diff --git a/flake.in.nix b/flake.in.nix index 14b8c25..6019718 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -28,6 +28,11 @@ hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland"; hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland"; hyprpanel = mkInput "Jas-SinghFSU/HyprPanel"; + hyprspace = mkFollowing "KZDKM/Hyprspace" "hyprland"; + hypr-dynamic-cursors = { + url = "path:///home/marshall/hypr-dynamic-cursors"; + inputs.hyprland.follows = "hyprland"; + }; impermanence = mkInput "nix-community/impermanence"; nix-colors = mkInput "Misterio77/nix-colors"; nixos-facter-modules = mkInput "numtide/nixos-facter-modules"; diff --git a/flake.lock b/flake.lock index 9f34f79..5c22ae6 100644 --- a/flake.lock +++ b/flake.lock @@ -23,7 +23,7 @@ }, "ags": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "systems": "systems_6" }, "locked": { @@ -91,11 +91,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1734397929, - "narHash": "sha256-VCTVpU/RlrI9StxzDnqc1R3ZTQloLVALSkiN/Fgiad4=", + "lastModified": 1734546365, + "narHash": "sha256-g8GoZj1+r78/+gl2uWqausP+5oUap+GQsUKHnj+yB38=", "owner": "catppuccin", "repo": "nix", - "rev": "21310cde33d3ee8023679dec01a9724a346c63ff", + "rev": "5cdefd69fc9238a6fe512e76ed9d22169c661616", "type": "github" }, "original": { @@ -129,7 +129,7 @@ "codeium": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1733165974, @@ -564,7 +564,7 @@ }, "flake-utils_10": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1731533236, @@ -600,7 +600,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1701680307, @@ -618,7 +618,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1731533236, @@ -636,7 +636,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1731533236, @@ -669,7 +669,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1694529238, @@ -687,7 +687,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1726560853, @@ -705,7 +705,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1731533236, @@ -830,7 +830,7 @@ }, "git-ignore-nix": { "inputs": { - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1709087332, @@ -849,7 +849,7 @@ }, "git-ignore-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1709087332, @@ -1012,6 +1012,24 @@ "type": "github" } }, + "hypr-dynamic-cursors": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1734564409, + "narHash": "sha256-SlrRTl9/nxjNZaVcfxA0p4pTs/VZf1TqPeayksprpKc=", + "path": "/home/marshall/hypr-dynamic-cursors", + "type": "path" + }, + "original": { + "path": "/home/marshall/hypr-dynamic-cursors", + "type": "path" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -1080,17 +1098,17 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_5", "xdph": "xdph" }, "locked": { - "lastModified": 1734456362, - "narHash": "sha256-vjAZEoZIZKGV/djEEBy3jj7GKcAXY2FuC5a4fB3fxOY=", + "lastModified": 1734573361, + "narHash": "sha256-rlHkYVDjKXABfAxdcsHnbdZa/0EWE3g/XnR/Ln96rPA=", "ref": "refs/heads/main", - "rev": "5f1df55fcb45a72e92258113685aa9064f6ebf3e", - "revCount": 5561, + "rev": "5b714f05f87831e3e930af04649f853d5efb9902", + "revCount": 5570, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1118,11 +1136,11 @@ ] }, "locked": { - "lastModified": 1734455043, - "narHash": "sha256-i4dNTT6yR6Ob2hSMHOShm91zACUGzwMR8cdmIkPHiOY=", + "lastModified": 1734533485, + "narHash": "sha256-ysXZgE6H/2LDPYtZEgf23c/ZaYfZDBr0IFOX3Ka+WhM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "179fab73cd399982f5d37389fb307497eb65be45", + "rev": "2bfda39fc841434ffc229327a1ec2e11650c4db8", "type": "github" }, "original": { @@ -1217,7 +1235,7 @@ "hyprpanel": { "inputs": { "ags": "ags", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1733062031, @@ -1233,6 +1251,27 @@ "type": "github" } }, + "hyprspace": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": "systems_7" + }, + "locked": { + "lastModified": 1733625860, + "narHash": "sha256-YiLUDw14NaavML8y9rxXxO7q+j3b/ghQhBmIy0+/Zmk=", + "owner": "KZDKM", + "repo": "Hyprspace", + "rev": "e2d561c933cd085d68bf0b39c4f78870ad0abbc2", + "type": "github" + }, + "original": { + "owner": "KZDKM", + "repo": "Hyprspace", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -1396,11 +1435,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1734312634, - "narHash": "sha256-tLTK1YZwELWw5tTXJs6sKb8NRUt+IK/gd4gOKbIfuVw=", + "lastModified": 1734526071, + "narHash": "sha256-0GjNrhkmJv961FqmkxPUWSj0Vdy2ZOzaw6dL1lBGhco=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c8feea243604656e98fb9304b7bdad2f214a4cac", + "rev": "328e55103afad95949f7fc60bb2ecabdd790611e", "type": "github" }, "original": { @@ -1710,6 +1749,22 @@ } }, "nixpkgs_10": { + "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_11": { "locked": { "lastModified": 1725634671, "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", @@ -1725,7 +1780,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1732758367, "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", @@ -1741,13 +1796,13 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -1757,7 +1812,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1702346276, "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", @@ -1773,7 +1828,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1734474063, "narHash": "sha256-Yk7+G3aWZpl9dnPBbZievN3htxiONcLXcxwdE9n0mX4=", @@ -1788,7 +1843,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1734119587, "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", @@ -1804,22 +1859,6 @@ "type": "github" } }, - "nixpkgs_16": { - "locked": { - "lastModified": 1733097829, - "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_17": { "locked": { "lastModified": 1733097829, @@ -1837,6 +1876,22 @@ } }, "nixpkgs_18": { + "locked": { + "lastModified": 1733097829, + "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { "locked": { "lastModified": 1729265718, "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", @@ -1852,20 +1907,6 @@ "type": "github" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1666603677, - "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1734119587, @@ -1883,6 +1924,20 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1666603677, + "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1734126203, "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", @@ -1896,7 +1951,7 @@ "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1666603677, "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", @@ -1910,7 +1965,7 @@ "type": "indirect" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { "lastModified": 1734126203, "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", @@ -1924,7 +1979,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_24": { "locked": { "lastModified": 1725634671, "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", @@ -2034,15 +2089,15 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", - "owner": "NixOS", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -2052,7 +2107,7 @@ "inputs": { "codeium": "codeium", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "nixvim": "nixvim_2", "treefmt-nix": "treefmt-nix_3" }, @@ -2078,7 +2133,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -2155,15 +2210,17 @@ "emacs": "emacs", "flakegen": "flakegen", "home-manager": "home-manager_3", + "hypr-dynamic-cursors": "hypr-dynamic-cursors", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "hyprpanel": "hyprpanel", + "hyprspace": "hyprspace", "impermanence": "impermanence", "niri": "niri", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nixos-facter-modules": "nixos-facter-modules", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "nixvim": "nixvim", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_2", @@ -2359,6 +2416,21 @@ "type": "github" } }, + "systems_14": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -2436,16 +2508,16 @@ }, "systems_7": { "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" } }, @@ -2521,7 +2593,7 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1733761991, @@ -2539,14 +2611,14 @@ }, "treefmt-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1734543842, + "narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "76159fc74eeac0599c3618e3601ac2b980a29263", "type": "github" }, "original": { @@ -2557,11 +2629,11 @@ }, "unstable": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -2577,7 +2649,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_19", "rust-overlay": "rust-overlay_2", "zlib": "zlib" }, @@ -2642,7 +2714,7 @@ "inputs": { "flake-utils": "flake-utils_10", "git-ignore-nix": "git-ignore-nix_2", - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_23", "unstable": "unstable" }, "locked": { @@ -2663,7 +2735,7 @@ "inputs": { "flake-utils": "flake-utils_9", "git-ignore-nix": "git-ignore-nix", - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_21", "xmonad": "xmonad" }, "locked": { @@ -2715,7 +2787,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_24" }, "locked": { "lastModified": 1734250224, diff --git a/flake.nix b/flake.nix index 12e9a60..1cb8d0b 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,10 @@ inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/home-manager"; }; + hypr-dynamic-cursors = { + inputs.hyprland.follows = "hyprland"; + url = "path:///home/marshall/hypr-dynamic-cursors"; + }; hyprland = { submodules = true; type = "git"; @@ -29,6 +33,10 @@ url = "github:hyprwm/hyprland-plugins"; }; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; + hyprspace = { + inputs.hyprland.follows = "hyprland"; + url = "github:KZDKM/Hyprspace"; + }; impermanence.url = "github:nix-community/impermanence"; niri = { inputs.nixpkgs.follows = "nixpkgs"; diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 075b0af..94deeb3 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -69,6 +69,7 @@ }) emacs-lsp-booster equibop + firefox glow grc jamesdsp diff --git a/homes/x86_64-linux/marshall@navis/hyprland/default.nix b/homes/x86_64-linux/marshall@navis/hyprland/default.nix index f51b5d2..9c02bfb 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/default.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/default.nix @@ -1,9 +1,12 @@ -{pkgs, ...}: +{ + pkgs, + inputs, + ... +}: with pkgs; { imports = [ ./rofi.nix ./services.nix - ./waybar.nix ]; home.packages = [ @@ -16,6 +19,11 @@ with pkgs; { enable = true; systemd.variables = ["--all"]; + plugins = with inputs; [ + hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors + hyprspace.packages.${pkgs.system}.default + ]; + settings = let rofi-clipboard = pkgs.writeScript "rofi-clipboard" '' tmp_dir="/tmp/cliphist" @@ -66,11 +74,15 @@ with pkgs; { screenshot = mode: "${lib.getExe hyprshot} --clipboard-only -m ${mode}"; in { - cursor.no_hardware_cursors = true; decoration.rounding = 5; dwindle.preserve_split = true; gestures.workspace_swipe = true; + plugin.dynamic-cursors = { + enabled = true; + mode = "rotate"; + }; + input.touchpad = { clickfinger_behavior = true; natural_scroll = true; @@ -113,7 +125,7 @@ with pkgs; { gaps_in = 10; resize_on_border = true; - "col.active_border" = "rgba(a6e3a1ee) rgba(cba6f7ee) 45deg"; + "col.active_border" = "rgba(f38ba8ee) rgba(fab387ee) rgba(a6e3a1ee) rgba(89dcebee) rgba(89b4faee) rgba(cba6f7ee) 45deg"; "col.inactive_border" = "rgba(595959aa)"; }; @@ -146,8 +158,8 @@ with pkgs; { "NVD_BACKEND, direct" # Cursors - "HYPRCURSOR_SIZE, 24" - "XCURSOR_SIZE, 24" + "HYPRCURSOR_SIZE, 32" + "XCURSOR_SIZE, 32" ]; bindm = [ @@ -185,6 +197,8 @@ with pkgs; { # Toggles "${mod}, Space, togglefloating" + "${mod}, o, overview:toggle" + # Focus movements "${mod}, h, movefocus, l" "${mod}, j, movefocus, d" diff --git a/homes/x86_64-linux/marshall@navis/hyprland/services.nix b/homes/x86_64-linux/marshall@navis/hyprland/services.nix index 1c60efc..29c3355 100644 --- a/homes/x86_64-linux/marshall@navis/hyprland/services.nix +++ b/homes/x86_64-linux/marshall@navis/hyprland/services.nix @@ -2,13 +2,5 @@ services = { cliphist.enable = true; udiskie.enable = false; - - swaync = { - enable = true; - style = builtins.fetchurl { - url = "https://github.com/catppuccin/swaync/releases/download/v0.2.3/mocha.css"; - sha256 = "1xr1wkg4zb467b35xhsfqiwhimfnn88i3ml5rf173rkm7fyby9qy"; - }; - }; }; } diff --git a/homes/x86_64-linux/marshall@navis/hyprland/waybar.nix b/homes/x86_64-linux/marshall@navis/hyprland/waybar.nix deleted file mode 100644 index 444f484..0000000 --- a/homes/x86_64-linux/marshall@navis/hyprland/waybar.nix +++ /dev/null @@ -1,282 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - palette = config.colorScheme.palette; - betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; -in { - programs.waybar = { - enable = true; - package = pkgs.waybar; - settings = [ - { - layer = "top"; - position = "top"; - - modules-center = ["hyprland/workspaces"]; - - modules-left = [ - "custom/startmenu" - "hyprland/window" - "pulseaudio" - "cpu" - "memory" - ]; - - modules-right = [ - "mpris" - "network" - "custom/notification" - "tray" - "clock" - ]; - - "mpris" = { - format = "{player_icon} {title} - {artist}"; - format-paused = "{status_icon} {title} - {artist}"; - player-icons.default = "󰝚"; - status-icons.paused = "󰏤"; - max-length = 40; - }; - - "hyprland/workspaces" = { - format = "{name}"; - format-icons = { - default = " "; - active = " "; - urgent = " "; - }; - on-scroll-up = "hyprctl dispatch workspace e-1"; - on-scroll-down = "hyprctl dispatch workspace e+1"; - }; - - "clock" = { - format = " {:L%I:%M %p}"; - tooltip = true; - tooltip-format = "{:%A, %d.%B %Y }\n{calendar}"; - }; - - "hyprland/window" = { - max-length = 40; - rewrite = { - "" = "󰍹 Desktop"; - "(.*) — Firefox Nightly" = "󰈹 $1"; - "Slack" = "󰒱 Slack"; - ".*?Discord \\| @?(.*)" = "󰙯 $1"; - "wezterm" = " WezTerm"; - "Telegram(?: \\((\\d+)\\))?" = " Telegram"; - "Steam" = "󰓓 Steam"; - }; - }; - - "memory" = { - interval = 5; - format = " {}%"; - tooltip = true; - }; - - "cpu" = { - interval = 5; - format = " {usage:2}%"; - tooltip = true; - }; - - "disk" = { - format = " {free}"; - tooltip = true; - }; - - "network" = { - format-icons = [ - "󰤯" - "󰤟" - "󰤢" - "󰤥" - "󰤨" - ]; - format-ethernet = " {bandwidthDownOctets}"; - format-wifi = "{icon} {essid}"; - format-disconnected = "󰤮"; - tooltip = false; - }; - - "tray" = { - spacing = 12; - }; - - "pulseaudio" = { - format = "{icon} {volume}% {format_source}"; - format-bluetooth = "{volume}% {icon} {format_source}"; - format-bluetooth-muted = "󰅶 {icon} {format_source}"; - format-muted = "󰅶 {format_source}"; - format-source = " {volume}%"; - format-source-muted = ""; - format-icons = { - headphone = ""; - hands-free = ""; - headset = "󰋎"; - phone = ""; - portable = ""; - car = ""; - default = [ - "" - "" - "" - ]; - }; - on-click = "sleep 0.1 && pavucontrol"; - }; - - "custom/startmenu" = { - tooltip = false; - format = " "; - on-click = "rofi -show drun"; - }; - - "custom/notification" = { - tooltip = false; - format = "{icon} {}"; - format-icons = { - notification = ""; - none = ""; - dnd-notification = ""; - dnd-none = ""; - inhibited-notification = ""; - inhibited-none = ""; - dnd-inhibited-notification = ""; - dnd-inhibited-none = ""; - }; - return-type = "json"; - exec = "swaync-client -swb"; - on-click = "swaync-client -t &"; - escape = true; - }; - } - ]; - - style = lib.concatStrings [ - '' - * { - border: none; - border-radius: 0px; - font-family: Maple Mono NF; - font-size: 16px; - min-height: 0px; - } - - window#waybar { - background-color: #${palette.base00}; - } - - #workspaces { - background: #${palette.base01}; - border-radius: 16px; - color: #${palette.base00}; - margin: 4px 4px; - padding: 8px 5px; - } - - #workspaces button { - animation: gradient_horizontal 15s ease infinite; - background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09}); - background-size: 300% 300%; - border-radius: 16px; - color: #${palette.base00}; - font-weight: bold; - margin: 0px 3px; - opacity: 0.5; - padding: 0px 5px; - transition: ${betterTransition}; - } - - #workspaces button.active { - animation: gradient_horizontal 15s ease infinite; - background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09}); - background-size: 300% 300%; - border-radius: 16px; - color: #${palette.base00}; - font-weight: bold; - margin: 0px 3px; - min-width: 40px; - opacity: 1.0; - padding: 0px 5px; - transition: ${betterTransition}; - } - - #workspaces button:hover { - animation: gradient_horizontal 15s ease infinite; - background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09}); - background-size: 300% 300%; - border-radius: 16px; - color: #${palette.base00}; - font-weight: bold; - opacity: 0.8; - transition: ${betterTransition}; - } - - @keyframes gradient_horizontal { - 0% { background-position: 0% 50%; } - 50% { background-position: 100% 50%; } - 100% { background-position: 0% 50%; } - } - - @keyframes swiping { - 0% { background-position: 0% 200%; } - 100% { background-position: 200% 200%; } - } - - tooltip { - background: #${palette.base00}; - border: 1px solid #${palette.base0E}; - border-radius: 12px; - } - - tooltip label { - color: #${palette.base07}; - } - - #window, #pulseaudio, #cpu, #memory, #idle_inhibitor { - background: #${palette.base01}; - border-radius: 24px 10px 24px 10px; - color: #${palette.base05}; - font-weight: bold; - margin: 4px 0px; - margin-left: 7px; - padding: 0px 18px; - } - - #custom-startmenu { - background: #${palette.base01}; - border-radius: 0px 0px 40px 0px; - color: #${palette.base0D}; - font-size: 28px; - margin: 0px; - padding: 0px 30px 0px 15px; - } - - #mpris, #network, #custom-notification, #tray { - background: #${palette.base01}; - border-radius: 10px 24px 10px 24px; - color: #${palette.base05}; - font-weight: bold; - margin: 4px 0px; - margin-right: 7px; - padding: 0px 18px; - } - - #clock { - animation: gradient_horizontal 15s ease infinite; - background: linear-gradient(45deg, #${palette.base0C}, #${palette.base0F}, #${palette.base0B}, #${palette.base08}); - background-size: 300% 300%; - border-radius: 0px 0px 0px 40px; - color: #${palette.base00}; - font-weight: bold; - margin: 0px; - padding: 0px 15px 0px 30px; - } - '' - ]; - }; -} diff --git a/modules/home/shell/git.nix b/modules/home/shell/git.nix index 1feecff..59963dd 100644 --- a/modules/home/shell/git.nix +++ b/modules/home/shell/git.nix @@ -19,7 +19,12 @@ with pkgs; { gh = { enable = true; - extensions = [gh-copilot gh-dash gh-markdown-preview]; + extensions = [ + gh-copilot + gh-dash + gh-markdown-preview + gh-notify + ]; }; }; } diff --git a/modules/home/vscode/default.nix b/modules/home/vscode/default.nix index b28a554..c88dbcd 100644 --- a/modules/home/vscode/default.nix +++ b/modules/home/vscode/default.nix @@ -21,12 +21,9 @@ userSettings = { "files.autoSave" = "afterDelay"; - "editor.fontFamily" = "Iosevka Comfy Motion"; + "editor.fontFamily" = "Maple Mono NF"; "editor.fontLigatures" = true; - "editor.fontSize" = - if pkgs.hostPlatform.isDarwin - then 14 - else 16; + "editor.fontSize" = 14; "editor.formatOnSave" = true; "editor.minimap.enabled" = false; diff --git a/nvfetcher.toml b/nvfetcher.toml index deaf4db..e1be152 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -37,3 +37,7 @@ fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/ma [system-appearance] src.manual = "latest" fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch" + +[sddm-theme-minesddm] +src.git = "https://github.com/Davi-S/sddm-theme-minesddm" +fetch.github = "Davi-S/sddm-theme-minesddm" diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index e9c7976..e70dacc 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -17,33 +17,50 @@ "/home" = { device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; fsType = "btrfs"; - options = ["subvol=home" "compress=zstd"]; + options = [ + "subvol=home" + "compress=zstd" + ]; }; "/nix" = { device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; fsType = "btrfs"; - options = ["subvol=nix" "compress=zstd" "noatime"]; + options = [ + "subvol=nix" + "compress=zstd" + "noatime" + ]; }; "/persist" = { device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; neededForBoot = true; fsType = "btrfs"; - options = ["subvol=persist" "compress=zstd"]; + options = [ + "subvol=persist" + "compress=zstd" + ]; }; "/var/log" = { device = "/dev/disk/by-uuid/d375c3a3-63a3-47f8-8b77-58fabbb8f67b"; fsType = "btrfs"; - options = ["subvol=log" "compress=zstd" "noatime"]; + options = [ + "subvol=log" + "compress=zstd" + "noatime" + ]; neededForBoot = true; }; "/boot" = { device = "/dev/disk/by-uuid/12CE-A600"; fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; + options = [ + "fmask=0022" + "dmask=0022" + ]; }; }; @@ -237,12 +254,15 @@ wineWowPackages.staging xclip yt-dlp + + (callPackage ./pkgs/sddm-theme-minesddm.nix {}) ]; persistence."/persist" = { hideMounts = true; directories = [ "/etc/ssh" + "/etc/NetworkManager" "/root/.ssh" "/var/lib/bluetooth" "/var/lib/iwd" @@ -255,56 +275,81 @@ }; boot = { - blacklistedKernelModules = ["nouveau" "i915"]; + blacklistedKernelModules = [ + "nouveau" + "i915" + ]; kernelPackages = pkgs.linuxPackages_cachyos; - supportedFilesystems = ["btrfs" "ntfs"]; + supportedFilesystems = [ + "btrfs" + "ntfs" + ]; tmp.useTmpfs = true; initrd = { # Encrypted device luks.devices."enc".device = "/dev/disk/by-uuid/9952fcd1-46eb-4c9c-ab7d-361d31fdb9a2"; - systemd = { - enable = true; - emergencyAccess = true; - dbus.enable = true; + postDeviceCommands = lib.mkAfter '' + mkdir /btrfs_tmp + mount /dev/mapper/enc /btrfs_tmp + if [[ -e /btrfs_tmp/root ]]; then + mkdir -p /btrfs_tmp/old_roots + timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") + mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + fi - initrdBin = with pkgs; [ - iwd - nix - vim - ]; + delete_subvolume_recursively() { + IFS=$'\n' + for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + delete_subvolume_recursively "/btrfs_tmp/$i" + done + btrfs subvolume delete "$1" + } - services.wipe-root = { - requires = ["dev-mapper-enc.device"]; - after = ["dev-mapper-enc.device"]; - wantedBy = ["initrd.target"]; - script = lib.mkAfter '' - mkdir /btrfs_tmp - mount /dev/mapper/enc /btrfs_tmp - if [[ -e /btrfs_tmp/root ]]; then - mkdir -p /btrfs_tmp/old_roots - timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") - mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" - fi + for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + delete_subvolume_recursively "$i" + done - delete_subvolume_recursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do - delete_subvolume_recursively "/btrfs_tmp/$i" - done - btrfs subvolume delete "$1" - } + btrfs subvolume create /btrfs_tmp/root + umount /btrfs_tmp + ''; - for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do - delete_subvolume_recursively "$i" - done - - btrfs subvolume create /btrfs_tmp/root - umount /btrfs_tmp - ''; - }; - }; + # systemd = { + # enable = true; + # emergencyAccess = true; + # dbus.enable = true; + # + # services.wipe-root = { + # requires = ["dev-mapper-enc.device"]; + # after = ["dev-mapper-enc.device"]; + # wantedBy = ["initrd.target"]; + # script = lib.mkAfter '' + # mkdir /btrfs_tmp + # mount /dev/mapper/enc /btrfs_tmp + # if [[ -e /btrfs_tmp/root ]]; then + # mkdir -p /btrfs_tmp/old_roots + # timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") + # mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + # fi + # + # delete_subvolume_recursively() { + # IFS=$'\n' + # for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + # delete_subvolume_recursively "/btrfs_tmp/$i" + # done + # btrfs subvolume delete "$1" + # } + # + # for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + # delete_subvolume_recursively "$i" + # done + # + # btrfs subvolume create /btrfs_tmp/root + # umount /btrfs_tmp + # ''; + # }; + # }; }; extraModprobeConfig = @@ -358,13 +403,27 @@ max-jobs = "auto"; sandbox-fallback = false; sandbox = true; - system-features = ["nixos-test" "kvm" "recursive-nix" "big-parallel" "gccarch-x86-64-v4"]; + system-features = [ + "nixos-test" + "kvm" + "recursive-nix" + "big-parallel" + "gccarch-x86-64-v4" + ]; use-cgroups = true; use-xdg-base-directories = true; warn-dirty = false; - allowed-users = ["root" "@wheel" "nix-builder"]; - trusted-users = ["root" "@wheel" "nix-builder"]; + allowed-users = [ + "root" + "@wheel" + "nix-builder" + ]; + trusted-users = [ + "root" + "@wheel" + "nix-builder" + ]; min-free = "${toString (5 * 1024 * 1024 * 1024)}"; max-free = "${toString (10 * 1024 * 1024 * 1024)}"; @@ -431,7 +490,10 @@ firewall.enable = false; networkmanager.enable = true; hostName = "navis"; - nameservers = ["1.1.1.1" "1.0.0.1"]; + nameservers = [ + "1.1.1.1" + "1.0.0.1" + ]; useDHCP = lib.mkForce true; }; @@ -455,8 +517,15 @@ fileSystems = ["/dev/mapper/enc"]; }; - displayManager.cosmic-greeter.enable = true; - desktopManager.cosmic.enable = true; + displayManager.sddm = { + enable = true; + wayland.enable = true; + wayland.compositor = "kwin"; + theme = "minesddm"; + }; + + displayManager.cosmic-greeter.enable = false; + desktopManager.cosmic.enable = false; libinput = { enable = true; diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json index 28cf90e..9d5d21f 100644 --- a/systems/x86_64-linux/navis/facter.json +++ b/systems/x86_64-linux/navis/facter.json @@ -23,8 +23,8 @@ }, "bluetooth": [ { - "index": 54, - "attached_to": 53, + "index": 55, + "attached_to": 54, "class_list": [ "usb", "bluetooth" @@ -102,8 +102,8 @@ "module_alias": "usb:v8087p0032d0000dcE0dsc01dp01icE0isc01ip01in00" }, { - "index": 67, - "attached_to": 53, + "index": 69, + "attached_to": 54, "class_list": [ "usb", "bluetooth" @@ -692,7 +692,7 @@ "camera": [ { "index": 47, - "attached_to": 53, + "attached_to": 54, "class_list": [ "camera", "usb" @@ -792,8 +792,8 @@ "module_alias": "usb:v322Ep202Cd0103dcEFdsc02dp01ic0Eisc01ip00in00" }, { - "index": 58, - "attached_to": 53, + "index": 59, + "attached_to": 54, "class_list": [ "camera", "usb" @@ -1487,7 +1487,7 @@ "hub": [ { "index": 46, - "attached_to": 53, + "attached_to": 54, "class_list": [ "usb", "hub" @@ -1567,7 +1567,7 @@ "module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 53, + "index": 54, "attached_to": 38, "class_list": [ "usb", @@ -1650,7 +1650,7 @@ "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 55, + "index": 56, "attached_to": 46, "class_list": [ "usb", @@ -1731,7 +1731,7 @@ "module_alias": "usb:v214Bp7250d0100dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 59, + "index": 60, "attached_to": 38, "class_list": [ "usb", @@ -1804,7 +1804,7 @@ "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" }, { - "index": 65, + "index": 66, "attached_to": 19, "class_list": [ "usb", @@ -1887,7 +1887,7 @@ "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 69, + "index": 71, "attached_to": 19, "class_list": [ "usb", @@ -2005,18 +2005,18 @@ "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_name": "/dev/input/event9", "unix_device_number": { "type": 99, "major": 13, - "minor": 69, + "minor": 73, "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" + "/dev/input/by-id/usb-Keychron_Keychron_Link-if01-event-joystick", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.3:1.1-event-joystick", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.3:1.1-event-joystick", + "/dev/input/event9" ], "resources": [ { @@ -2071,7 +2071,7 @@ "module_alias": "usb:v3434pD030dD300dc00dsc00dp00ic03isc01ip01in01" }, { - "index": 60, + "index": 61, "attached_to": 46, "class_list": [ "keyboard", @@ -2114,18 +2114,18 @@ "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_name": "/dev/input/event10", "unix_device_number": { "type": 99, "major": 13, - "minor": 71, + "minor": 74, "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" + "/dev/input/event10" ], "resources": [ { @@ -2180,8 +2180,8 @@ "module_alias": "usb:v3434pD030dD300dc00dsc00dp00ic03isc01ip01in02" }, { - "index": 64, - "attached_to": 55, + "index": 65, + "attached_to": 56, "class_list": [ "keyboard", "usb" @@ -2223,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/event9", + "unix_device_name": "/dev/input/event12", "unix_device_number": { "type": 99, "major": 13, - "minor": 73, + "minor": 76, "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/event9" + "/dev/input/event12" ], "resources": [ { @@ -2287,6 +2287,119 @@ "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": "0b10", + "name": "Keychron Q1 HE", + "value": 2832 + }, + "revision": { + "hex": "0000", + "name": "1.20", + "value": 0 + }, + "model": "Keychron Q1 HE", + "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/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, + "major": 13, + "minor": 32, + "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": 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:v3434p0B10d0120dc00dsc00dp00ic03isc01ip01in00" } ], "memory": [ @@ -2311,7 +2424,7 @@ { "type": "mem", "base": 0, - "range": 67152125952, + "range": 67152121856, "enabled": true, "access": "read_write", "prefetch": "unknown" @@ -2502,8 +2615,8 @@ ], "mouse": [ { - "index": 52, - "attached_to": 55, + "index": 53, + "attached_to": 56, "class_list": [ "mouse", "usb" @@ -2557,6 +2670,127 @@ "unix_device_names": [ "/dev/input/mice" ], + "unix_device_name2": "/dev/input/mouse2", + "unix_device_number2": { + "type": 99, + "major": 13, + "minor": 34, + "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": 63, + "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/mouse1", "unix_device_number2": { "type": 99, @@ -2620,131 +2854,10 @@ "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, - "major": 13, - "minor": 32, - "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:v3434pD030dD300dc00dsc00dp00ic03isc01ip02in00" }, { - "index": 75, + "index": 77, "attached_to": 0, "bus_type": { "hex": "0081", @@ -2769,9 +2882,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.000A/input/input25", + "sysfs_id": "/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-0/i2c-ELAN1203:00/0018:04F3:307A.000C/input/input28", "unix_device_names": [ - "/dev/input/event22", + "/dev/input/event25", "/dev/input/ + handler" ] } @@ -3073,7 +3186,7 @@ ], "network_interface": [ { - "index": 72, + "index": 74, "attached_to": 36, "class_list": [ "network_interface" @@ -3115,7 +3228,30 @@ ] }, { - "index": 73, + "index": 75, + "attached_to": 0, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0000", + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_name": "lo", + "unix_device_names": [ + "lo" + ] + }, + { + "index": 76, "attached_to": 32, "class_list": [ "network_interface" @@ -3155,29 +3291,6 @@ "driver_modules": [ "r8169" ] - }, - { - "index": 74, - "attached_to": 0, - "class_list": [ - "network_interface" - ], - "base_class": { - "hex": "0107", - "name": "Network Interface", - "value": 263 - }, - "sub_class": { - "hex": "0000", - "name": "Loopback", - "value": 0 - }, - "model": "Loopback network interface", - "sysfs_id": "/class/net/lo", - "unix_device_name": "lo", - "unix_device_names": [ - "lo" - ] } ], "pci": [ @@ -4009,7 +4122,7 @@ }, { "index": 44, - "attached_to": 55, + "attached_to": 56, "class_list": [ "sound", "usb" @@ -4099,7 +4212,7 @@ }, { "index": 49, - "attached_to": 55, + "attached_to": 56, "class_list": [ "sound", "usb" @@ -4190,7 +4303,7 @@ }, { "index": 51, - "attached_to": 55, + "attached_to": 56, "class_list": [ "sound", "usb" @@ -4280,8 +4393,8 @@ "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in01" }, { - "index": 57, - "attached_to": 55, + "index": 58, + "attached_to": 56, "class_list": [ "sound", "usb" @@ -4370,8 +4483,8 @@ "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic01isc02ip00in01" }, { - "index": 61, - "attached_to": 55, + "index": 62, + "attached_to": 56, "class_list": [ "sound", "usb" @@ -4461,8 +4574,8 @@ "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in04" }, { - "index": 63, - "attached_to": 55, + "index": 64, + "attached_to": 56, "class_list": [ "sound", "usb" @@ -4552,8 +4665,8 @@ "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc02ip00in02" }, { - "index": 66, - "attached_to": 55, + "index": 67, + "attached_to": 56, "class_list": [ "sound", "usb" @@ -4643,8 +4756,8 @@ "module_alias": "usb:v1038p12ADd0119dc00dsc00dp00ic01isc01ip00in00" }, { - "index": 68, - "attached_to": 55, + "index": 70, + "attached_to": 56, "class_list": [ "sound", "usb" @@ -4923,7 +5036,7 @@ "usb": [ { "index": 45, - "attached_to": 55, + "attached_to": 56, "class_list": [ "usb", "unknown" @@ -4965,18 +5078,15 @@ "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/event11", + "unix_device_name": "/dev/input/event13", "unix_device_number": { "type": 99, "major": 13, - "minor": 75, + "minor": 77, "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/event11" + "/dev/input/event13" ], "resources": [ { @@ -5027,7 +5137,7 @@ }, { "index": 50, - "attached_to": 55, + "attached_to": 56, "class_list": [ "usb", "unknown" @@ -5117,8 +5227,99 @@ "module_alias": "usb:v046DpC547d0402dc00dsc00dp00ic03isc00ip00in02" }, { - "index": 56, - "attached_to": 55, + "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": "0b10", + "name": "Keychron Q1 HE", + "value": 2832 + }, + "revision": { + "hex": "0000", + "name": "1.20", + "value": 0 + }, + "model": "Keychron Q1 HE", + "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:v3434p0B10d0120dc00dsc00dp00ic03isc00ip00in01" + }, + { + "index": 57, + "attached_to": 56, "class_list": [ "usb", "unknown" @@ -5159,18 +5360,18 @@ "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.3", "sysfs_bus_id": "3-3.2.4:1.3", - "unix_device_name": "/dev/input/event12", + "unix_device_name": "/dev/input/event15", "unix_device_number": { "type": 99, "major": 13, - "minor": 76, + "minor": 79, "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: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" + "/dev/input/event15" ], "resources": [ { @@ -5220,7 +5421,7 @@ "module_alias": "usb:v3142pA008d0100dc00dsc00dp00ic03isc00ip00in03" }, { - "index": 70, + "index": 72, "attached_to": 46, "class_list": [ "usb", @@ -5311,8 +5512,8 @@ "module_alias": "usb:v3434pD030dD300dc00dsc00dp00ic03isc00ip00in03" }, { - "index": 71, - "attached_to": 53, + "index": 73, + "attached_to": 54, "class_list": [ "usb", "unknown" diff --git a/systems/x86_64-linux/navis/pkgs/sddm-theme-minesddm.nix b/systems/x86_64-linux/navis/pkgs/sddm-theme-minesddm.nix new file mode 100644 index 0000000..2c30265 --- /dev/null +++ b/systems/x86_64-linux/navis/pkgs/sddm-theme-minesddm.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: let + sources = import ../../../../_sources/generated.nix {inherit (pkgs) fetchurl fetchFromGitHub;}; +in + pkgs.stdenv.mkDerivation { + inherit (sources.sddm-theme-minesddm) src pname version; + dontBuild = true; + installPhase = '' + mkdir -p $out/share/sddm/themes + cp -aR $src/minesddm $out/share/sddm/themes + ''; + }