diff --git a/common/gui/steam.nix b/common/gui/steam.nix index 6c94923..3025e53 100644 --- a/common/gui/steam.nix +++ b/common/gui/steam.nix @@ -48,7 +48,7 @@ }; environment.systemPackages = with pkgs; [ - protonup + protonup-ng steam-devices-udev-rules scanmem ]; diff --git a/common/networking/hosts.nix b/common/networking/hosts.nix index dfe592c..6c4df8d 100644 --- a/common/networking/hosts.nix +++ b/common/networking/hosts.nix @@ -15,7 +15,7 @@ _: { 10.147.17.246 uptime.zerotier.gwg313.xyz 10.147.17.246 hdoc.zerotier.gwg313.xyz 10.147.17.246 cache.zerotier.gwg313.xyz - 10.147.17.246 a3-dev.zerotier.gwg313.xyz + 10.147.17.246 pm.zerotier.gwg313.xyz 10.147.17.246 argocd.zerotier.gwg313.xyz @@ -33,6 +33,6 @@ _: { 10.1.10.9 uptime.gwg313.xyz 10.1.10.50 hdoc.gwg313.xyz 10.1.10.13 cache.gwg313.xyz - 10.1.10.50 a3-dev.gwg313.xyz + 10.1.10.50 pm.gwg313.xyz ''; } diff --git a/common/networking/networkmanager.nix b/common/networking/networkmanager.nix index b025d2d..c158275 100644 --- a/common/networking/networkmanager.nix +++ b/common/networking/networkmanager.nix @@ -4,8 +4,7 @@ ... }: { - - environment.systemPackages = with pkgs; [ linuxKernel.packages.linux_5_4.wireguard ]; + # environment.systemPackages = with pkgs; [ linuxKernel.packages.linux_5_4.wireguard ]; sops.secrets."wireless.env" = { }; networking = { diff --git a/common/style/stylix.nix b/common/style/stylix.nix index aa8688b..b2adbbf 100644 --- a/common/style/stylix.nix +++ b/common/style/stylix.nix @@ -49,7 +49,7 @@ }; emoji = { - package = pkgs.noto-fonts-emoji; + package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; }; diff --git a/common/style/vars/vars.nix b/common/style/vars/vars.nix index 905dddc..64852d2 100644 --- a/common/style/vars/vars.nix +++ b/common/style/vars/vars.nix @@ -32,7 +32,7 @@ config.stylix = { enable = true; - + targets.zen-browser.profileNames = [ "Default Profile" ]; # See https://tinted-theming.github.io/tinted-gallery/ for more schemes # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml"; base16Scheme = { @@ -78,7 +78,7 @@ }; emoji = { - package = pkgs.noto-fonts-emoji; + package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; sizes = { @@ -90,6 +90,6 @@ }; polarity = "light"; - image = ../../../wallpapers/oasis.png; + image = lib.mkForce ../../../wallpapers/oasis.png; }; } diff --git a/flake.lock b/flake.lock index 75600f9..201e9d6 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1760176229, - "narHash": "sha256-Awrvmjo57VJHrVZCfGjPyf1NHFGopomoZiPUPT/3uls=", + "lastModified": 1764289441, + "narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=", "owner": "Aylur", "repo": "ags", - "rev": "772f6ade645a1ca7ba06cb5845c479bbf4ac06f5", + "rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1760101617, - "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=", + "lastModified": 1767024902, + "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1826a9923881320306231b1c2090379ebf9fa4f8", + "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1752743471, - "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1759873585, - "narHash": "sha256-DsYbOkDXSl162XcQPxu4bknsevArxmWoqmL1qqcVNSI=", + "lastModified": 1764173295, + "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=", "owner": "aylur", "repo": "astal", - "rev": "8d9ed4c624981156f52846ae58826f7c94f30546", + "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef", "type": "github" }, "original": { @@ -131,28 +131,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -184,7 +184,8 @@ "devenv" ], "flake-compat": [ - "devenv" + "devenv", + "flake-compat" ], "git-hooks": [ "devenv", @@ -196,11 +197,11 @@ ] }, "locked": { - "lastModified": 1752264895, - "narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=", + "lastModified": 1760971495, + "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=", "owner": "cachix", "repo": "cachix", - "rev": "47053aef762f452e816e44eb9a23fbc3827b241a", + "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2", "type": "github" }, "original": { @@ -210,6 +211,98 @@ "type": "github" } }, + "caelestia-cli": { + "inputs": { + "caelestia-shell": "caelestia-shell", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767838220, + "narHash": "sha256-kVsBPYrjmDVWM2PxOO/Est9zfOLE7DuCoW4/MkfBECM=", + "owner": "caelestia-dots", + "repo": "cli", + "rev": "86b0c94bd1520ec37e344c08953c3679ba36ac73", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "cli", + "type": "github" + } + }, + "caelestia-cli_2": { + "inputs": { + "caelestia-shell": [ + "caelestia-shell" + ], + "nixpkgs": [ + "caelestia-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767320190, + "narHash": "sha256-HXi1ED3ub/7yn3SEUw8641dLMFuxRlcMs/RgIbU91I8=", + "owner": "caelestia-dots", + "repo": "cli", + "rev": "337c711371e070fa28c2e55fffc5b0115a7cf40b", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "cli", + "type": "github" + } + }, + "caelestia-shell": { + "inputs": { + "caelestia-cli": [ + "caelestia-cli" + ], + "nixpkgs": [ + "caelestia-cli", + "nixpkgs" + ], + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1767490542, + "narHash": "sha256-NkwDCzDC5soGuAE4k8YuvdzYOi7ugrBjUxavKwmFoUM=", + "owner": "caelestia-dots", + "repo": "shell", + "rev": "1b4b90a3ad9532f7002ef2593d8efb68443f21f3", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "shell", + "type": "github" + } + }, + "caelestia-shell_2": { + "inputs": { + "caelestia-cli": "caelestia-cli_2", + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell_2" + }, + "locked": { + "lastModified": 1767490542, + "narHash": "sha256-NkwDCzDC5soGuAE4k8YuvdzYOi7ugrBjUxavKwmFoUM=", + "owner": "caelestia-dots", + "repo": "shell", + "rev": "1b4b90a3ad9532f7002ef2593d8efb68443f21f3", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "shell", + "type": "github" + } + }, "colmena": { "inputs": { "flake-compat": "flake-compat", @@ -219,11 +312,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1755272288, - "narHash": "sha256-ypTPb2eKcOBbOoyvPV0j4ZOXs4kayo73/2KI456QnE0=", + "lastModified": 1762034856, + "narHash": "sha256-QVey3iP3UEoiFVXgypyjTvCrsIlA4ecx6Acaz5C8/PQ=", "owner": "zhaofengli", "repo": "colmena", - "rev": "5bf4ce6a24adba74a5184f4a9bef01d545a09473", + "rev": "349b035a5027f23d88eeb3bc41085d7ee29f18ed", "type": "github" }, "original": { @@ -239,16 +332,17 @@ "flake-parts": "flake-parts", "git-hooks": "git-hooks", "nix": "nix", + "nixd": "nixd", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1760987569, - "narHash": "sha256-RAYg2y8R5yiSYQJhZWUf7rEopgXcyGDaOLTlCN/LfT4=", + "lastModified": 1767816354, + "narHash": "sha256-amiVbJDC+H8DJqZmguGQg8KEEtG6HFjsargXmvmrmQk=", "owner": "cachix", "repo": "devenv", - "rev": "829e3dba0dbf0f50772f95e683e5aeb9c93f0314", + "rev": "e63ad676a7dc73a3ff2f2428f7c01cdd8aa014e7", "type": "github" }, "original": { @@ -261,11 +355,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -293,11 +387,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -309,15 +403,15 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -325,11 +419,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -345,7 +439,7 @@ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -371,15 +465,15 @@ "flake-compat_7": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -408,11 +502,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -426,11 +520,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -447,11 +541,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -468,11 +562,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -489,11 +583,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -502,6 +596,21 @@ "type": "github" } }, + "flake-root": { + "locked": { + "lastModified": 1723604017, + "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", + "owner": "srid", + "repo": "flake-root", + "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -519,25 +628,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" - }, - "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_8" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -582,11 +673,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -686,18 +777,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.2", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "gomod2nix": { @@ -732,11 +825,11 @@ ] }, "locked": { - "lastModified": 1760973044, - "narHash": "sha256-Ij3H0qkzZ66X9934kH0JYoI3b/F2vamrDD9abT5Pi70=", + "lastModified": 1767824564, + "narHash": "sha256-DRhbz2dZaEmj5MgLFMXjEPfmKYfMG6LwNT9Bv8zeLPQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c3a5e5f0df6f53aa4b51adc0107796cc407c641c", + "rev": "4fee4bd14b5e4178855ad0041df89fa44f3f2bea", "type": "github" }, "original": { @@ -754,11 +847,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -815,11 +908,11 @@ ] }, "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -844,11 +937,11 @@ ] }, "locked": { - "lastModified": 1760445448, - "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=", + "lastModified": 1766946335, + "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757", + "rev": "4af02a3925b454deb1c36603843da528b67ded6c", "type": "github" }, "original": { @@ -876,11 +969,11 @@ ] }, "locked": { - "lastModified": 1752149140, - "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -894,22 +987,23 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1760959370, - "narHash": "sha256-eM1kSyA88KiZiY+xqnN/YbAAFeECtzJTrOF62Uuxs+o=", + "lastModified": 1767812022, + "narHash": "sha256-5IAOLd+773ciTZXlukGMjk8K1ZOHHuwxnDt8LihZ2+k=", "ref": "refs/heads/main", - "rev": "46dab01bcc47b2e29f36cd4d35d04091e4134a67", - "revCount": 6515, + "rev": "918e2bb9be0e1d233f9394f1d569137788c43c01", + "revCount": 6793, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -920,6 +1014,100 @@ "url": "https://github.com/hyprwm/Hyprland" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, + "hyprland-guiutils_2": { + "inputs": { + "aquamarine": [ + "hyprspace", + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprspace", + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprspace", + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit_2", + "hyprutils": [ + "hyprspace", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprspace", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprspace", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1762465111, + "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "a415eba866a953f3096d661318f771aa0082eb98", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -932,11 +1120,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -959,11 +1147,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1759610243, + "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "type": "github" }, "original": { @@ -973,38 +1161,6 @@ } }, "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qt-support_2": { "inputs": { "hyprlang": "hyprlang_2", "nixpkgs": [ @@ -1030,127 +1186,16 @@ "type": "github" } }, - "hyprland-qt-support_3": { - "inputs": { - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprland-qtutils_2": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support_3", - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1750371812, - "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprland_2": { "inputs": { "aquamarine": "aquamarine_2", "hyprcursor": "hyprcursor_2", "hyprgraphics": "hyprgraphics_2", + "hyprland-guiutils": "hyprland-guiutils_2", "hyprland-protocols": "hyprland-protocols_2", - "hyprland-qtutils": "hyprland-qtutils_2", "hyprlang": "hyprlang_3", "hyprutils": "hyprutils_4", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks_2", "systems": [ @@ -1160,11 +1205,11 @@ "xdph": "xdph_2" }, "locked": { - "lastModified": 1753523167, - "narHash": "sha256-VlRatMh0YqAYP2zUUe62mafb6jEuuzXX3mQ98b1Ifbo=", + "lastModified": 1762731096, + "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e1fff05d0db9c266679ec7ea1b5734c73d6b0a57", + "rev": "967c3c7404d4fa00234e29c70df3e263386d2597", "type": "github" }, "original": { @@ -1189,11 +1234,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -1249,11 +1294,11 @@ ] }, "locked": { - "lastModified": 1750371198, - "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -1264,7 +1309,7 @@ }, "hyprpolkitagent": { "inputs": { - "hyprland-qt-support": "hyprland-qt-support_2", + "hyprland-qt-support": "hyprland-qt-support", "hyprutils": "hyprutils_3", "nixpkgs": "nixpkgs_4", "systems": "systems_2" @@ -1289,11 +1334,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1759033501, - "narHash": "sha256-QhcOFLJYC9CiSVPkci62ghMEAJChzl+L98To1pKvnRQ=", + "lastModified": 1764820995, + "narHash": "sha256-IMa4mvkF0w7OAy+yEzPFYs2an332K30lf5qfUOAS9Cw=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "e54884da1d6a1af76af9d053887bf3750dd554fd", + "rev": "0467be86b18cfc324fab04afbd40fe9ef80f7fa9", "type": "github" }, "original": { @@ -1302,6 +1347,112 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, + "hyprtoolkit_2": { + "inputs": { + "aquamarine": [ + "hyprspace", + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprspace", + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprspace", + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprspace", + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": [ + "hyprspace", + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprspace", + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -1314,11 +1465,11 @@ ] }, "locked": { - "lastModified": 1759619523, - "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -1395,11 +1546,11 @@ ] }, "locked": { - "lastModified": 1752252310, - "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=", + "lastModified": 1762387740, + "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82", + "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", "type": "github" }, "original": { @@ -1420,11 +1571,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -1434,6 +1585,37 @@ } }, "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprspace", + "hyprland", + "hyprland-guiutils", + "hyprtoolkit", + "nixpkgs" + ], + "systems": [ + "hyprspace", + "hyprland", + "hyprland-guiutils", + "hyprtoolkit", + "systems" + ] + }, + "locked": { + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprspace", @@ -1447,11 +1629,11 @@ ] }, "locked": { - "lastModified": 1751897909, - "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -1460,31 +1642,32 @@ "type": "github" } }, - "ixx": { + "hyprwire": { "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" + "hyprutils": [ + "hyprland", + "hyprutils" ], "nixpkgs": [ - "nixvim", - "nuschtosSearch", + "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", + "lastModified": 1767473322, + "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", "type": "github" }, "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", + "owner": "hyprwm", + "repo": "hyprwire", "type": "github" } }, @@ -1503,6 +1686,83 @@ "type": "github" } }, + "ndg": { + "inputs": { + "nixpkgs": [ + "nvf", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765720983, + "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=", + "owner": "feel-co", + "repo": "ndg", + "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936", + "type": "github" + }, + "original": { + "owner": "feel-co", + "repo": "ndg", + "type": "github" + } + }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1769170609, + "narHash": "sha256-LiyaKNga2z/iG4pNr86iQLySEDoOytEzTCblxzRjnCk=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "08d6e6adf34b0af12be7eaeacc0b4c1a8580b3da", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1768678265, + "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "d7184a04b904e07113f4623610775ae78d32394c", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix": { "inputs": { "flake-compat": [ @@ -1529,16 +1789,16 @@ ] }, "locked": { - "lastModified": 1758763079, - "narHash": "sha256-Bx1A+lShhOWwMuy3uDzZQvYiBKBFcKwy6G6NEohhv6A=", + "lastModified": 1766922625, + "narHash": "sha256-O0wExzdYqSNqbPYCQhUWeoKlDa7q6wxhuWiHolxqdl8=", "owner": "cachix", "repo": "nix", - "rev": "6f0140527c2b0346df4afad7497baa08decb929f", + "rev": "c62c4bdb6673871ae5cdc51c498df6292d5169aa", "type": "github" }, "original": { "owner": "cachix", - "ref": "devenv-2.30.5", + "ref": "devenv-2.32", "repo": "nix", "type": "github" } @@ -1571,11 +1831,11 @@ ] }, "locked": { - "lastModified": 1760846226, - "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -1591,11 +1851,11 @@ ] }, "locked": { - "lastModified": 1760948931, - "narHash": "sha256-guAocn26kDPdkl6tPXJt5pPaIIsrGI4taw+1U3+FM7E=", + "lastModified": 1766997865, + "narHash": "sha256-pcmoWAlf/CSDFNptUAYKG3k8FwGNYSJBDF6li9+y+cI=", "owner": "Mic92", "repo": "nix-ld", - "rev": "a48b2dc9a256bcef9182f0f92c481de975302b1e", + "rev": "f388fe13b4370336982c53916744028465fbfc81", "type": "github" }, "original": { @@ -1608,14 +1868,14 @@ "inputs": { "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1760689525, - "narHash": "sha256-Dl0jvgL5NjgCGkQ8PCLmGIisWcbFhGWPqKRyIGJ9uus=", + "lastModified": 1767772998, + "narHash": "sha256-uW5BgnDOn41rlKn1JxdN7CU4bbOgZf+axEw8pBVP6RU=", "owner": "kaylorben", "repo": "nixcord", - "rev": "81d2f10a849c4312fefa0cf323dce0a1460dcbbe", + "rev": "d9f83906a12678900b2b36c3bdf7329e8efaa0c0", "type": "github" }, "original": { @@ -1624,13 +1884,40 @@ "type": "github" } }, + "nixd": { + "inputs": { + "flake-parts": [ + "devenv", + "flake-parts" + ], + "flake-root": "flake-root", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1763964548, + "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=", + "owner": "nix-community", + "repo": "nixd", + "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -1658,11 +1945,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1753579242, - "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -1671,13 +1958,29 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1769089682, + "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -1688,6 +1991,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1757487488, "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", @@ -1703,13 +2022,29 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { + "locked": { + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -1737,11 +2072,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -1769,11 +2104,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -1785,27 +2120,43 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_7": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1766885793, + "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9ef261221d1e72399f2036786498d78c38185c46", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -1815,29 +2166,13 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1759632233, - "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { - "lastModified": 1760596604, - "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", + "lastModified": 1767026758, + "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", + "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", "type": "github" }, "original": { @@ -1850,16 +2185,15 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_8", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_5" + "nixpkgs": "nixpkgs_9", + "systems": "systems_4" }, "locked": { - "lastModified": 1760960598, - "narHash": "sha256-UP1v+sEkHuvD2+qyhxbkQpBR+dl9U0ljml3/dMI2jeU=", + "lastModified": 1767608728, + "narHash": "sha256-kmSJCTgrx+BxgqQOTPHAOkohvO+lbRsPWqu+PSPcz3I=", "owner": "nix-community", "repo": "nixvim", - "rev": "e3b77e803b2350b72f4d72c8f175ab0fbfe5a642", + "rev": "851399eebd0fb383d2fd76269d859f16021dc7a8", "type": "github" }, "original": { @@ -1868,6 +2202,26 @@ "type": "github" } }, + "noctalia": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769206596, + "narHash": "sha256-4NjNjPwSW8GJpDSiuO16p/ukeSmgOrOHN2MEEJHJFNY=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "0c56347d3a4181e6f093845b9b7a26d10c340d45", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -1880,11 +2234,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -1893,45 +2247,23 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758662783, - "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", - "owner": "NuschtOS", - "repo": "search", - "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nvf": { "inputs": { "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_4", "mnw": "mnw", + "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_5" }, "locked": { - "lastModified": 1760153667, - "narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=", + "lastModified": 1767766515, + "narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=", "owner": "notashelf", "repo": "nvf", - "rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d", + "rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4", "type": "github" }, "original": { @@ -1950,11 +2282,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -1974,11 +2306,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -1996,11 +2328,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -2009,28 +2341,77 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "caelestia-cli", + "caelestia-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1766725085, + "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", + "ref": "refs/heads/master", + "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "revCount": 715, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, + "quickshell_2": { + "inputs": { + "nixpkgs": [ + "caelestia-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1766725085, + "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", + "ref": "refs/heads/master", + "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "revCount": 715, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "ags": "ags", + "caelestia-cli": "caelestia-cli", + "caelestia-shell": "caelestia-shell_2", "colmena": "colmena", "devenv": "devenv", "home-manager": "home-manager", "hyprland": "hyprland", "hyprpolkitagent": "hyprpolkitagent", "hyprspace": "hyprspace", + "niri": "niri", "nix-index-database": "nix-index-database", "nix-ld": "nix-ld", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-24_05": "nixpkgs-24_05", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", + "noctalia": "noctalia", "nvf": "nvf", "pre-commit-hooks": "pre-commit-hooks_3", "secrets": "secrets", "sops-nix": "sops-nix", "stylix": "stylix", "superfile": "superfile", + "vicinae": "vicinae", + "vicinae-extensions": "vicinae-extensions", "zen-browser": "zen-browser" } }, @@ -2051,14 +2432,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1760845571, - "narHash": "sha256-PwGzU3EOU65Ef1VvuNnVLie+l+P0g/fzf/PGUG82KbM=", + "lastModified": 1767826491, + "narHash": "sha256-WSBENPotD2MIhZwolL6GC9npqgaS5fkM7j07V2i/Ur8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9c9a9798be331ed3f4b2902933d7677d0659ee61", + "rev": "ea3adcb6d2a000d9a69d0e23cad1f2cacb3a9fbe", "type": "github" }, "original": { @@ -2096,7 +2477,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -2104,11 +2485,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760472212, - "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", + "lastModified": 1767652667, + "narHash": "sha256-zsgfockkvK0JrSvzVAb8JeUq3SDdITu6ViUf7yeIpi4=", "owner": "danth", "repo": "stylix", - "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", + "rev": "a4406d9799d002c41296c72378a1094a8fc9aa1b", "type": "github" }, "original": { @@ -2120,16 +2501,16 @@ "superfile": { "inputs": { "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1760420543, - "narHash": "sha256-NJprvSummITIhJn+A2wTtQ8YhWLSWQN6j5gjnLqWSAc=", + "lastModified": 1767694207, + "narHash": "sha256-G96jz3u2a/UEt6qc+SZukPqFCTqR9u+TgPUDtC+z6PM=", "owner": "MHNightCat", "repo": "superfile", - "rev": "552b7f8a2ef839145326c5174985fb9b4de611b3", + "rev": "a434c557e5383253236ea43f7fe3b09ebbac6984", "type": "github" }, "original": { @@ -2258,6 +2639,21 @@ "type": "github" } }, + "systems_9": { + "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": { @@ -2294,11 +2690,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -2310,11 +2706,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -2326,11 +2722,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -2339,6 +2735,94 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "devenv", + "nixd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "vicinae": { + "inputs": { + "nixpkgs": "nixpkgs_12", + "systems": "systems_8" + }, + "locked": { + "lastModified": 1767815010, + "narHash": "sha256-OPBgcM2ZzbVEUS6lwRpJo2JBfiRK8TmYVSmZImEW2gA=", + "owner": "vicinaehq", + "repo": "vicinae", + "rev": "aab965dcf29529c5fab67b9c2fb5f8168f76fa1b", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "vicinae", + "type": "github" + } + }, + "vicinae-extensions": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_9", + "vicinae": "vicinae_2" + }, + "locked": { + "lastModified": 1767678555, + "narHash": "sha256-/Yx97SOwvJXPxvv6e81j+ID87J9DQGq0QGYnmsWKoz8=", + "owner": "vicinaehq", + "repo": "extensions", + "rev": "e01fe274f037e4d2b7436718258fa898f80dc4b2", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "extensions", + "type": "github" + } + }, + "vicinae_2": { + "inputs": { + "nixpkgs": [ + "vicinae-extensions", + "nixpkgs" + ], + "systems": [ + "vicinae-extensions", + "systems" + ] + }, + "locked": { + "lastModified": 1763768455, + "narHash": "sha256-ZwqW2uH36vPUKrlbzDyz7NoFXKjJOT1Ijvlaz4sIp8E=", + "owner": "vicinaehq", + "repo": "vicinae", + "rev": "5c965e0777dc4bcb01808c7f214dc56f997bd9c7", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "vicinae", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -2367,11 +2851,11 @@ ] }, "locked": { - "lastModified": 1760713634, - "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "753bbbdf6a052994da94062e5b753288cef28dfb", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { @@ -2414,11 +2898,11 @@ ] }, "locked": { - "lastModified": 1751300244, - "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { @@ -2427,17 +2911,50 @@ "type": "github" } }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.7", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1768765571, + "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1760934351, - "narHash": "sha256-RehxVjBRC9EiBO36EPZROLHhVVSWFe3KEROhaEapboM=", + "lastModified": 1767763594, + "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "596c3ac14be576b93f5db9252a1b0581e453ec9f", + "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 96d2b57..4a33885 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,11 @@ hyprspace = { url = "github:KZDKM/Hyprspace"; }; - + niri.url = "github:sodiboo/niri-flake"; + noctalia = { + url = "github:noctalia-dev/noctalia-shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Home manager home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -66,6 +70,19 @@ pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; colmena.url = "github:zhaofengli/colmena"; + vicinae.url = "github:vicinaehq/vicinae"; + vicinae-extensions = { + url = "github:vicinaehq/extensions"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + caelestia-shell = { + url = "github:caelestia-dots/shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + caelestia-cli = { + url = "github:caelestia-dots/cli"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -75,6 +92,7 @@ home-manager, colmena, nix-ld, + vicinae, ... }@inputs: let @@ -197,6 +215,7 @@ ./home-manager/machines/candlekeep.nix inputs.nixcord.homeModules.nixcord inputs.stylix.homeModules.stylix + inputs.vicinae.homeManagerModules.default ]; }; }; diff --git a/home-manager/machines/candlekeep.nix b/home-manager/machines/candlekeep.nix index 6c9d961..02fad42 100644 --- a/home-manager/machines/candlekeep.nix +++ b/home-manager/machines/candlekeep.nix @@ -25,13 +25,15 @@ # ./nvim.nix ../modules/common.nix ../../common/style/vars/vars.nix - ../modules/hyprland + # ../modules/hyprland + ../modules/niri ../modules/common-gui.nix ../modules/linux-gui.nix ../modules/devenv.nix ../modules/ssh.nix ../modules/gh-dash.nix ../modules/ags.nix + ../modules/vesktop.nix # ../modules/neovim ../modules/yazi.nix # ../modules/hyprpanel.nix diff --git a/home-manager/machines/dorino.nix b/home-manager/machines/dorino.nix index 2180bb6..f274f29 100644 --- a/home-manager/machines/dorino.nix +++ b/home-manager/machines/dorino.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): @@ -80,7 +81,7 @@ }; emoji = { - package = pkgs.noto-fonts-emoji; + package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; }; diff --git a/home-manager/modules/caelestia-shell/appearance.nix b/home-manager/modules/caelestia-shell/appearance.nix new file mode 100644 index 0000000..28bfb91 --- /dev/null +++ b/home-manager/modules/caelestia-shell/appearance.nix @@ -0,0 +1,51 @@ +{ + pkgs, + config, + ... +}: +let + rounding = config.theme.rounding + config.theme.gaps-out; + inherit (config.stylix) fonts; +in +{ + home.packages = with pkgs; [ + papirus-icon-theme + ]; + + programs.caelestia.settings = { + paths.sessionGif = ./session-gif-hacker-cat.gif; + background.enabled = true; + appearance = { + transparency = { + enable = true; + base = 0.85; + layers = 0.4; + }; + font.family = { + material = "Material Symbols Rounded"; + mono = fonts.monospace.name; + sans = fonts.sansSerif.name; + }; + }; + utilities = { + enabled = true; + maxToasts = 4; + toasts = { + audioInputChanged = true; + audioOutputChanged = true; + capsLockChanged = false; + chargingChanged = true; + configLoaded = false; + dndChanged = true; + gameModeChanged = true; + numLockChanged = false; + nowPlaying = false; + kbLayoutChanged = false; + }; + }; + border = { + inherit rounding; + thickness = 8; + }; + }; +} diff --git a/home-manager/modules/caelestia-shell/bar.nix b/home-manager/modules/caelestia-shell/bar.nix new file mode 100644 index 0000000..b85de87 --- /dev/null +++ b/home-manager/modules/caelestia-shell/bar.nix @@ -0,0 +1,69 @@ +{ + programs.caelestia.settings.bar = { + clock.showIcon = false; + popouts.activeWindow = false; + persistent = true; + status = { + showBattery = true; + showMicrophone = false; + showLockStatus = false; + showBluetooth = true; + showAudio = true; + showKbLayout = false; + showNetwork = true; + }; + workspaces = { + activeIndicator = true; + activeLabel = "󰪥 "; + activeTrail = false; + label = " "; + occupiedBg = true; + occupiedLabel = "󰪥 "; + rounded = true; + showWindows = false; + shown = 5; + }; + entries = [ + { + id = "logo"; + enabled = true; + } + { + id = "workspaces"; + enabled = true; + } + { + id = "spacer"; + enabled = true; + } + { + id = "activeWindow"; + enabled = true; + } + { + id = "spacer"; + enabled = true; + } + { + id = "tray"; + enabled = true; + } + { + id = "clock"; + enabled = true; + } + { + id = "statusIcons"; + enabled = true; + } + { + id = "power"; + enabled = true; + } + ]; + tray = { + background = false; + recolour = false; + }; + }; +} diff --git a/home-manager/modules/caelestia-shell/bindings.nix b/home-manager/modules/caelestia-shell/bindings.nix new file mode 100644 index 0000000..82665fc --- /dev/null +++ b/home-manager/modules/caelestia-shell/bindings.nix @@ -0,0 +1,58 @@ +{ + wayland.windowManager.hyprland.settings = { + bindin = [ + # Launcher + "$mod, mouse:272, global, caelestia:launcherInterrupt" + "$mod, mouse:273, global, caelestia:launcherInterrupt" + "$mod, mouse:274, global, caelestia:launcherInterrupt" + "$mod, mouse:275, global, caelestia:launcherInterrupt" + "$mod, mouse:276, global, caelestia:launcherInterrupt" + "$mod, mouse:277, global, caelestia:launcherInterrupt" + "$mod, mouse_up, global, caelestia:launcherInterrupt" + "$mod, mouse_down, global, caelestia:launcherInterrupt" + ]; + bind = [ + # Launcher + "$mod, SPACE, global, caelestia:launcher" + "$mod, X, global, caelestia:session" # Powermenu + + # Misc + "$mod, L, global, caelestia:lock" + "$mod, N, exec, caelestia shell drawers toggle sidebar" + + # Utilities + "$mod+Shift, SPACE, exec, caelestia shell gameMode toggle" # Toggle Focus/Game mode + "$mod+Shift, S, global, caelestia:screenshotFreeze" # Capture region (freeze) + "$mod+Shift+Alt, S, global, caelestia:screenshot" # Capture region + "$mod+Alt, R, exec, caelestia record -s" # Record screen with sound + "Ctrl+Alt, R, exec, caelestia record" # Record screen + "$mod+Shift+Alt, R, exec, caelestia record -r" # Record region + + "$mod+Shift, E, exec, pkill fuzzel || caelestia emoji -p" + ]; + bindl = [ + # Brightness + ", XF86MonBrightnessUp, global, caelestia:brightnessUp" + ", XF86MonBrightnessDown, global, caelestia:brightnessDown" + "$mod, F2, exec, nightshift-toggle" + "$mod, F3, exec, nightshift-toggle" + + # Media + ", XF86AudioPlay, global, caelestia:mediaToggle" + ", XF86AudioPause, global, caelestia:mediaToggle" + ", XF86AudioNext, global, caelestia:mediaNext" + ", XF86AudioPrev, global, caelestia:mediaPrev" + ", XF86AudioStop, global, caelestia:mediaStop" + + # Sound + ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + + # Utilities + ", Print, exec, caelestia screenshot" # Full screen capture > clipboard + ]; + bindle = [ + ", XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" + ", XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + ]; + }; +} diff --git a/home-manager/modules/caelestia-shell/default.nix b/home-manager/modules/caelestia-shell/default.nix new file mode 100644 index 0000000..6cba6a9 --- /dev/null +++ b/home-manager/modules/caelestia-shell/default.nix @@ -0,0 +1,62 @@ +{ + pkgs, + inputs, + ... +}: +{ + imports = [ + inputs.caelestia-shell.homeManagerModules.default + ./bindings.nix + ./bar.nix + ./launcher.nix + ./appearance.nix + ./scheme.nix + ]; + + programs.caelestia = { + enable = true; + systemd.enable = false; + settings = { + services.weatherLocation = "Ottawa"; + services.useFahrenheit = false; + general = { + apps = { + terminal = [ "ghostty" ]; + audio = [ "pavucontrol" ]; + explorer = [ "thunar" ]; + }; + idle = { + timeouts = [ ]; + }; + }; + }; + cli = { + enable = true; + settings.theme = { + enableTerm = false; + enableDiscord = false; + enableSpicetify = false; + enableBtop = false; + enableCava = false; + enableHypr = false; + enableGtk = false; + enableQt = false; + }; + }; + }; + + home.packages = with pkgs; [ + gpu-screen-recorder + ]; + + wayland.windowManager.hyprland.settings.exec-once = [ + "uwsm app -- caelestia resizer -d" + "uwsm app -- caelestia shell -d" + "caelestia scheme set -n custom" + ]; + + services.cliphist = { + enable = true; + allowImages = true; + }; +} diff --git a/home-manager/modules/caelestia-shell/launcher.nix b/home-manager/modules/caelestia-shell/launcher.nix new file mode 100644 index 0000000..36e4418 --- /dev/null +++ b/home-manager/modules/caelestia-shell/launcher.nix @@ -0,0 +1,174 @@ +{ + programs.caelestia.settings = { + session.commands = { + logout = [ + "loginctl" + "terminate-user" + "" + ]; + shutdown = [ + "systemctl" + "poweroff" + ]; + hibernate = [ + "systemctl" + "hibernate" + ]; + reboot = [ + "systemctl" + "reboot" + ]; + }; + launcher = { + actionPrefix = "/"; + actions = [ + { + name = "Calculator"; + icon = "calculate"; + description = "Do simple math equations (powered by Qalc)"; + command = [ + "autocomplete" + "calc" + ]; + enabled = true; + dangerous = false; + } + { + name = "Shutdown"; + icon = "power_settings_new"; + description = "Shutdown the system"; + command = [ + "systemctl" + "poweroff" + ]; + enabled = true; + dangerous = true; + } + { + name = "Reboot"; + icon = "cached"; + description = "Reboot the system"; + command = [ + "systemctl" + "reboot" + ]; + enabled = true; + dangerous = true; + } + { + name = "Logout"; + icon = "exit_to_app"; + description = "Log out of the current session"; + command = [ + "loginctl" + "terminate-user" + "" + ]; + enabled = true; + dangerous = true; + } + { + name = "Lock"; + icon = "lock"; + description = "Lock the current session"; + command = [ + "loginctl" + "lock-session" + ]; + enabled = true; + dangerous = false; + } + { + name = "Sleep"; + icon = "bedtime"; + description = "Suspend then hibernate"; + command = [ + "systemctl" + "suspend-then-hibernate" + ]; + enabled = true; + dangerous = false; + } + { + name = "Restart caelestia"; + icon = "cached"; + description = "Restart caelestia"; + command = [ + "hyprctl" + "dispatch" + "exec" + "caelestia-shell kill | sleep 1 | caelestia-shell" + ]; + enabled = true; + dangerous = false; + } + { + name = "Emoji Picker"; + icon = "mood"; + description = "Toggle the emoji picker"; + command = [ + "caelestia" + "emoji" + "-p" + ]; + enabled = true; + dangerous = false; + } + { + name = "Clipboard History"; + icon = "content_paste"; + description = "Toggle the clipboard history"; + command = [ + "caelestia" + "clipboard" + ]; + enabled = true; + dangerous = false; + } + { + name = "Delete from Clipboard History"; + icon = "content_paste_off"; + description = "Delete a line from the clipboard history"; + command = [ + "caelestia" + "clipboard" + ]; + enabled = true; + dangerous = false; + } + { + name = "Night Shift"; + icon = "moon_stars"; + description = "Toggle Night Shift, the blue light filter"; + command = [ "nightshift-toggle" ]; + enabled = true; + dangerous = false; + } + { + name = "Hyprpicker"; + icon = "colorize"; + description = "Pick an hex color"; + command = [ + "hyprpicker" + "-a" + ]; + enabled = true; + dangerous = false; + } + ]; + dragThreshold = 50; + enableDangerousActions = false; + maxShown = 7; + specialPrefix = "@"; + useFuzzy = { + apps = false; + actions = false; + schemes = false; + variants = false; + wallpapers = false; + }; + showOnHover = false; + hiddenApps = [ ]; + }; + }; +} diff --git a/home-manager/modules/caelestia-shell/scheme.nix b/home-manager/modules/caelestia-shell/scheme.nix new file mode 100644 index 0000000..e1ff316 --- /dev/null +++ b/home-manager/modules/caelestia-shell/scheme.nix @@ -0,0 +1,135 @@ +{ + pkgs, + inputs, + config, + ... +}: +let + colors = config.lib.stylix.colors; + + customSchemeFile = pkgs.writeText "custom-dark.txt" '' + primary_paletteKeyColor ${colors.base0D} + secondary_paletteKeyColor ${colors.base04} + tertiary_paletteKeyColor ${colors.base08} + neutral_paletteKeyColor ${colors.base03} + neutral_variant_paletteKeyColor ${colors.base03} + background ${colors.base00} + onBackground ${colors.base05} + surface ${colors.base00} + surfaceDim ${colors.base00} + surfaceBright ${colors.base02} + surfaceContainerLowest ${colors.base01} + surfaceContainerLow ${colors.base01} + surfaceContainer ${colors.base01} + surfaceContainerHigh ${colors.base02} + surfaceContainerHighest ${colors.base02} + onSurface ${colors.base05} + surfaceVariant ${colors.base02} + onSurfaceVariant ${colors.base04} + inverseSurface ${colors.base05} + inverseOnSurface ${colors.base00} + outline ${colors.base03} + outlineVariant ${colors.base02} + shadow ${colors.base00} + scrim ${colors.base00} + surfaceTint ${colors.base0D} + primary ${colors.base0D} + onPrimary ${colors.base00} + primaryContainer ${colors.base0D} + onPrimaryContainer ${colors.base05} + inversePrimary ${colors.base0D} + secondary ${colors.base0C} + onSecondary ${colors.base00} + secondaryContainer ${colors.base02} + onSecondaryContainer ${colors.base0C} + tertiary ${colors.base08} + onTertiary ${colors.base00} + tertiaryContainer ${colors.base08} + onTertiaryContainer ${colors.base00} + error ${colors.base08} + onError ${colors.base00} + errorContainer ${colors.base08} + onErrorContainer ${colors.base05} + primaryFixed ${colors.base0D} + primaryFixedDim ${colors.base0D} + onPrimaryFixed ${colors.base00} + onPrimaryFixedVariant ${colors.base00} + secondaryFixed ${colors.base0C} + secondaryFixedDim ${colors.base0C} + onSecondaryFixed ${colors.base00} + onSecondaryFixedVariant ${colors.base02} + tertiaryFixed ${colors.base08} + tertiaryFixedDim ${colors.base08} + onTertiaryFixed ${colors.base00} + onTertiaryFixedVariant ${colors.base00} + term0 ${colors.base00} + term1 ${colors.base08} + term2 ${colors.base0B} + term3 ${colors.base0A} + term4 ${colors.base0D} + term5 ${colors.base0E} + term6 ${colors.base0C} + term7 ${colors.base05} + term8 ${colors.base03} + term9 ${colors.base08} + term10 ${colors.base0B} + term11 ${colors.base0A} + term12 ${colors.base0D} + term13 ${colors.base0E} + term14 ${colors.base0C} + term15 ${colors.base07} + rosewater ${colors.base06} + flamingo ${colors.base0F} + pink ${colors.base0E} + mauve ${colors.base0D} + red ${colors.base08} + maroon ${colors.base08} + peach ${colors.base09} + yellow ${colors.base0A} + green ${colors.base0B} + teal ${colors.base0C} + sky ${colors.base0C} + sapphire ${colors.base0C} + blue ${colors.base0D} + lavender ${colors.base0D} + klink ${colors.base0D} + klinkSelection ${colors.base0D} + kvisited ${colors.base0E} + kvisitedSelection ${colors.base0E} + knegative ${colors.base08} + knegativeSelection ${colors.base08} + kneutral ${colors.base0A} + kneutralSelection ${colors.base0A} + kpositive ${colors.base0B} + kpositiveSelection ${colors.base0B} + text ${colors.base05} + subtext1 ${colors.base04} + subtext0 ${colors.base03} + overlay2 ${colors.base03} + overlay1 ${colors.base03} + overlay0 ${colors.base02} + surface2 ${colors.base02} + surface1 ${colors.base01} + surface0 ${colors.base01} + base ${colors.base00} + mantle ${colors.base00} + crust ${colors.base00} + success ${colors.base0B} + onSuccess ${colors.base00} + successContainer ${colors.base0B} + onSuccessContainer ${colors.base05} + ''; + + customCli = + inputs.caelestia-cli.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs + (oldAttrs: { + postUnpack = '' + mkdir -p $sourceRoot/src/caelestia/data/schemes/custom/main + cp ${customSchemeFile} $sourceRoot/src/caelestia/data/schemes/custom/main/dark.txt + echo "Custom scheme added to source" + ''; + }); +in +{ + programs.caelestia.cli.package = customCli; +} diff --git a/home-manager/modules/caelestia-shell/session-gif-hacker-cat.gif b/home-manager/modules/caelestia-shell/session-gif-hacker-cat.gif new file mode 100644 index 0000000..4cc58d5 Binary files /dev/null and b/home-manager/modules/caelestia-shell/session-gif-hacker-cat.gif differ diff --git a/home-manager/modules/common-gui.nix b/home-manager/modules/common-gui.nix index b37106a..82f2783 100644 --- a/home-manager/modules/common-gui.nix +++ b/home-manager/modules/common-gui.nix @@ -10,6 +10,8 @@ ./zen.nix ./mime.nix ./nixcord.nix + # ./vicinae.nix + ./caelestia-shell ]; fonts.fontconfig.enable = true; @@ -22,8 +24,10 @@ nerd-fonts.monaspace noto-fonts-cjk-sans rPackages.fontawesome - ubuntu_font_family + ubuntu-classic yt-dlp - mochi + # mochi TODO: reenable when fixed + jetbrains.idea + wpsoffice ]; } diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index 25d3f40..2526663 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -32,6 +32,7 @@ minio-client kanata yatto + ticktick # Editors # neovim # Improved version of vim, often used with overlays. @@ -43,7 +44,7 @@ # 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. - du-dust # Modern replacement for 'du,' offering intuitive and visually appealing disk usage analysis. + dust # Modern replacement for 'du,' offering intuitive and visually appealing disk usage analysis. duf # Disk Usage/Free utility with a user-friendly interface for visualizing disk space consumption and information. eza # Modern replacement for 'ls' with additional features and a user-friendly interface. fd # Faster and user-friendly alternative to 'find' for searching and locating files. diff --git a/home-manager/modules/ghostty.nix b/home-manager/modules/ghostty.nix index a68e100..310ae00 100644 --- a/home-manager/modules/ghostty.nix +++ b/home-manager/modules/ghostty.nix @@ -7,14 +7,20 @@ programs.ghostty = { enable = true; enableZshIntegration = true; + installVimSyntax = true; settings = { + window-padding-x = 10; + window-padding-y = 10; auto-update = "off"; + working-directory = "home"; + window-inherit-working-directory = false; # avoid inheritance + keybinds = [ ]; # background-opacity = 0.8; background-opacity = 1; confirm-close-surface = false; - # font-family = lib.mkForce "Comic Code Ligatures"; - font-family = lib.mkForce "Terminus"; - font-size = 9; + font-family = lib.mkForce "Comic Code Ligatures"; + # font-family = lib.mkForce "Terminus"; + font-size = 14; gtk-titlebar = false; # theme = "Teerb"; }; diff --git a/home-manager/modules/hyprland/bindings.nix b/home-manager/modules/hyprland/bindings.nix index 4593b45..1774317 100644 --- a/home-manager/modules/hyprland/bindings.nix +++ b/home-manager/modules/hyprland/bindings.nix @@ -10,55 +10,55 @@ "$mod" = "SUPER"; - bind = - [ - # 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,E, exec, uwsm app -- ${pkgs.xfce.thunar}/bin/thunar" # Thunar - "$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 - "$mod,T, togglefloating," # Toggle Floating - # "$mod, F, fullscreen" - "$mod,F, fullscreen" # Toggle 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 + bind = [ + # general binds + ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid + "$mod,RETURN, exec, uwsm app -- ${pkgs.ghostty}/bin/ghostty" # Ghostty (terminal) + # "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" + "$mod,E, exec, uwsm app -- ${pkgs.xfce.thunar}/bin/thunar" # Thunar + "$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 + # "$mod, SPACE, exec, vicinae toggle" + "$mod,T, togglefloating," # Toggle Floating + # "$mod, F, fullscreen" + "$mod,F, fullscreen" # Toggle 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 - "$shiftMod,T, exec, hyprpanel-toggle" # Toggle hyprpanel + "$shiftMod,T, exec, hyprpanel-toggle" # Toggle hyprpanel - "$shiftMod,up, focusmonitor, -1" # Focus previous monitor - "$shiftMod,down, focusmonitor, 1" # Focus next monitor - "$shiftMod,left, layoutmsg, addmaster" # Add to master - "$shiftMod,right, layoutmsg, removemaster" # Remove from master + "$shiftMod,up, focusmonitor, -1" # Focus previous monitor + "$shiftMod,down, focusmonitor, 1" # Focus next monitor + "$shiftMod,left, layoutmsg, addmaster" # Add to master + "$shiftMod,right, layoutmsg, removemaster" # Remove from master - # move focus - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - "$mod,right,workspace,+1" - "$mod,left,workspace,-1" + # move focus + "$mod, left, movefocus, l" + "$mod, right, movefocus, r" + "$mod, up, movefocus, u" + "$mod, down, movefocus, d" + "$mod,right,workspace,+1" + "$mod,left,workspace,-1" - # Scroll through workspaces - "$mod, mouse_down, workspace, e+1" - "$mod, mouse_up, workspace, e-1" - ] - ++ (builtins.concatLists ( - builtins.genList ( - i: - let - ws = i + 1; - in - [ - "$mod,code:1${toString i}, workspace, ${toString ws}" - "$mod SHIFT,code:1${toString i}, movetoworkspace, ${toString ws}" - ] - ) 9 - )); + # Scroll through workspaces + "$mod, mouse_down, workspace, e+1" + "$mod, mouse_up, workspace, e-1" + ] + ++ (builtins.concatLists ( + builtins.genList ( + i: + let + ws = i + 1; + in + [ + "$mod,code:1${toString i}, workspace, ${toString ws}" + "$mod SHIFT,code:1${toString i}, movetoworkspace, ${toString ws}" + ] + ) 9 + )); bindl = [ ",XF86AudioMute, exec, sound-toggle" # Toggle Mute diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 486012f..8599c1f 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -23,15 +23,17 @@ in ./bindings.nix ./polkitagent.nix # ./hyprspace.nix - ./hyprpanel.nix - ./hyprlock.nix + # ./hyprpanel.nix + # ./hyprlock.nix + ./hyprpaper.nix + ../caelestia-shell ]; home.packages = with pkgs; [ qt5.qtwayland qt6.qtwayland libsForQt5.qt5ct - qt6ct + qt6Packages.qt6ct hyprshot hyprpicker swappy @@ -71,6 +73,7 @@ in "systemctl --user enable --now hyprpaper.service &" "systemctl --user enable --now hypridle.service &" "systemctl --user enable --now nextcloud-client.service &" + "vicinae server" ]; monitor = [ @@ -151,7 +154,7 @@ in disable_splash_rendering = true; disable_autoreload = true; focus_on_activate = true; - new_window_takes_over_fullscreen = 2; + # new_window_takes_over_fullscreen = 2; }; windowrulev2 = [ @@ -188,10 +191,10 @@ in "size 640 400, class:^(.*jetbrains.*)$, title:^(splash)$" ]; - layerrule = [ - "noanim, launcher" - "noanim, ^ags-.*" - ]; + # layerrule = [ + # "noanim, launcher" + # "noanim, ^ags-.*" + # ]; input = { # kb_layout = keyboardLayout; diff --git a/home-manager/modules/hyprland/hyprpaper.nix b/home-manager/modules/hyprland/hyprpaper.nix new file mode 100644 index 0000000..6722ac1 --- /dev/null +++ b/home-manager/modules/hyprland/hyprpaper.nix @@ -0,0 +1,29 @@ +{ + lib, + pkgs, + ... +}: +{ + services.hyprpaper = { + enable = true; + settings = { + ipc = "on"; + splash = false; + splash_offset = 2; + }; + }; + + home.packages = [ + pkgs.hyprpaper + ]; + systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target"; + + wayland.windowManager.hyprland.settings.exec-once = [ + "systemctl --user enable --now hyprpaper.service" + ]; + services.hyprpaper.settings.wallpaper = lib.singleton { + # TODO: Remove after merge https://github.com/nix-community/stylix/pull/2087 + monitor = "eDP-1"; + path = toString ../../../wallpapers/oasis.png; + }; +} diff --git a/home-manager/modules/niri/applications.nix b/home-manager/modules/niri/applications.nix new file mode 100644 index 0000000..6a768e2 --- /dev/null +++ b/home-manager/modules/niri/applications.nix @@ -0,0 +1,11 @@ +{ pkgs }: +{ + browser = "${pkgs.firefox}/bin/firefox"; + terminal = "${pkgs.ghostty}/bin/ghostty"; + fileManager = "${pkgs.xfce.thunar}/bin/thunar"; + appLauncher = "${pkgs.walker}/bin/walker"; + + screenshotArea = "${pkgs.bash}/bin/bash -c '${pkgs.grim}/bin/grim -g \"\\\$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy'"; + screenshotWindow = "${pkgs.bash}/bin/bash -c '${pkgs.grim}/bin/grim -g \"\\\$(${pkgs.slurp}/bin/slurp -w)\" - | ${pkgs.wl-clipboard}/bin/wl-copy'"; + screenshotOutput = "${pkgs.bash}/bin/bash -c '${pkgs.grim}/bin/grim - | ${pkgs.wl-clipboard}/bin/wl-copy'"; +} diff --git a/home-manager/modules/niri/autostart.nix b/home-manager/modules/niri/autostart.nix new file mode 100644 index 0000000..5138408 --- /dev/null +++ b/home-manager/modules/niri/autostart.nix @@ -0,0 +1,26 @@ +{ + lib, + pkgs, + ... +}: +{ + home.packages = with pkgs; [ + xwayland-satellite + xdg-desktop-portal-gtk + ]; + programs.niri.settings.spawn-at-startup = [ + { + command = [ + "systemctl" + "--user" + "start" + "hyprpolkitagent" + ]; + } + { command = [ "xwayland-satellite" ]; } + { command = [ "qs" ]; } + { command = [ "swww-daemon" ]; } + #{ command = ["${pkgs.swaybg}/bin/swaybg" "-o" "DP-1" "-i" "/home/lysec/nixos/assets/wallpapers/clouds.png" "-m" "fill"]; } + #{ command = ["sh" "-c" "swww-daemon & swww img /home/lysec/nixos/wallpapers/cloud.png"]; } + ]; +} diff --git a/home-manager/modules/niri/default.nix b/home-manager/modules/niri/default.nix new file mode 100644 index 0000000..1ca1821 --- /dev/null +++ b/home-manager/modules/niri/default.nix @@ -0,0 +1,18 @@ +{ + config, + pkgs, + inputs, + ... +}: +{ + imports = [ + inputs.niri.homeModules.niri # Import Niri's home-manager module + ./settings.nix # Your custom configuration files for Niri + ./keybinds.nix + ./rules.nix + ./autostart.nix + ./noctaliashell.nix + ]; + + services.gnome-keyring.enable = true; +} diff --git a/home-manager/modules/niri/keybinds.nix b/home-manager/modules/niri/keybinds.nix new file mode 100644 index 0000000..dce4bc8 --- /dev/null +++ b/home-manager/modules/niri/keybinds.nix @@ -0,0 +1,106 @@ +{ + lib, + config, + pkgs, + ... +}: +let + apps = import ./applications.nix { inherit pkgs; }; +in +{ + programs.niri.settings.binds = + with config.lib.niri.actions; + let + pactl = "${pkgs.pulseaudio}/bin/pactl"; + + volume-up = spawn pactl [ + "set-sink-volume" + "@DEFAULT_SINK@" + "+5%" + ]; + volume-down = spawn pactl [ + "set-sink-volume" + "@DEFAULT_SINK@" + "-5%" + ]; + in + { + # Quickshell Keybinds Start + "super+space".action = spawn [ + "noctalia-shell" + "ipc" + "call" + "launcher" + "toggle" + ]; + + "super+shift+Slash".action = show-hotkey-overlay; + + "super+l".action = spawn [ + "noctalia-shell" + "ipc" + "call" + "lockScreen" + "lock" + ]; + + "xf86audioraisevolume".action = volume-up; + "xf86audiolowervolume".action = volume-down; + + "XF86MonBrightnessDown".action = spawn [ + "noctalia-shell" + "ipc" + "call" + "brightness" + "decrease" + ]; + "XF86MonBrightnessUp".action = spawn [ + "noctalia-shell" + "ipc" + "call" + "brightness" + "increase" + ]; + + "super+q".action = close-window; + # "super+b".action = spawn apps.browser; + "super+Return".action = spawn apps.terminal; + #"super+Control+Return".action = spawn apps.appLauncher; + "super+E".action = spawn apps.fileManager; + "super+o".action = toggle-overview; + + "super+f".action = maximize-column; + "super+Shift+f".action = fullscreen-window; + "super+t".action = toggle-window-floating; + "super+r".action = switch-preset-column-width; + "super+Shift+r".action = switch-preset-window-height; + + "super+b".action = + spawn-sh "${pkgs.grim}/bin/grim \"$HOME/Pictures/screenshots/desktop-$(${pkgs.busybox}/bin/date +%Y%m%d%H%M).png\""; + "super+Shift+b".action = + spawn-sh "${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -d)\" - | ${pkgs.wl-clipboard}/bin/wl-copy"; # Screenshot selection directly to clipboard + + "super+Left".action = focus-column-left; + "super+Right".action = focus-column-right; + "super+Down".action = focus-workspace-down; + "super+Up".action = focus-workspace-up; + + "super+Shift+Left".action = move-column-left; + "super+Shift+Right".action = move-column-right; + "super+Shift+Down".action = move-column-to-workspace-down; + "super+Shift+Up".action = move-column-to-workspace-up; + + "super+Control+Left".action = focus-monitor-left; + "super+Control+Right".action = focus-monitor-right; + "super+Control+Down".action = focus-monitor-down; + "super+Control+Up".action = focus-monitor-up; + + "super+BracketLeft".action = consume-or-expel-window-left; + "super+BracketRight".action = consume-or-expel-window-right; + "super+Comma".action = consume-window-into-column; + "super+Period".action = expel-window-from-column; + + "super+Home".action = focus-column-first; + "super+End".action = focus-column-last; + }; +} diff --git a/home-manager/modules/niri/noctaliashell.nix b/home-manager/modules/niri/noctaliashell.nix new file mode 100644 index 0000000..f418e89 --- /dev/null +++ b/home-manager/modules/niri/noctaliashell.nix @@ -0,0 +1,78 @@ +{ + pkgs, + inputs, + ... +}: +{ + imports = [ + inputs.noctalia.homeModules.default + ]; + + # configure options + programs.noctalia-shell = { + enable = true; + settings = { + # configure noctalia here + nightLight = { + enabled = true; + }; + dock = { + enabled = false; + }; + bar = { + density = "default"; + position = "top"; + floating = true; + showCapsule = false; + widgets = { + left = [ + { + id = "ControlCenter"; + useDistroLogo = true; + } + { + id = "Network"; + } + { + id = "Bluetooth"; + } + ]; + center = [ + { + hideUnoccupied = false; + id = "Workspace"; + labelMode = "none"; + } + ]; + right = [ + { + id = "Tray"; + } + { + alwaysShowPercentage = false; + id = "Battery"; + warningThreshold = 30; + } + { + formatHorizontal = "HH:mm"; + formatVertical = "HH mm"; + id = "Clock"; + useMonospacedFont = true; + usePrimaryColor = true; + } + ]; + }; + }; + colorSchemes.predefinedScheme = "Monochrome"; + general = { + avatarImage = "/home/gwg313/.face"; + radiusRatio = 0.2; + }; + location = { + monthBeforeDay = true; + name = "Ottawa, Canada"; + }; + }; + # this may also be a string or a path to a JSON file. + }; +} diff --git a/home-manager/modules/niri/rules.nix b/home-manager/modules/niri/rules.nix new file mode 100644 index 0000000..7f8b7dc --- /dev/null +++ b/home-manager/modules/niri/rules.nix @@ -0,0 +1,48 @@ +{ + config, + pkgs, + ... +}: +{ + programs.niri.settings = { + layer-rules = [ + { + matches = [ + { + namespace = "^quickshell-wallpaper$"; + } + ]; + #place-within-backdrop = true; + } + { + matches = [ + { + namespace = "^quickshell-overview$"; + } + ]; + place-within-backdrop = true; + } + { + matches = [ + { + namespace = "^swww-daemon$"; + } + ]; + place-within-backdrop = true; + } + ]; + + window-rules = [ + { + matches = [ { } ]; + geometry-corner-radius = { + top-left = 20.0; + top-right = 20.0; + bottom-left = 20.0; + bottom-right = 20.0; + }; + clip-to-geometry = true; + } + ]; + }; +} diff --git a/home-manager/modules/niri/scripts.nix b/home-manager/modules/niri/scripts.nix new file mode 100644 index 0000000..94a6b16 --- /dev/null +++ b/home-manager/modules/niri/scripts.nix @@ -0,0 +1,31 @@ +{ pkgs, ... }: +let + brightnessScript = pkgs.writeShellScriptBin "brightness" '' + BUS=10 + STEP=5 + MIN=0 + MAX=100 + OSD_FILE="/tmp/brightness_osd_level" + + current=$(ddcutil --bus=$BUS getvcp 10 | grep -oP "current value\\s*=\\s*\\K[0-9]+") + new=$current + + if [[ "$1" == "up" ]]; then + new=$((current + STEP)) + (( new > MAX )) && new=$MAX + elif [[ "$1" == "down" ]]; then + new=$((current - STEP)) + (( new < MIN )) && new=$MIN + else + exit 1 + fi + + ddcutil --bus=$BUS setvcp 10 "$new" + echo "$new" > "$OSD_FILE" + ''; +in +{ + home.packages = [ + brightnessScript + ]; +} diff --git a/home-manager/modules/niri/settings.nix b/home-manager/modules/niri/settings.nix new file mode 100644 index 0000000..a6eba9b --- /dev/null +++ b/home-manager/modules/niri/settings.nix @@ -0,0 +1,155 @@ +{ + config, + pkgs, + ... +}: +{ + home.sessionVariables = { + XDG_ICON_DIR = "${pkgs.whitesur-icon-theme}/share/icons/WhiteSur"; + GSETTINGS_SCHEMA_DIR = "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas"; + XCURSOR_THEME = "Bibata-Original-Ice"; + XCURSOR_SIZE = "20"; + }; + programs.niri = { + enable = true; + package = pkgs.niri; + settings = { + environment = { + # CLUTTER_BACKEND = "wayland"; + # DISPLAY = null; + # MOZ_ENABLE_WAYLAND = "1"; + # NIXOS_OZONE_WL = "1"; + # QT_QPA_PLATFORM = "wayland;xcb"; + # QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + SDL_VIDEODRIVER = "wayland"; + WLR_RENDERER = "vulkan"; + WLR_NO_HARDWARE_CURSORS = "1"; + QT_QPA_PLATFORMTHEME = "qt6ct"; + GTK_IM_MODULE = "simple"; + }; + spawn-at-startup = [ + { + command = [ + "noctalia-shell" + ]; + } + ]; + + prefer-no-csd = true; + + hotkey-overlay = { + skip-at-startup = true; + }; + switch-events = { + lid-close.action.spawn = [ + "noctalia-shell" + "ipc" + "call" + "lockScreen" + "lock" + ]; + }; + + layout = { + preset-column-widths = [ + { proportion = 1. / 3.; } + { proportion = 1. / 2.; } + { proportion = 2. / 3.; } + ]; + default-column-width = { + proportion = 0.5; + }; + + preset-window-heights = [ + { proportion = 1. / 3.; } + { proportion = 1. / 2.; } + { proportion = 2. / 3.; } + ]; + + background-color = "#00000000"; + + focus-ring = { + enable = true; + width = 3; + active = { + color = "#A8AEFF"; + }; + inactive = { + color = "#505050"; + }; + }; + + gaps = 6; + + struts = { + left = 20; + right = 20; + top = 20; + bottom = 20; + }; + }; + + input = { + touchpad = { + click-method = "button-areas"; + dwt = true; + dwtp = true; + natural-scroll = true; + scroll-method = "two-finger"; + tap = true; + tap-button-map = "left-right-middle"; + middle-emulation = true; + accel-profile = "adaptive"; + }; + focus-follows-mouse.enable = true; + focus-follows-mouse.max-scroll-amount = "0%"; + warp-mouse-to-focus.enable = false; + }; + + outputs = { + "eDP-1" = { + mode = { + width = 1920; + height = 1080; + }; + scale = 1.0; + position = { + x = 0; + y = 0; + }; + }; + + "Microstep MSI MP161 E2 PB7H314B00225" = { + mode = { + width = 1920; + height = 1080; + }; + scale = 1.0; + position = { + x = 0; + y = -1080; + }; + }; + }; + + cursor = { + size = 20; + theme = "Adwaita"; + }; + + environment = { + CLUTTER_BACKEND = "wayland"; + GDK_BACKEND = "wayland,x11"; + MOZ_ENABLE_WAYLAND = "1"; + NIXOS_OZONE_WL = "1"; + QT_QPA_PLATFORM = "wayland"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + ELECTRON_OZONE_PLATFORM_HINT = "auto"; + + XDG_SESSION_TYPE = "wayland"; + XDG_CURRENT_DESKTOP = "niri"; + DISPLAY = ":0"; + }; + }; + }; +} diff --git a/home-manager/modules/nvf/default.nix b/home-manager/modules/nvf/default.nix index 0f5d306..2bb0f9b 100644 --- a/home-manager/modules/nvf/default.nix +++ b/home-manager/modules/nvf/default.nix @@ -55,5 +55,52 @@ }) ''; }; + settings.vim.augroups = [ + { name = "SwiftSetup"; } + ]; + + settings.vim.autocmds = [ + # Start Swift LSP automatically for Swift files + { + event = [ "FileType" ]; + pattern = [ "swift" ]; + group = "SwiftSetup"; + desc = "Start sourcekit-lsp for Swift files"; + callback = lib.generators.mkLuaInline '' + function() + local lspconfig = require("lspconfig") + + -- Avoid starting LSP multiple times + for _, client in pairs(vim.lsp.get_active_clients()) do + if client.name == "sourcekit" then + return + end + end + + lspconfig.sourcekit.setup({ + cmd = { "sourcekit-lsp" }, + filetypes = { "swift", "swiftpm" }, + root_dir = lspconfig.util.root_pattern("Package.swift", ".git"), + }) + end + ''; + } + + # Format Swift files on save using swift-format + { + event = [ "BufWritePost" ]; + pattern = [ "*.swift" ]; + group = "SwiftSetup"; + desc = "Format Swift files on save"; + callback = lib.generators.mkLuaInline '' + function() + if vim.fn.executable("swift-format") == 1 then + vim.cmd("silent! noautocmd !swift-format -i %") + vim.cmd("checktime") + end + end + ''; + } + ]; }; } diff --git a/home-manager/modules/nvf/languages.nix b/home-manager/modules/nvf/languages.nix index 997c48f..7e4e4a5 100644 --- a/home-manager/modules/nvf/languages.nix +++ b/home-manager/modules/nvf/languages.nix @@ -41,7 +41,6 @@ context.enable = true; highlight = { enable = true; - additionalVimRegexHighlighting = true; }; }; lsp = { diff --git a/home-manager/modules/ssh.nix b/home-manager/modules/ssh.nix index e7fb17a..1034db4 100644 --- a/home-manager/modules/ssh.nix +++ b/home-manager/modules/ssh.nix @@ -32,6 +32,9 @@ hostname = "grymforge.zt"; # added to hosts in zerotier config user = "gwg313"; identityFile = "/home/gwg313/.ssh/home/id_ed25519"; + extraOptions = { + "VisualHostKey" = "no"; + }; }; "waypoint" = { @@ -57,6 +60,28 @@ user = "root"; identityFile = "/home/gwg313/.ssh/colmena/id_ed25519"; }; + + "qnx" = { + hostname = "10.1.40.32"; + user = "qnxuser"; + identitiesOnly = true; + identityFile = "/home/gwg313/.ssh/qnxuser"; + extraOptions = { + "Ciphers" = "aes256-ctr"; + }; + }; + + "qnxzt" = { + hostname = "10.1.40.32"; + user = "qnxuser"; + identitiesOnly = true; + identityFile = "/home/gwg313/.ssh/qnxuser"; + proxyJump = "grymforge.zt"; + extraOptions = { + "Ciphers" = "aes256-ctr"; + "VisualHostKey" = "no"; + }; + }; }; }; } diff --git a/home-manager/modules/vesktop.nix b/home-manager/modules/vesktop.nix new file mode 100644 index 0000000..eebf3cd --- /dev/null +++ b/home-manager/modules/vesktop.nix @@ -0,0 +1,186 @@ +{ pkgs, ... }: +{ + services.arrpc.enable = true; + + home.packages = with pkgs; [ + discord-ptb # Used for completing Discord quests + ]; + + programs.nixcord = { + enable = true; + discord.enable = false; + + vesktop.enable = true; + vesktop.useSystemVencord = false; + + config = { + themeLinks = [ + # "https://raw.githubusercontent.com/refact0r/system24/refs/heads/main/theme/system24.theme.css" + "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css" + # "https://catppuccin.github.io/discord/dist/catppuccin-mocha-lavender.theme.css" + ]; + frameless = true; + disableMinSize = true; + plugins = { + accountPanelServerProfile.enable = true; + alwaysExpandRoles.enable = true; + alwaysTrust.enable = true; + anonymiseFileNames.enable = true; + betterGifAltText.enable = true; + betterGifPicker.enable = true; + betterNotesBox.enable = true; + betterRoleContext.enable = true; + betterRoleDot.enable = true; + betterSessions.enable = false; + betterSettings.enable = true; + betterUploadButton.enable = true; + biggerStreamPreview.enable = true; + BlurNSFW.enable = true; + callTimer = { + enable = true; + format = "human"; + }; + ClearURLs.enable = true; + colorSighted.enable = true; + consoleJanitor.enable = true; + consoleShortcuts.enable = true; + copyEmojiMarkdown.enable = true; + copyFileContents.enable = true; + CopyUserURLs.enable = true; + CustomRPC = { + enable = false; # TODO + }; + dearrow.enable = true; + decor.enable = true; + disableCallIdle.enable = true; + dontRoundMyTimestamps.enable = true; + experiments = { + enable = true; + toolbarDevMenu = true; + }; + f8Break.enable = true; + fakeProfileThemes.enable = true; + favoriteEmojiFirst.enable = true; + favoriteGifSearch.enable = true; + fixCodeblockGap.enable = true; + fixImagesQuality.enable = true; + fixSpotifyEmbeds.enable = true; + fixYoutubeEmbeds.enable = true; + forceOwnerCrown.enable = true; + friendInvites.enable = true; + friendsSince.enable = true; + fullSearchContext.enable = true; + gameActivityToggle.enable = true; + gifPaste.enable = true; + greetStickerPicker.enable = true; + iLoveSpam.enable = true; + imageLink.enable = true; + imageZoom = { + enable = true; + nearestNeighbour = true; + }; + implicitRelationships.enable = true; + # invisibleChat.enable = true; # Equicord only + keepCurrentChannel.enable = true; + memberCount.enable = true; + mentionAvatars.enable = true; + messageClickActions = { + enable = true; + enableDoubleClickToEdit = false; + enableDoubleClickToReply = false; + }; + messageLatency = { + enable = true; + latency = 4; + }; + messageLinkEmbeds.enable = true; + messageLogger.enable = true; + messageTags.enable = true; + # moreCommands.enable = true; + # moreKaomoji.enable = true; + # moreUserTags.enable = true; + MutualGroupDMs.enable = true; + newGuildSettings = { + enable = true; + # Values: 0 = All messages, 1 = Only @mentions, 2 = Nothing, 3 = Server default''; + messages = 1; + role = false; + }; + noBlockedMessages.enable = true; + noDevtoolsWarning.enable = true; + noF1.enable = true; + noMosaic.enable = true; + noOnboardingDelay.enable = true; + noPendingCount.enable = true; + noTypingAnimation.enable = true; + noUnblockToJump.enable = true; + normalizeMessageLinks.enable = true; + openInApp.enable = true; + overrideForumDefaults.enable = true; + permissionFreeWill.enable = true; + permissionsViewer.enable = true; + petpet.enable = true; + pictureInPicture.enable = true; + PinDMs.enable = true; + platformIndicators.enable = true; + previewMessage.enable = true; + quickMention.enable = true; + quickReply.enable = true; + reactErrorDecoder.enable = true; + readAllNotificationsButton.enable = true; + relationshipNotifier.enable = true; + replaceGoogleSearch.enable = true; + replyTimestamp.enable = true; + revealAllSpoilers.enable = true; + reverseImageSearch.enable = true; + roleColorEverywhere.enable = true; + summaries.enable = true; + sendTimestamps.enable = true; + serverInfo.enable = true; + shikiCodeblocks.enable = true; + showAllMessageButtons.enable = true; + showConnections.enable = true; + showHiddenChannels = { + enable = true; + # Values: 0 = Lock Icon replacing channel icon, 2 = Eye icon on the right, 1 = Lock icon on the right + showMode = 0; + }; + showHiddenThings.enable = true; + showTimeoutDuration.enable = true; + silentMessageToggle.enable = true; + sortFriendRequests.enable = true; + spotifyControls.enable = true; + spotifyCrack.enable = true; + spotifyShareCommands.enable = true; + startupTimings.enable = true; + streamerModeOnStream.enable = true; + themeAttributes.enable = true; + translate.enable = true; + typingIndicator.enable = true; + typingTweaks.enable = true; + unindent.enable = true; + unlockedAvatarZoom.enable = true; + unsuppressEmbeds.enable = true; + userVoiceShow.enable = true; + validReply.enable = true; + validUser.enable = true; + voiceChatDoubleClick.enable = true; + vencordToolbox.enable = true; + viewIcons.enable = true; + viewRaw.enable = true; + voiceDownload.enable = true; + voiceMessages.enable = true; + volumeBooster.enable = true; + youtubeAdblock.enable = true; + }; + }; + + vesktopConfig = { + plugins = { + webKeybinds.enable = true; + webRichPresence.enable = true; + webScreenShareFixes.enable = true; + }; + }; + }; +} diff --git a/home-manager/modules/vicinae.nix b/home-manager/modules/vicinae.nix new file mode 100644 index 0000000..0cfc632 --- /dev/null +++ b/home-manager/modules/vicinae.nix @@ -0,0 +1,37 @@ +{ + inputs, + pkgs, + ... +}: +{ + # ... + + services.vicinae = { + enable = true; + systemd = { + enable = true; + autoStart = true; + environment = { + USE_LAYER_SHELL = 1; + }; + }; + settings = { + close_on_focus_loss = true; + consider_preedit = true; + pop_to_root_on_close = true; + favicon_service = "twenty"; + search_files_in_root = true; + font = { + normal = { + size = 12; + normal = "Comic Code Ligatures"; + }; + }; + }; + extensions = with inputs.vicinae-extensions.packages.${pkgs.stdenv.hostPlatform.system}; [ + bluetooth + nix + power-profile + ]; + }; +} diff --git a/home-manager/modules/zen.nix b/home-manager/modules/zen.nix index 9f83f37..8f92506 100644 --- a/home-manager/modules/zen.nix +++ b/home-manager/modules/zen.nix @@ -1,5 +1,9 @@ # Zen is a minimalistic web browser. -{ inputs, ... }: +{ + inputs, + config, + ... +}: { imports = [ inputs.zen-browser.homeModules.beta diff --git a/hosts/seikan/routes.nix b/hosts/seikan/routes.nix index 32027a6..780393a 100644 --- a/hosts/seikan/routes.nix +++ b/hosts/seikan/routes.nix @@ -93,9 +93,9 @@ } ]; - a3-dev_zt.loadBalancer.servers = [ + pm_zt.loadBalancer.servers = [ { - url = "https://a3-dev.zerotier.gwg313.xyz"; + url = "https://pm.zerotier.gwg313.xyz"; } ]; }; @@ -220,10 +220,10 @@ middlewares = [ "headers" ]; }; - a3-dev_zt = { + pm_zt = { entryPoints = [ "websecure" ]; - rule = "Host(`a3-dev.gwg313.xyz`)"; - service = "a3-dev_zt"; + rule = "Host(`pm.gwg313.xyz`)"; + service = "pm_zt"; tls.certResolver = "le"; middlewares = [ "headers" ]; }; diff --git a/hosts/waypoint/routes.nix b/hosts/waypoint/routes.nix index 56328c0..58b18ee 100644 --- a/hosts/waypoint/routes.nix +++ b/hosts/waypoint/routes.nix @@ -124,10 +124,10 @@ middlewares = [ "headers" ]; }; - a3-dev = { + pm = { entryPoints = [ "websecure" ]; - rule = "Host(`a3-dev.gwg313.xyz`)"; - service = "a3-dev_local"; + rule = "Host(`pm.gwg313.xyz`)"; + service = "pm_local"; tls.certResolver = "le"; middlewares = [ "headers" ]; }; diff --git a/hosts/waypoint/routes_zerotier.nix b/hosts/waypoint/routes_zerotier.nix index f971f02..2bc8a09 100644 --- a/hosts/waypoint/routes_zerotier.nix +++ b/hosts/waypoint/routes_zerotier.nix @@ -124,10 +124,10 @@ middlewares = [ "headers" ]; }; - a3-dev_zt = { + pm_zt = { entryPoints = [ "websecure" ]; - rule = "Host(`a3-dev.zerotier.gwg313.xyz`)"; - service = "a3-dev_local"; + rule = "Host(`pm.zerotier.gwg313.xyz`)"; + service = "pm_local"; tls.certResolver = "le"; middlewares = [ "headers" ]; }; diff --git a/hosts/waypoint/services.nix b/hosts/waypoint/services.nix index c218a20..d80cfde 100644 --- a/hosts/waypoint/services.nix +++ b/hosts/waypoint/services.nix @@ -108,9 +108,9 @@ } ]; - a3-dev_local.loadBalancer.servers = [ + pm_local.loadBalancer.servers = [ { - url = "https://a3-dev.gwg313.xyz"; + url = "https://pm.gwg313.xyz"; } ]; };