From fe34badada7e8a7d0a5d6e0268d660d97af41c50 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Sun, 9 Feb 2025 11:16:45 -0500 Subject: [PATCH] more stuff --- common/style/vars/grymforge.nix | 18 + flake.lock | 229 +- flake.nix | 2 +- ...sync-conflict-20250115-202717-N2TYFZ4.lock | 2070 ----------------- home-manager/machines/candlekeep.nix | 3 +- home-manager/machines/grymforge.nix | 11 +- home-manager/machines/grymforge/variables.nix | 26 + home-manager/modules/btop.nix | 6 + home-manager/modules/common.nix | 5 +- home-manager/modules/ghostty.nix | 8 +- home-manager/modules/hyprland.nix | 16 +- home-manager/modules/hyprland/bindings.nix | 2 +- home-manager/modules/hyprland/default.nix | 169 ++ home-manager/modules/hyprland/hyprland.nix | 2 +- home-manager/modules/hyprland/hyprspace.nix | 2 +- home-manager/modules/hyprpanel.nix | 360 ++- home-manager/modules/nushell.nix | 3 - home-manager/modules/nushell/default.nix | 43 +- ....sync-conflict-20250129-104440-N2TYFZ4.nix | 97 + home-manager/modules/nushell/gitaliases.nix | 126 + home-manager/modules/tmux/tmux.nix | 15 +- home-manager/modules/yazi.nix | 19 +- hosts/candlekeep/configuration.nix | 10 +- hosts/grymforge/kernel.nix | 5 +- 24 files changed, 904 insertions(+), 2343 deletions(-) create mode 100644 common/style/vars/grymforge.nix delete mode 100644 flake.sync-conflict-20250115-202717-N2TYFZ4.lock create mode 100644 home-manager/machines/grymforge/variables.nix create mode 100644 home-manager/modules/btop.nix create mode 100644 home-manager/modules/hyprland/default.nix create mode 100644 home-manager/modules/nushell/default.sync-conflict-20250129-104440-N2TYFZ4.nix create mode 100644 home-manager/modules/nushell/gitaliases.nix diff --git a/common/style/vars/grymforge.nix b/common/style/vars/grymforge.nix new file mode 100644 index 0000000..77f5d79 --- /dev/null +++ b/common/style/vars/grymforge.nix @@ -0,0 +1,18 @@ +{ + rounding = 25; + gaps-in = 12; + gaps-out = 12 * 2; + active-opacity = 1; + inactive-opacity = 0.87; + blur = true; + border-size = 3; + animation-speed = "slow"; # "fast" | "medium" | "slow" + fetch = "fastfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none" + + bar = { + position = "top"; # "top" | "bottom" + transparent = true; + transparentButtons = false; + floating = true; + }; +} diff --git a/flake.lock b/flake.lock index 2e1c0af..952fa5b 100644 --- a/flake.lock +++ b/flake.lock @@ -465,7 +465,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -504,7 +504,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -1031,6 +1031,32 @@ "type": "github" } }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": "hyprlang_2", + "nixpkgs": [ + "hyprpolkitagent", + "nixpkgs" + ], + "systems": [ + "hyprpolkitagent", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, "hyprland-qtutils": { "inputs": { "hyprutils": [ @@ -1065,10 +1091,10 @@ "aquamarine": "aquamarine_2", "hyprcursor": "hyprcursor_2", "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", + "hyprlang": "hyprlang_3", + "hyprutils": "hyprutils_4", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks": "pre-commit-hooks_2", "systems": [ "hyprspace", @@ -1120,6 +1146,34 @@ } }, "hyprlang_2": { + "inputs": { + "hyprutils": "hyprutils_2", + "nixpkgs": [ + "hyprpolkitagent", + "hyprland-qt-support", + "nixpkgs" + ], + "systems": [ + "hyprpolkitagent", + "hyprland-qt-support", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_3": { "inputs": { "hyprutils": [ "hyprspace", @@ -1170,10 +1224,31 @@ "type": "github" } }, + "hyprpolkitagent": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprutils": "hyprutils_3", + "nixpkgs": "nixpkgs_6", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1739049006, + "narHash": "sha256-AlvqgzQTaSWepmfNHugQM+aSuhsNaLUU95y5VzdbuI8=", + "owner": "hyprwm", + "repo": "hyprpolkitagent", + "rev": "3bef8bf8fcac95339d1e8cab3addbe83a7f99d57", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprpolkitagent", + "type": "github" + } + }, "hyprspace": { "inputs": { "hyprland": "hyprland_2", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1736162631, @@ -1215,6 +1290,60 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprpolkitagent", + "hyprland-qt-support", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "hyprpolkitagent", + "hyprland-qt-support", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { + "inputs": { + "nixpkgs": [ + "hyprpolkitagent", + "nixpkgs" + ], + "systems": [ + "hyprpolkitagent", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_4": { "inputs": { "nixpkgs": [ "hyprspace", @@ -1460,6 +1589,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1731763621, + "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1715534503, "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", @@ -1540,6 +1685,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1729413321, "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", @@ -1555,7 +1716,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1736883708, "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", @@ -1571,7 +1732,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1736344531, "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", @@ -1587,22 +1748,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -1611,7 +1756,7 @@ "git-hooks": "git-hooks_2", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -1729,9 +1874,10 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprpanel": "hyprpanel", + "hyprpolkitagent": "hyprpolkitagent", "hyprspace": "hyprspace", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks_3", @@ -1742,7 +1888,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1736808430, @@ -1773,7 +1919,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux", @@ -1798,7 +1944,7 @@ "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_3", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1736149529, @@ -1846,16 +1992,16 @@ }, "systems_3": { "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" } }, @@ -1889,6 +2035,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 44df739..033f6bf 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. - + hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent"; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; hyprspace = { url = "github:KZDKM/Hyprspace"; diff --git a/flake.sync-conflict-20250115-202717-N2TYFZ4.lock b/flake.sync-conflict-20250115-202717-N2TYFZ4.lock deleted file mode 100644 index 44e8e54..0000000 --- a/flake.sync-conflict-20250115-202717-N2TYFZ4.lock +++ /dev/null @@ -1,2070 +0,0 @@ -{ - "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1736677288, - "narHash": "sha256-Vj3WOLy6o6Zf44Rwg9eLqNRQPlVoDrQ89tsef3l3990=", - "owner": "Aylur", - "repo": "ags", - "rev": "90db9b9fecc0f4228440d83107c6c745a35e7d77", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, - "ags_2": { - "inputs": { - "astal": "astal_2", - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736090999, - "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", - "owner": "aylur", - "repo": "ags", - "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1736102453, - "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "4846091641f3be0ad7542086d52769bb7932bde6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, - "aquamarine_2": { - "inputs": { - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprspace", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1729527199, - "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735172721, - "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", - "owner": "aylur", - "repo": "astal", - "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, - "astal_2": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735172721, - "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=", - "owner": "aylur", - "repo": "astal", - "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1731949548, - "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "type": "github" - } - }, - "cachix": { - "inputs": { - "devenv": [ - "devenv" - ], - "flake-compat": [ - "devenv" - ], - "git-hooks": [ - "devenv" - ], - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", - "owner": "cachix", - "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, - "devenv": { - "inputs": { - "cachix": "cachix", - "flake-compat": "flake-compat", - "git-hooks": "git-hooks", - "nix": "nix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736426010, - "narHash": "sha256-d0rE+u8/rQjXLvDobz1StGTfqvRKvq+8kVsHnIGVD1o=", - "owner": "cachix", - "repo": "devenv", - "rev": "1c384bc4be3ee571511fbbc6fdc94fe47d60f6cf", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "main", - "repo": "devenv", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1734969791, - "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_3" - }, - "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": [ - "stylix", - "systems" - ] - }, - "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_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "devenv" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "nixpkgs-stable": [ - "devenv" - ] - }, - "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_4", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_3": { - "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore_6", - "nixpkgs": [ - "stylix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "devenv", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_4": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_5": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_6": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "47.2", - "repo": "gnome-shell", - "type": "github" - } - }, - "gomod2nix": { - "inputs": { - "flake-utils": [ - "superfile", - "flake-utils" - ], - "nixpkgs": [ - "superfile", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1710154385, - "narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=", - "owner": "nix-community", - "repo": "gomod2nix", - "rev": "872b63ddd28f318489c929d25f1f0a3c6039c971", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "gomod2nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "master", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734906540, - "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprcursor_2": { - "inputs": { - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1736115290, - "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", - "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", - "nixpkgs": "nixpkgs_4", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1736873552, - "narHash": "sha256-lGZv+YcdDXYowKJf7vaeu97o7JKFzTL/vzS8WxTT+UM=", - "ref": "refs/heads/main", - "rev": "25add26881d7b98d2b80eb7a95d3aee0449b72b9", - "revCount": 5672, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1735774328, - "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1736114838, - "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprland_2": { - "inputs": { - "aquamarine": "aquamarine_2", - "hyprcursor": "hyprcursor_2", - "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_6", - "pre-commit-hooks": "pre-commit-hooks_2", - "systems": [ - "hyprspace", - "systems" - ], - "xdph": "xdph_2" - }, - "locked": { - "lastModified": 1729989895, - "narHash": "sha256-IFctdjt+v7zRDe24Y8+BdVDaKy0pmn60FWDzpYg4CT0=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "a3d3b4fd64a51a8c1663b450bd2a408f1f0fa9b3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1735393019, - "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprpanel": { - "inputs": { - "ags": "ags_2", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1736834018, - "narHash": "sha256-B2QbLPeWMrCX5pOTCC/g0hF1+SAorCQsZVTwdRsjUN8=", - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "rev": "d49ae7d11d429df10aabed0a51390529b3171f43", - "type": "github" - }, - "original": { - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "type": "github" - } - }, - "hyprspace": { - "inputs": { - "hyprland": "hyprland_2", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1736162631, - "narHash": "sha256-i4pwzFbmnBRJyWADux6eOXv30l2SGu4MifeEMWKDqOk=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "f430d4bf8afa9397c937d575cb7a9176a76aeace", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": [ - "devenv" - ], - "flake-parts": "flake-parts", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-23-11": [ - "devenv" - ], - "nixpkgs-regression": [ - "devenv" - ], - "pre-commit-hooks": [ - "devenv" - ] - }, - "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", - "owner": "Mic92", - "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-index-database", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_10": { - "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks_2", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_8", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1736895925, - "narHash": "sha256-rEAj10jNZh2l6/gbrqn9FrJWanvnYMBr1CTC7BlgB6Q=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "33ad2c729dd9b629b0d49ce8ebb4b466105c315c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", - "owner": "NuschtOS", - "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore_3", - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_3": { - "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore_5", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "ags": "ags", - "devenv": "devenv", - "home-manager": "home-manager", - "hyprland": "hyprland", - "hyprpanel": "hyprpanel", - "hyprspace": "hyprspace", - "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_7", - "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim", - "pre-commit-hooks": "pre-commit-hooks_3", - "sops-nix": "sops-nix", - "stylix": "stylix", - "superfile": "superfile" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1736808430, - "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-helix": "base16-helix", - "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_2", - "git-hooks": "git-hooks_3", - "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_4", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" - }, - "locked": { - "lastModified": 1736955291, - "narHash": "sha256-h5y11C4vMi8VoIVeHr/xFJO5N1nWKiKoAILPPUl7P/8=", - "owner": "danth", - "repo": "stylix", - "rev": "2985ee9b2836a725b04628d24f934212b96eacbe", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, - "superfile": { - "inputs": { - "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_3", - "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_10" - }, - "locked": { - "lastModified": 1736149529, - "narHash": "sha256-v7EfMgOsc6FSGIjYkF+44t0wl34WFmokOtzNOAOneBc=", - "owner": "MHNightCat", - "repo": "superfile", - "rev": "820140a9cb3f815f5528c59d43681575aceef172", - "type": "github" - }, - "original": { - "owner": "MHNightCat", - "repo": "superfile", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1729501581, - "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1734907020, - "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, - "xdph_2": { - "inputs": { - "hyprland-protocols": [ - "hyprspace", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprspace", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/home-manager/machines/candlekeep.nix b/home-manager/machines/candlekeep.nix index 607d673..271ae5c 100644 --- a/home-manager/machines/candlekeep.nix +++ b/home-manager/machines/candlekeep.nix @@ -22,7 +22,8 @@ ./candlekeep/variables.nix # ./nvim.nix ../modules/common.nix - ../modules/hyprland.nix + # ../modules/hyprland.nix + ../modules/hyprland ../modules/common-gui.nix ../modules/linux-gui.nix ../modules/devenv.nix diff --git a/home-manager/machines/grymforge.nix b/home-manager/machines/grymforge.nix index af104e5..1712cc3 100644 --- a/home-manager/machines/grymforge.nix +++ b/home-manager/machines/grymforge.nix @@ -7,7 +7,8 @@ config, pkgs, ... -}: { +}: +{ # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -17,8 +18,14 @@ # inputs.nix-colors.homeManagerModules.default # You can also split up your configuration and import pieces of it here: + + ./candlekeep/variables.nix + ../modules/hyprpanel.nix + ../modules/hyprlock.nix + # ../modules/hypridle.nix # ./nvim.nix ../modules/common.nix + ../modules/hyprland.nix ../modules/common-gui.nix ../modules/linux-gui.nix @@ -106,7 +113,7 @@ # Add stuff for your user as you see fit: # programs.neovim.enable = true; - home.packages = with pkgs; [openvpn]; + home.packages = with pkgs; [ openvpn ]; # Enable home-manager and git programs.home-manager.enable = true; diff --git a/home-manager/machines/grymforge/variables.nix b/home-manager/machines/grymforge/variables.nix new file mode 100644 index 0000000..762f024 --- /dev/null +++ b/home-manager/machines/grymforge/variables.nix @@ -0,0 +1,26 @@ +{ config, ... }: +{ + imports = [ ../../../common/nixos/variables-config.nix ]; + + config.var = { + hostname = "grymforge"; + username = "gwg313"; + configDirectory = "/home/" + config.var.username + "/.config/nixos"; + + keyboardLayout = "en_US"; + + location = "Ottawa"; + timeZone = "American/Toronto"; + defaultLocale = "en_US.UTF-8"; + + git = { + username = "gwg313"; + email = "gwg313@pm.me"; + }; + + autoUpgrade = true; + autoGarbageCollector = true; + + theme = import ../../../common/style/vars/grymforge.nix; + }; +} diff --git a/home-manager/modules/btop.nix b/home-manager/modules/btop.nix new file mode 100644 index 0000000..dcd59ed --- /dev/null +++ b/home-manager/modules/btop.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + programs.btop = { + enable = true; + }; +} diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index 2fee039..a8234f5 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -8,6 +8,7 @@ imports = [ ./atuin.nix ./bat.nix + ./btop.nix # ./broot.nix ./eza.nix ./git.nix @@ -23,11 +24,13 @@ home.packages = with pkgs; [ - ghostty # Editors # neovim # Improved version of vim, often used with overlays. vim # Highly configurable text editor popular for efficiency and extensibility. + sshfs + lurk + # Builtin Replacements bottom # Similar to 'htop,' providing a top-like interface with additional features. colordiff # Tool to colorize 'diff' output, making differences between files easier to spot. diff --git a/home-manager/modules/ghostty.nix b/home-manager/modules/ghostty.nix index 833c22f..e9ba672 100644 --- a/home-manager/modules/ghostty.nix +++ b/home-manager/modules/ghostty.nix @@ -9,10 +9,12 @@ enableZshIntegration = true; settings = { auto-update = "off"; - background-opacity = 0.8; + # background-opacity = 0.8; + background-opacity = 1; confirm-close-surface = false; - font-family = "Comic Code Ligatures"; - font-size = 14; + font-family = lib.mkForce "Comic Code Ligatures"; + font-size = 16; + gtk-titlebar = false; # theme = "Teerb"; }; diff --git a/home-manager/modules/hyprland.nix b/home-manager/modules/hyprland.nix index 8bf305e..7c1a7da 100644 --- a/home-manager/modules/hyprland.nix +++ b/home-manager/modules/hyprland.nix @@ -99,14 +99,14 @@ # general binds ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid # "$mod, RETURN, exec, ${pkgs.alacritty}/bin/alacritty" - "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" + "$mod, RETURN, exec, ${pkgs.ghostty}/bin/ghostty" "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus "$mod, Q, killactive" "SUPER_SHIFT, Q, exec, ${pkgs.wlogout}/bin/wlogout" "$mod, SPACE, exec, pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" # pkill or allows for toggle "SUPER_SHIFT, SPACE, togglefloating" - # "$mod, F, fullscreen" - "$mod,F, exec, hyprfocus-toggle" # Toggle HyprFocus + "$mod, F, fullscreen" + # "$mod,F, exec, hyprfocus-toggle" # Toggle HyprFocus "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" "$mod, B, exec, ${pkgs.grim}/bin/grim \"desktop-$(${pkgs.busybox}/bin/date +\"%Y%m%d%H%m\").png" "SUPER_SHIFT, B, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy" # Screenshot selection directly to clipboard @@ -167,7 +167,15 @@ "$mod_ALT, mouse:272, resizewindow" ]; - monitor = [ ",preferred,auto,1" ]; + monitor = [ + # "eDP-1,highres,0x0,1" + # "DP-1,preferred,0x0,1" + # "HDMI-A-1,2560x0,auto,1" + ",preferred,auto,1" + ]; + # monitor = [ "DP-1,preferred,0x0,1" ]; + # monitor = [ "HDMI-A-1,2560x0,auto,1" ]; + # monitor = [ "HDMI-A-1,1920x1080@144,auto,1" ]; exec = [ "${pkgs.swaybg}/bin/swaybg -i ${config.stylix.image} -m fill" ]; exec-once = [ diff --git a/home-manager/modules/hyprland/bindings.nix b/home-manager/modules/hyprland/bindings.nix index 3411a7d..7b8683d 100644 --- a/home-manager/modules/hyprland/bindings.nix +++ b/home-manager/modules/hyprland/bindings.nix @@ -15,7 +15,7 @@ # general binds ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid # "$mod, RETURN, exec, ${pkgs.alacritty}/bin/alacritty" - "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" + "$mod, RETURN, exec, ${pkgs.ghostty}/bin/ghostty" "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus "$mod, Q, killactive" "SUPER_SHIFT, Q, exec, ${pkgs.wlogout}/bin/wlogout" diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix new file mode 100644 index 0000000..9c25983 --- /dev/null +++ b/home-manager/modules/hyprland/default.nix @@ -0,0 +1,169 @@ +{ + pkgs, + config, + inputs, + ... +}: +let + border-size = config.var.theme.border-size; + gaps-in = config.var.theme.gaps-in; + gaps-out = config.var.theme.gaps-out; + active-opacity = config.var.theme.active-opacity; + inactive-opacity = config.var.theme.inactive-opacity; + rounding = config.var.theme.rounding; + blur = config.var.theme.blur; + keyboardLayout = config.var.keyboardLayout; +in +{ + + imports = [ + ./animations.nix + ./bindings.nix + ./polkitagent.nix + # ./hyprspace.nix + ]; + + home.packages = with pkgs; [ + qt5.qtwayland + qt6.qtwayland + libsForQt5.qt5ct + qt6ct + hyprshot + hyprpicker + swappy + imv + wf-recorder + wlr-randr + wl-clipboard + brightnessctl + gnome-themes-extra + libva + dconf + wayland-utils + wayland-protocols + glib + direnv + meson + ]; + + wayland.windowManager.hyprland = { + enable = true; + xwayland.enable = true; + systemd.enable = true; + package = inputs.hyprland.packages."${pkgs.system}".hyprland; + + settings = { + "$mod" = "SUPER"; + "$shiftMod" = "SUPER_SHIFT"; + + monitor = [ + ",prefered,auto,1" + ]; + + env = [ + "XDG_SESSION_TYPE,wayland" + "XDG_CURRENT_DESKTOP,Hyprland" + "MOZ_ENABLE_WAYLAND,1" + "ANKI_WAYLAND,1" + "DISABLE_QT5_COMPAT,0" + "NIXOS_OZONE_WL,1" + "XDG_SESSION_TYPE,wayland" + "XDG_SESSION_DESKTOP,Hyprland" + "QT_AUTO_SCREEN_SCALE_FACTOR,1" + "QT_QPA_PLATFORM=wayland,xcb" + "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" + "ELECTRON_OZONE_PLATFORM_HINT,auto" + # "GTK_THEME,FlatColor:dark" + # "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc" + "__GL_GSYNC_ALLOWED,0" + "__GL_VRR_ALLOWED,0" + "DISABLE_QT5_COMPAT,0" + "DIRENV_LOG_FORMAT," + "WLR_DRM_NO_ATOMIC,1" + "WLR_BACKEND,vulkan" + "WLR_RENDERER,vulkan" + "WLR_NO_HARDWARE_CURSORS,1" + "XDG_SESSION_TYPE,wayland" + "SDL_VIDEODRIVER,wayland" + "CLUTTER_BACKEND,wayland" + "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU + ]; + + cursor = { + no_hardware_cursors = true; + default_monitor = "eDP-2"; + }; + + general = { + resize_on_border = true; + gaps_in = gaps-in; + gaps_out = gaps-out; + border_size = border-size; + border_part_of_window = true; + layout = "master"; + }; + + decoration = { + active_opacity = active-opacity; + inactive_opacity = inactive-opacity; + rounding = rounding; + shadow = { + enabled = true; + range = 20; + render_power = 3; + }; + blur = { + enabled = if blur then "true" else "false"; + }; + }; + + master = { + new_status = true; + allow_small_split = true; + mfact = 0.5; + }; + + gestures = { + workspace_swipe = true; + }; + + misc = { + vfr = true; + disable_hyprland_logo = true; + disable_splash_rendering = true; + disable_autoreload = true; + focus_on_activate = true; + new_window_takes_over_fullscreen = 2; + }; + + windowrulev2 = [ + "float, tag:modal" + "pin, tag:modal" + "center, tag:modal" + ]; + + layerrule = [ + "noanim, launcher" + "noanim, ^ags-.*" + ]; + + input = { + # kb_layout = keyboardLayout; + + kb_options = "caps:escape"; + follow_mouse = 1; + sensitivity = 0.5; + repeat_delay = 300; + repeat_rate = 50; + numlock_by_default = true; + + touchpad = { + natural_scroll = true; + clickfinger_behavior = true; + }; + }; + + }; + }; + systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; +} diff --git a/home-manager/modules/hyprland/hyprland.nix b/home-manager/modules/hyprland/hyprland.nix index 8bf305e..66813a2 100644 --- a/home-manager/modules/hyprland/hyprland.nix +++ b/home-manager/modules/hyprland/hyprland.nix @@ -106,7 +106,7 @@ "$mod, SPACE, exec, pkill fuzzel || ${pkgs.fuzzel}/bin/fuzzel" # pkill or allows for toggle "SUPER_SHIFT, SPACE, togglefloating" # "$mod, F, fullscreen" - "$mod,F, exec, hyprfocus-toggle" # Toggle HyprFocus + "$mod,F, exec, fullscreen" "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" "$mod, B, exec, ${pkgs.grim}/bin/grim \"desktop-$(${pkgs.busybox}/bin/date +\"%Y%m%d%H%m\").png" "SUPER_SHIFT, B, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy" # Screenshot selection directly to clipboard diff --git a/home-manager/modules/hyprland/hyprspace.nix b/home-manager/modules/hyprland/hyprspace.nix index d7e30f7..a39ecc5 100644 --- a/home-manager/modules/hyprland/hyprspace.nix +++ b/home-manager/modules/hyprland/hyprspace.nix @@ -11,7 +11,7 @@ }; bind = [ - "$mod,TAB, overview:toggle" # Overview + "$mod,TAB, overview:toggle" ]; }; diff --git a/home-manager/modules/hyprpanel.nix b/home-manager/modules/hyprpanel.nix index f741164..9ca3db9 100644 --- a/home-manager/modules/hyprpanel.nix +++ b/home-manager/modules/hyprpanel.nix @@ -1,12 +1,9 @@ # Hyprpanel is the bar on top of the screen # Display informations like workspaces, battery, wifi, ... -{ pkgs, config, ... }: +{ inputs, config, ... }: let transparentButtons = config.var.theme.bar.transparentButtons; - location = config.var.location; - username = config.var.username; - accent = "#${config.lib.stylix.colors.base0D}"; accent-alt = "#${config.lib.stylix.colors.base03}"; background = "#${config.lib.stylix.colors.base00}"; @@ -25,215 +22,164 @@ let transparent = config.var.theme.bar.transparent; position = config.var.theme.bar.position; + location = config.var.location; in { - wayland.windowManager.hyprland.settings.exec-once = [ "${pkgs.hyprpanel}/bin/hyprpanel" ]; - home.packages = with pkgs; [ - hyprpanel - libnotify - ]; + imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ]; - home.file.".cache/ags/hyprpanel/options.json" = { - text = # json - '' - { - "bar.layouts": { - "0": { - "left": [ - "dashboard", - "workspaces", - "windowtitle" - ], - "middle": [ - "media" - ], - "right": [ - "systray", - "volume", - "bluetooth", - "battery", - "network", - "clock", - "notifications" - ] - }, - "1": { - "left": [ - "dashboard", - "workspaces", - "windowtitle" - ], - "middle": [ - "media" - ], - "right": [ - "systray", - "volume", - "bluetooth", - "battery", - "network", - "clock", - "notifications" - ] - }, - "2": { - "left": [ - "dashboard", - "workspaces", - "windowtitle" - ], - "middle": [ - "media" - ], - "right": [ - "systray", - "volume", - "bluetooth", - "battery", - "network", - "clock", - "notifications" - ] - } - }, - "theme.font.name": "${font}", - "theme.font.size": "${fontSize}px", - "theme.bar.outer_spacing": "${if floating && transparent then "0" else "8"}px", - "theme.bar.buttons.y_margins": "${if floating && transparent then "0" else "8"}px", - "theme.bar.buttons.spacing": "0.3em", - "theme.bar.buttons.radius": "${ - if transparent then toString rounding else toString (rounding - 8) - }px", - "theme.bar.floating": ${if floating then "true" else "false"}, - "theme.bar.buttons.padding_x": "0.8rem", - "theme.bar.buttons.padding_y": "0.4rem", + programs.hyprpanel = { + enable = true; + systemd.enable = true; + hyprland.enable = true; + overwrite.enable = true; + overlay.enable = true; + layout = { + "bar.layouts" = { + "0" = { + "left" = [ + "dashboard" + "workspaces" + "windowtitle" + ]; + "middle" = [ "media" ]; + "right" = [ + "systray" + "volume" + "bluetooth" + "battery" + "network" + "clock" + "notifications" + ]; + }; + }; + }; - "theme.bar.buttons.workspaces.hover": "${accent-alt}", - "theme.bar.buttons.workspaces.active": "${accent}", - "theme.bar.buttons.workspaces.available": "${accent-alt}", - "theme.bar.buttons.workspaces.occupied": "${accent}", + override = { + "theme.font.name" = "${font}"; + "theme.font.size" = "${fontSize}px"; + "theme.bar.outer_spacing" = "${if floating && transparent then "0" else "8"}px"; + "theme.bar.buttons.y_margins" = "${if floating && transparent then "0" else "8"}px"; + "theme.bar.buttons.spacing" = "0.3em"; + "theme.bar.buttons.radius" = "${ + if transparent then toString rounding else toString (rounding - 8) + }px"; + "theme.bar.floating" = "${if floating then "true" else "false"}"; + "theme.bar.buttons.padding_x" = "0.8rem"; + "theme.bar.buttons.padding_y" = "0.4rem"; + "theme.bar.buttons.workspaces.hover" = "${accent-alt}"; + "theme.bar.buttons.workspaces.active" = "${accent}"; + "theme.bar.buttons.workspaces.available" = "${accent-alt}"; + "theme.bar.buttons.workspaces.occupied" = "${accent-alt}"; + "theme.bar.margin_top" = "${if position == "top" then toString (gaps-in * 2) else "0"}px"; + "theme.bar.margin_bottom" = "${if position == "top" then "0" else toString (gaps-in * 2)}px"; + "theme.bar.margin_sides" = "${toString gaps-out}px"; + "theme.bar.border_radius" = "${toString rounding}px"; + "bar.launcher.icon" = ""; + "theme.bar.transparent" = "${if transparent then "true" else "false"}"; + "bar.workspaces.show_numbered" = false; + "bar.workspaces.workspaces" = 5; + "bar.workspaces.hideUnoccupied" = false; + "bar.windowtitle.label" = true; + "bar.volume.label" = false; + "bar.network.truncation_size" = 12; + "bar.bluetooth.label" = false; + "bar.clock.format" = "%a %b %d %I:%M %p"; + "bar.notifications.show_total" = true; + "theme.notification.border_radius" = "${toString rounding}px"; + "theme.osd.enable" = true; + "theme.osd.orientation" = "vertical"; + "theme.osd.location" = "left"; + "theme.osd.radius" = "${toString rounding}px"; + "theme.osd.margins" = "0px 0px 0px 10px"; + "theme.osd.muted_zero" = true; + "menus.clock.weather.location" = "${location}"; + "menus.clock.weather.unit" = "metric"; + "menus.dashboard.powermenu.confirmation" = false; - "theme.bar.margin_top": "${if position == "top" then toString (gaps-in * 2) else "0"}px", - "theme.bar.margin_bottom": "${if position == "top" then "0" else toString (gaps-in * 2)}px", - "theme.bar.margin_sides": "${toString gaps-out}px", - "theme.bar.border_radius": "${toString rounding}px", + "menus.dashboard.shortcuts.left.shortcut1.icon" = ""; + "menus.dashboard.shortcuts.left.shortcut1.command" = "zen"; + "menus.dashboard.shortcuts.left.shortcut1.tooltip" = "Zen"; + "menus.dashboard.shortcuts.left.shortcut2.icon" = "󰅶"; + "menus.dashboard.shortcuts.left.shortcut2.command" = "caffeine"; + "menus.dashboard.shortcuts.left.shortcut2.tooltip" = "Caffeine"; + "menus.dashboard.shortcuts.left.shortcut3.icon" = "󰖔"; + "menus.dashboard.shortcuts.left.shortcut3.command" = "night-shift"; + "menus.dashboard.shortcuts.left.shortcut3.tooltip" = "Night-shift"; + "menus.dashboard.shortcuts.left.shortcut4.icon" = ""; + "menus.dashboard.shortcuts.left.shortcut4.command" = "menu"; + "menus.dashboard.shortcuts.left.shortcut4.tooltip" = "Search Apps"; + "menus.dashboard.shortcuts.right.shortcut1.icon" = ""; + "menus.dashboard.shortcuts.right.shortcut1.command" = "hyprpicker -a"; + "menus.dashboard.shortcuts.right.shortcut1.tooltip" = "Color Picker"; + "menus.dashboard.shortcuts.right.shortcut3.icon" = "󰄀"; + "menus.dashboard.shortcuts.right.shortcut3.command" = "screenshot region swappy"; + "menus.dashboard.shortcuts.right.shortcut3.tooltip" = "Screenshot"; - "bar.launcher.icon": "", - "theme.bar.transparent": ${if transparent then "true" else "false"}, - "bar.workspaces.show_numbered": false, - "bar.workspaces.workspaces": 5, - "bar.workspaces.monitorSpecific": true, - "bar.workspaces.hideUnoccupied": false, - "bar.windowtitle.label": true, - "bar.volume.label": false, - "bar.network.truncation_size": 12, - "bar.bluetooth.label": false, - "bar.clock.format": "%a %b %d %I:%M %p", - "bar.notifications.show_total": true, - "theme.notification.border_radius": "${toString rounding}px", - "theme.osd.enable": true, - "theme.osd.orientation": "vertical", - "theme.osd.location": "left", - "theme.osd.radius": "${toString rounding}px", - "theme.osd.margins": "0px 0px 0px 10px", - "theme.osd.muted_zero": true, - "menus.clock.weather.location": "${location}", - "menus.clock.weather.key": "myapikey", - "menus.clock.weather.unit": "metric", - "menus.dashboard.powermenu.avatar.image": "/home/${username}/.profile_picture.png", - "menus.dashboard.powermenu.confirmation": false, - - "menus.dashboard.shortcuts.left.shortcut1.icon": "", - "menus.dashboard.shortcuts.left.shortcut1.command": "qutebrowser", - "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Qutebrowser", - "menus.dashboard.shortcuts.left.shortcut2.icon": "󰅶", - "menus.dashboard.shortcuts.left.shortcut2.command": "caffeine", - "menus.dashboard.shortcuts.left.shortcut2.tooltip": "Caffeine", - "menus.dashboard.shortcuts.left.shortcut3.icon": "󰖔", - "menus.dashboard.shortcuts.left.shortcut3.command": "night-shift", - "menus.dashboard.shortcuts.left.shortcut3.tooltip": "Night-shift", - "menus.dashboard.shortcuts.left.shortcut4.icon": "", - "menus.dashboard.shortcuts.left.shortcut4.command": "menu", - "menus.dashboard.shortcuts.left.shortcut4.tooltip": "Search Apps", - "menus.dashboard.shortcuts.right.shortcut1.icon": "", - "menus.dashboard.shortcuts.right.shortcut1.command": "hyprpicker -a", - "menus.dashboard.shortcuts.right.shortcut1.tooltip": "Color Picker", - "menus.dashboard.shortcuts.right.shortcut3.icon": "󰄀", - "menus.dashboard.shortcuts.right.shortcut3.command": "screenshot region swappy", - "menus.dashboard.shortcuts.right.shortcut3.tooltip": "Screenshot", - - "menus.dashboard.directories.left.directory1.label": "󰉍 Downloads", - "menus.dashboard.directories.left.directory1.command": "bash -c \"thunar $HOME/Downloads/\"", - "menus.dashboard.directories.left.directory2.label": "󰉏 Pictures", - "menus.dashboard.directories.left.directory2.command": "bash -c \"thunar $HOME/Pictures/\"", - "menus.dashboard.directories.left.directory3.label": "󱧶 Documents", - "menus.dashboard.directories.left.directory3.command": "bash -c \"thunar $HOME/Documents/\"", - "menus.dashboard.directories.right.directory1.label": "󱂵 Home", - "menus.dashboard.directories.right.directory1.command": "bash -c \"thunar $HOME/\"", - "menus.dashboard.directories.right.directory2.label": "󰚝 Projects", - "menus.dashboard.directories.right.directory2.command": "bash -c \"thunar $HOME/dev/\"", - "menus.dashboard.directories.right.directory3.label": " Config", - "menus.dashboard.directories.right.directory3.command": "bash -c \"thunar $HOME/.config/\"", - - "theme.bar.menus.monochrome": true, - "wallpaper.enable": false, - "theme.bar.menus.background": "${background}", - "theme.bar.menus.cards": "${background-alt}", - "theme.bar.menus.card_radius": "${toString rounding}px", - "theme.bar.menus.label": "${foreground}", - "theme.bar.menus.text": "${foreground}", - "theme.bar.menus.border.size": "${toString border-size}px", - "theme.bar.menus.border.color": "${accent}", - "theme.bar.menus.border.radius": "${toString rounding}px", - "theme.bar.menus.popover.text": "${foreground}", - "theme.bar.menus.popover.background": "${background-alt}", - "theme.bar.menus.listitems.active": "${accent}", - "theme.bar.menus.icons.active": "${accent}", - "theme.bar.menus.switch.enabled":"${accent}", - "theme.bar.menus.check_radio_button.active": "${accent}", - "theme.bar.menus.buttons.default": "${accent}", - "theme.bar.menus.buttons.active": "${accent}", - "theme.bar.menus.iconbuttons.active": "${accent}", - "theme.bar.menus.progressbar.foreground": "${accent}", - "theme.bar.menus.slider.primary": "${accent}", - "theme.bar.menus.tooltip.background": "${background-alt}", - "theme.bar.menus.tooltip.text": "${foreground}", - "theme.bar.menus.dropdownmenu.background":"${background-alt}", - "theme.bar.menus.dropdownmenu.text": "${foreground}", - "theme.bar.background": "${background + (if transparentButtons then "00" else "")}", - "theme.bar.buttons.style": "default", - "theme.bar.buttons.monochrome": true, - "theme.bar.buttons.text": "${foreground}", - "theme.bar.buttons.background": "${ - (if transparent then background else background-alt) + (if transparentButtons then "00" else "") - }", - "theme.bar.buttons.icon": "${accent}", - "theme.bar.buttons.notifications.background": "${background-alt}", - "theme.bar.buttons.hover": "${background}", - "theme.bar.buttons.notifications.hover": "${background}", - "theme.bar.buttons.notifications.total": "${accent}", - "theme.bar.buttons.notifications.icon": "${accent}", - "theme.notification.background": "${background-alt}", - "theme.notification.actions.background": "${accent}", - "theme.notification.actions.text": "${foreground}", - "theme.notification.label": "${accent}", - "theme.notification.border": "${background-alt}", - "theme.notification.text": "${foreground}", - "theme.notification.labelicon": "${accent}", - "theme.osd.bar_color": "${accent}", - "theme.osd.bar_overflow_color": "${accent-alt}", - "theme.osd.icon": "${background}", - "theme.osd.icon_container": "${accent}", - "theme.osd.label": "${accent}", - "theme.osd.bar_container": "${background-alt}", - "theme.bar.menus.menu.media.background.color": "${background-alt}", - "theme.bar.menus.menu.media.card.color": "${background-alt}", - "theme.bar.menus.menu.media.card.tint": 90, - "bar.customModules.updates.pollingInterval": 1440000, - "bar.media.show_active_only": true, - "theme.bar.location": "${position}" - } - ''; + "theme.bar.menus.monochrome" = true; + "wallpaper.enable" = false; + "theme.bar.menus.background" = "${background}"; + "theme.bar.menus.cards" = "${background-alt}"; + "theme.bar.menus.card_radius" = "${toString rounding}px"; + "theme.bar.menus.label" = "${foreground}"; + "theme.bar.menus.text" = "${foreground}"; + "theme.bar.menus.border.size" = "${toString border-size}px"; + "theme.bar.menus.border.color" = "${accent}"; + "theme.bar.menus.border.radius" = "${toString rounding}px"; + "theme.bar.menus.popover.text" = "${foreground}"; + "theme.bar.menus.popover.background" = "${background-alt}"; + "theme.bar.menus.listitems.active" = "${accent}"; + "theme.bar.menus.icons.active" = "${accent}"; + "theme.bar.menus.switch.enabled" = "${accent}"; + "theme.bar.menus.check_radio_button.active" = "${accent}"; + "theme.bar.menus.buttons.default" = "${accent}"; + "theme.bar.menus.buttons.active" = "${accent}"; + "theme.bar.menus.iconbuttons.active" = "${accent}"; + "theme.bar.menus.progressbar.foreground" = "${accent}"; + "theme.bar.menus.slider.primary" = "${accent}"; + "theme.bar.menus.tooltip.background" = "${background-alt}"; + "theme.bar.menus.tooltip.text" = "${foreground}"; + "theme.bar.menus.dropdownmenu.background" = "${background-alt}"; + "theme.bar.menus.dropdownmenu.text" = "${foreground}"; + "theme.bar.background" = "${background + (if transparentButtons && transparent then "00" else "")}"; + "theme.bar.buttons.style" = "default"; + "theme.bar.buttons.monochrome" = true; + "theme.bar.buttons.text" = "${foreground}"; + "theme.bar.buttons.background" = "${ + (if transparent then background else background-alt) + (if transparentButtons then "00" else "") + }"; + "theme.bar.buttons.icon" = "${accent}"; + "theme.bar.buttons.notifications.background" = "${background-alt}"; + "theme.bar.buttons.hover" = "${background}"; + "theme.bar.buttons.notifications.hover" = "${background}"; + "theme.bar.buttons.notifications.total" = "${accent}"; + "theme.bar.buttons.notifications.icon" = "${accent}"; + "theme.notification.background" = "${background-alt}"; + "theme.notification.actions.background" = "${accent}"; + "theme.notification.actions.text" = "${foreground}"; + "theme.notification.label" = "${accent}"; + "theme.notification.border" = "${background-alt}"; + "theme.notification.text" = "${foreground}"; + "theme.notification.labelicon" = "${accent}"; + "theme.osd.bar_color" = "${accent}"; + "theme.osd.bar_overflow_color" = "${accent-alt}"; + "theme.osd.icon" = "${background}"; + "theme.osd.icon_container" = "${accent}"; + "theme.osd.label" = "${accent}"; + "theme.osd.bar_container" = "${background-alt}"; + "theme.bar.menus.menu.media.background.color" = "${background-alt}"; + "theme.bar.menus.menu.media.card.color" = "${background-alt}"; + "theme.bar.menus.menu.media.card.tint" = 90; + "bar.customModules.updates.pollingInterval" = 1440000; + "bar.media.show_active_only" = true; + "theme.bar.location" = "${position}"; + "bar.workspaces.numbered_active_indicator" = "color"; + "bar.workspaces.monitorSpecific" = false; + "bar.workspaces.applicationIconEmptyWorkspace" = ""; + "bar.workspaces.showApplicationIcons" = true; + "bar.workspaces.showWsIcons" = true; + "theme.bar.dropdownGap" = "4.5em"; + }; }; } diff --git a/home-manager/modules/nushell.nix b/home-manager/modules/nushell.nix index 8b5d0ce..f64624f 100644 --- a/home-manager/modules/nushell.nix +++ b/home-manager/modules/nushell.nix @@ -22,9 +22,6 @@ "..." = "cd ../../../"; "...." = "cd ../../../../"; - ls = "ls | grid -c -i"; - ll = "ls"; - ps = "procs"; grep = "rg"; cat = "bat"; diff --git a/home-manager/modules/nushell/default.nix b/home-manager/modules/nushell/default.nix index 4d5d34f..76b2090 100644 --- a/home-manager/modules/nushell/default.nix +++ b/home-manager/modules/nushell/default.nix @@ -35,8 +35,49 @@ fastfetch ''; shellAliases = { - c = "clear"; cd = "z"; + + update = "sudo nixos-rebuild switch"; + clean = "nix-collect-garbage -d"; + repair = "nix-store --repair --verify --check-contents"; + + "." = "cd ../"; + ".." = "cd ../../"; + "..." = "cd ../../../"; + "...." = "cd ../../../../"; + + ps = "procs"; + grep = "rg"; + cat = "bat"; + vim = "nvim"; + + # Default flags + rm = "rm -i"; + chmod = "chmod -R"; + cp = "cp -i -v"; + mv = "mv -i -v"; + mkdir = "mkdir -v"; + df = "df -h"; + du = "du -h"; + dd = "dd status=progress bs=4M conv=fdatasync "; + wgetpaste = "wgetpaste -Xx"; + sudo = "sudo "; # Makes sudo work with es + # ssh = "TERM=xterm ssh"; # Fixes some issues with ssh on some terminals + wget = "wget -c"; + ping = "ping -c 5"; + ftp = "ftp -p"; + + # Misc alieses I use often + + ports = "ss -tulanp"; + rmd = "rm -rf"; + # mine = "sudo chown -R (whoami):users"; + benchmark = "hyperfine --warmup 3 "; + c = "clear"; + listen = "lsof -P -i -n"; + octal = "stat -c '%a %n'"; + l = "ls --all"; + lt = "eza --tree --level=2 --long --icons --git"; }; }; carapace.enable = true; diff --git a/home-manager/modules/nushell/default.sync-conflict-20250129-104440-N2TYFZ4.nix b/home-manager/modules/nushell/default.sync-conflict-20250129-104440-N2TYFZ4.nix new file mode 100644 index 0000000..c112346 --- /dev/null +++ b/home-manager/modules/nushell/default.sync-conflict-20250129-104440-N2TYFZ4.nix @@ -0,0 +1,97 @@ +{ ... }: +{ + programs = { + nushell = { + enable = true; + # The config.nu can be anywhere you want if you like to edit your Nushell with Nu + # configFile.source = ./.../config.nu; + # for editing directly to config.nu + envFile.source = ./env.nu; + extraConfig = '' + let carapace_completer = {|spans| + carapace $spans.0 nushell $spans | from json + } + $env.config = { + show_banner: false, + completions: { + case_sensitive: false # case-sensitive completions + quick: true # set to false to prevent auto-selecting completions + partial: true # set to false to prevent partial filling of the prompt + algorithm: "fuzzy" # prefix or fuzzy + external: { + # set to false to prevent nushell looking into $env.PATH to find more suggestions + enable: true + # set to lower can improve completion performance at the cost of omitting some options + max_results: 100 + completer: $carapace_completer # check 'carapace_completer' + } + } + } + $env.PATH = ($env.PATH | + split row (char esep) | + prepend /home/myuser/.apps | + append /usr/bin/env + ) + fastfetch + ''; + shellAliases = { + cd = "z"; + + update = "sudo nixos-rebuild switch"; + clean = "nix-collect-garbage -d"; + repair = "nix-store --repair --verify --check-contents"; + + "." = "cd ../"; + ".." = "cd ../../"; + "..." = "cd ../../../"; + "...." = "cd ../../../../"; + + ps = "procs"; + grep = "rg"; + cat = "bat"; + vim = "nvim"; + + # Default flags + rm = "rm -i"; + chmod = "chmod -R"; + cp = "cp -i -v"; + mv = "mv -i -v"; + mkdir = "mkdir -v"; + df = "df -h"; + # du = "du -h"; + dd = "dd status=progress bs=4M conv=fdatasync "; + wgetpaste = "wgetpaste -Xx"; + sudo = "sudo "; # Makes sudo work with es + ssh = "TERM=xterm ssh"; # Fixes some issues with ssh on some terminals + wget = "wget -c"; + ping = "ping -c 5"; + ftp = "ftp -p"; + + # Misc alieses I use often + + ports = "ss -tulanp"; + rmd = "rm -rf"; + # mine = "sudo chown -R (whoami):users"; + benchmark = "hyperfine --warmup 3 "; + c = "clear"; + listen = "lsof -P -i -n"; + octal = "stat -c '%a %n'"; + l = "ls --all"; + lt = "eza --tree --level=2 --long --icons --git"; + }; + }; + carapace.enable = true; + carapace.enableNushellIntegration = true; + + starship = { + enable = true; + settings = { + add_newline = true; + # character = { + # success_symbol = "[➜](bold green)"; + # error_symbol = "[➜](bold red)"; + # }; + }; + }; + }; +} diff --git a/home-manager/modules/nushell/gitaliases.nix b/home-manager/modules/nushell/gitaliases.nix new file mode 100644 index 0000000..5902ba8 --- /dev/null +++ b/home-manager/modules/nushell/gitaliases.nix @@ -0,0 +1,126 @@ +{ }: +{ + programs.nushell.aliases = { + + s = "git status -sb"; + g = "git"; + ga = "git add"; + gaa = "git add --all"; + gapa = "git add --patch"; + gau = "git add --update"; + gb = "git branch"; + gba = "git branch -a"; + gbd = "git branch -d"; + gbl = "git blame -b -w"; + gbnm = "git branch --no-merged"; + gbr = "git branch --remote"; + gbs = "git bisect"; + gbsb = "git bisect bad"; + gbsg = "git bisect good"; + gbsr = "git bisect reset"; + gbss = "git bisect start"; + gc = "git commit -v"; + "gc!" = "git commit -v --amend"; + gca = "git commit -v -a"; + "gca!" = "git commit -v -a --amend"; + gcam = "git commit -a -m"; + "gcan!" = "git commit -v -a --no-edit --amend"; + "gcans!" = "git commit -v -a -s --no-edit --amend"; + gcb = "git checkout -b"; + gcd = "git checkout develop"; + gcf = "git config --list"; + gcl = "git clone --recursive"; + gclean = "git clean -fd"; + gcm = "git checkout master"; + gcmsg = "git commit -m"; + "gcn!" = "git commit -v --no-edit --amend"; + gco = "git checkout"; + gcount = "git shortlog -sn"; + gcp = "git cherry-pick"; + gcpa = "git cherry-pick --abort"; + gcpc = "git cherry-pick --continue"; + gcs = "git commit -S"; + gcsm = "git commit -s -m"; + gd = "git diff"; + gdca = "git diff --cached"; + gdt = "git diff-tree --no-commit-id --name-only -r"; + gdw = "git diff --word-diff"; + gf = "git fetch"; + gfa = "git fetch --all --prune"; + gfo = "git fetch origin"; + gg = "git gui citool"; + gga = "git gui citool --amend"; + ggpull = "git pull origin (git_current_branch)"; + ggpush = "git push origin (git_current_branch)"; + ggsup = "git branch --set-upstream-to=origin/(git_current_branch)"; + ghh = "git help"; + gignore = "git update-index --assume-unchanged"; + gk = "gitk --all --branches"; + gke = "gitk --all (git log -g --pretty=%h)"; + gl = "git pull"; + glg = "git log --stat"; + glgg = "git log --graph"; + glgga = "git log --graph --decorate --all"; + glgm = "git log --graph --max-count=10"; + glgp = "git log --stat -p"; + glo = "git log --oneline --decorate"; + globurl = "noglob urlglobber"; + glog = "git log --oneline --decorate --graph"; + gloga = "git log --oneline --decorate --graph --all"; + glol = "git log --graph --pretty=%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset\\ --abbrev-commit"; + glola = "git log --graph --pretty=%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset\\ --abbrev-commit --all"; + glp = "_git_log_prettily"; + glum = "git pull upstream master"; + gm = "git merge"; + gmom = "git merge origin/master"; + gmt = "git mergetool --no-prompt"; + gmtvim = "git mergetool --no-prompt --tool=vimdiff"; + gmum = "git merge upstream/master"; + gp = "git push"; + gpd = "git push --dry-run"; + gpoat = "git push origin --all && git push origin --tags"; + gpristine = "git reset --hard && git clean -dfx"; + gpsup = "git push --set-upstream origin (git_current_branch)"; + gpu = "git push upstream"; + gpv = "git push -v"; + gr = "git remote"; + gra = "git remote add"; + grb = "git rebase"; + grba = "git rebase --abort"; + grbc = "git rebase --continue"; + grbi = "git rebase -i"; + grbm = "git rebase master"; + grbs = "git rebase --skip"; + grep = "grep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn}"; + grh = "git reset HEAD"; + grhh = "git reset HEAD --hard"; + grmv = "git remote rename"; + grrm = "git remote remove"; + grset = "git remote set-url"; + grt = "cd (git rev-parse --show-toplevel || echo '.')"; + gru = "git reset --"; + grup = "git remote update"; + grv = "git remote -v"; + gsb = "git status -sb"; + gsd = "git svn dcommit"; + gsi = "git submodule init"; + gsps = "git show --pretty=short --show-signature"; + gsr = "git svn rebase"; + gss = "git status -s"; + gst = "git status"; + gsta = "git stash save"; + gstaa = "git stash apply"; + gstc = "git stash clear"; + gstd = "git stash drop"; + gstl = "git stash list"; + gstp = "git stash pop"; + gsts = "git stash show --text"; + gsu = "git submodule update"; + gts = "git tag -s"; + gtv = "git tag | sort"; + gunignore = "git update-index --no-assume-unchanged"; + gup = "git pull --rebase"; + gupv = "git pull --rebase -v"; + gwch = "git whatchanged -p --abbrev-commit --pretty=medium"; + }; +} diff --git a/home-manager/modules/tmux/tmux.nix b/home-manager/modules/tmux/tmux.nix index fd95065..c6d41fc 100644 --- a/home-manager/modules/tmux/tmux.nix +++ b/home-manager/modules/tmux/tmux.nix @@ -2,7 +2,8 @@ pkgs, config, ... -}: { +}: +{ stylix.targets.tmux.enable = false; programs.tmux = { enable = true; @@ -182,4 +183,16 @@ bindkey -M viins '\es' sesh-sessions ''; }; + + programs.nushell = { + shellAliases = { + tx = "sesh connect /home/${config.home.username}"; + ta = "tmux attach -t"; + tad = "tmux attach -d -t"; + ts = "tmux new-session -s"; + tl = "tmux list-sessions"; + tksv = "tmux kill-server"; + tkss = "tmux kill-session -t"; + }; + }; } diff --git a/home-manager/modules/yazi.nix b/home-manager/modules/yazi.nix index ebd5e04..f1918bc 100644 --- a/home-manager/modules/yazi.nix +++ b/home-manager/modules/yazi.nix @@ -1,11 +1,13 @@ -{pkgs, ...}: let +{ pkgs, ... }: +let plugins-repo = pkgs.fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "a3ee7173bff700214bc2d993ef605c3c41d800c9"; - hash = "sha256-m2A/vIgGMzFzhaOgFL21cZua8h2XaYu7Jb6yuZQKiTw="; + rev = "02d18be03812415097e83c6a912924560e4cec6d"; + hash = "sha256-1FZ8wcf2VVp6ZWY27vm1dUU1KAL32WwoYbNA/8RUAog="; }; -in { +in +{ programs.yazi = { enable = true; enableZshIntegration = true; @@ -28,8 +30,8 @@ in { starship = pkgs.fetchFromGitHub { owner = "Rolv-Apneseth"; repo = "starship.yazi"; - rev = "dc9989c2bdd3d04e615d3bbb5f3bf99ed6ce1a35"; - sha256 = "sha256-AwBqOKWtz5BzY7Sye1JljWI2t+JQGGQfOT6oQN7YTOg="; + rev = "af8bf6f82165b83272b6501ce7445cf2c61fbf51"; + sha256 = "sha256-L7MkZZqJ+t+A61ceC4Q1joLF6ytoWdgx9BwZWAGAoCA="; }; }; @@ -46,7 +48,10 @@ in { desc = "Maximize or restore the preview pane"; } { - on = ["c" "m"]; + on = [ + "c" + "m" + ]; run = "plugin chmod"; desc = "Chmod on selected files"; } diff --git a/hosts/candlekeep/configuration.nix b/hosts/candlekeep/configuration.nix index 535b931..30c6800 100644 --- a/hosts/candlekeep/configuration.nix +++ b/hosts/candlekeep/configuration.nix @@ -122,9 +122,13 @@ environment = { loginShellInit = '' - if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then - exec Hyprland - fi + # if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then + # exec Hyprland + # fi + + if (empty $env.DISPLAY) && ($tty == '/dev/tty1') { + exec Hyprland + } ''; # Will automatically open Hyprland when logged into tty1 variables = { TERMINAL = "alacritty"; diff --git a/hosts/grymforge/kernel.nix b/hosts/grymforge/kernel.nix index 23d8d3b..1fd03f2 100644 --- a/hosts/grymforge/kernel.nix +++ b/hosts/grymforge/kernel.nix @@ -1,5 +1,6 @@ -{pkgs, ...}: { - boot.kernelPackages = pkgs.linuxPackages_hardened; +{ pkgs, ... }: +{ + # boot.kernelPackages = pkgs.linuxPackages_hardened; boot.kernelParams = [ # Disable slab merging to prevent heap exploitation "slab_nomerge"