diff --git a/command list-panes: too many arguments (need at most 0) b/command list-panes: too many arguments (need at most 0) new file mode 100644 index 0000000..110d82d --- /dev/null +++ b/command list-panes: too many arguments (need at most 0) @@ -0,0 +1 @@ +Ptmux;_Gd=a,a=d,q=2\\ \ No newline at end of file diff --git a/flake.lock b/flake.lock index 8ab7b12..e7c1f09 100644 --- a/flake.lock +++ b/flake.lock @@ -25,19 +25,22 @@ }, "ags": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_2" }, "locked": { - "lastModified": 1728326430, - "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", + "lastModified": 1731591309, + "narHash": "sha256-2qL6CAoQjCJLsxpy0Ac/9pLFoItf3L9KMCSLpoJ6jSw=", "owner": "Aylur", "repo": "ags", - "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", + "rev": "67b0e31ded361934d78bddcfc01f8c3fcf781aad", "type": "github" }, "original": { "owner": "Aylur", + "ref": "v1", "repo": "ags", "type": "github" } @@ -85,11 +88,11 @@ ] }, "locked": { - "lastModified": 1730968822, - "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", + "lastModified": 1731774881, + "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", + "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", "type": "github" }, "original": { @@ -100,7 +103,7 @@ }, "blog": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pnpm2nix": "pnpm2nix", "systems": "systems_5" }, @@ -111,11 +114,11 @@ "rev": "9477af4043d0bc05a082389d0b57a141121ae8d5", "revCount": 27, "type": "git", - "url": "https://git.zoeys.computer/zoey/web" + "url": "https://git.zoeys.cloud/zoey/web" }, "original": { "type": "git", - "url": "https://git.zoeys.computer/zoey/web" + "url": "https://git.zoeys.cloud/zoey/web" } }, "catppuccin": { @@ -168,15 +171,15 @@ }, "emacs-overlay": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731489158, - "narHash": "sha256-xxhjjRBM9P6536SATfoGkKcMBKPZxcgs3yx/cyQxbb0=", + "lastModified": 1732266182, + "narHash": "sha256-NuajQPP1ZVtviwC+Y3J42RV7V7TsCo+A+ux2aC9oW9s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "98672e8948813f132851fb6768fa1265a8cab324", + "rev": "2bbf361a5d58fd97f31bd871e334f0682b98c905", "type": "github" }, "original": { @@ -524,7 +527,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_7" }, "locked": { "lastModified": 1715533576, @@ -543,7 +546,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_7" + "flake-utils": "flake-utils_8" }, "locked": { "lastModified": 1715533576, @@ -619,11 +622,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -634,14 +637,14 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_14" + "systems": "systems_12" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -668,6 +671,39 @@ "type": "github" } }, + "flake-utils_8": { + "inputs": { + "systems": "systems_16" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -682,11 +718,11 @@ ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -811,11 +847,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -864,11 +900,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1730561387, - "narHash": "sha256-esE2L7+9CsmlSjTIHwU9VAhzvsFSMC3kO7EiutCPQpg=", + "lastModified": 1731958956, + "narHash": "sha256-21R5LD61oUqjdo9Vz0kLn0qSHCDMXyUMXbbod3kX+ho=", "owner": "hyprwm", "repo": "hypridle", - "rev": "26780ac51f6e7273e3934885036b7a7ed1a5af01", + "rev": "9f23e70bb494107df8f959c925d4521a298c65eb", "type": "github" }, "original": { @@ -885,17 +921,17 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_7", "xdph": "xdph" }, "locked": { - "lastModified": 1731425185, - "narHash": "sha256-hhmwtcOncg/RMmi2KDuvQfhYeahrhc4UsL36/NNdqYI=", + "lastModified": 1732291262, + "narHash": "sha256-EDTvzp9ExAljyfESZZN8UQM08bpYvI2hFTaXivp3frg=", "ref": "refs/heads/main", - "rev": "bb160cfe377da2d2b2e4431a3399fa60114f3911", - "revCount": 5450, + "rev": "745a82ce8ab19d958e344f5925bb1dc8ea7d6a53", + "revCount": 5488, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1026,11 +1062,11 @@ ] }, "locked": { - "lastModified": 1731163338, - "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", + "lastModified": 1731702627, + "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", + "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", "type": "github" }, "original": { @@ -1120,8 +1156,8 @@ "lexical": { "inputs": { "flake-parts": "flake-parts_8", - "nixpkgs": "nixpkgs_15", - "systems": "systems_17" + "nixpkgs": "nixpkgs_14", + "systems": "systems_18" }, "locked": { "lastModified": 1727126932, @@ -1139,15 +1175,15 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1731240728, - "narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=", + "lastModified": 1731845570, + "narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "807ab623e6d01e931269a28a07c59dcfd6474173", + "rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9", "type": "github" }, "original": { @@ -1156,6 +1192,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1729298361, + "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", + "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_4", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729360442, + "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", + "rev": "9098ac95768f7006d7e070b88bae76939f6034e6", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" + } + }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_3", @@ -1163,14 +1234,14 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1731500640, - "narHash": "sha256-bxtcbR33ftcSA+7+E52i+cqWAdoCQNFpxR1180HRX48=", + "lastModified": 1732234033, + "narHash": "sha256-94yZ7eJiLvW+UknI5RZBCV6OMHtoSv1oWyOwKjTmS88=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1329ddcc318e77e4629eb629d39f7f7c9b2632f6", + "rev": "10e11c32a4f4f7c9d64f45413642ded11fc538b6", "type": "github" }, "original": { @@ -1182,11 +1253,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1731454739, - "narHash": "sha256-ihuASDo2BVZpUpsW6Z8Ll/xvczRPgGT/EGrrNt7NnwU=", + "lastModified": 1732229552, + "narHash": "sha256-7tA7IeOjx1wgDQnY7RxIhIuwcFeSZu4Yc3WtLh+22TE=", "owner": "neovim", "repo": "neovim", - "rev": "1128d75550fa0b481b8953a194bae890d733a166", + "rev": "ff75f345ab5fa57c6560db021e8eb099aff90472", "type": "github" }, "original": { @@ -1199,15 +1270,15 @@ "inputs": { "flake-parts": "flake-parts_5", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731250407, - "narHash": "sha256-AwyDiazOqBZBUPp0vqYEzvBseZo3Eg16mfjAFvKv2lc=", + "lastModified": 1731682758, + "narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "96902c4573cd03ea7e533634cb49861148f49a7a", + "rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36", "type": "github" }, "original": { @@ -1240,11 +1311,11 @@ }, "nixlib": { "locked": { - "lastModified": 1729990941, - "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", + "lastModified": 1731805462, + "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7d68864343650322045894951602d6e82b5296d7", + "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", "type": "github" }, "original": { @@ -1261,11 +1332,11 @@ ] }, "locked": { - "lastModified": 1731341898, - "narHash": "sha256-2L34Jrd73o6q6t8xMVVK7cj4qk5uHYbSIh72qtIKWWs=", + "lastModified": 1732151224, + "narHash": "sha256-5IgpueM8SGLOadzUJK6Gk37zEBXGd56BkNOtoWmnZos=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "3a5bf194b6b25ee27a2c61afed039f3cb3a0fbfc", + "rev": "3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c", "type": "github" }, "original": { @@ -1276,27 +1347,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1712883908, + "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1731200463, - "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=", + "lastModified": 1731805462, + "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e04234d263750db01c78a412690363dc2226e68a", + "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", "type": "github" }, "original": { @@ -1343,11 +1414,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -1391,11 +1462,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731245184, - "narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -1410,14 +1481,14 @@ "flake-compat": "flake-compat_5", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1731435944, - "narHash": "sha256-4pxvlMcGGjW1ZcaoOFuwPJsu3lxYZLcUaOIik5x6LeM=", + "lastModified": 1732289107, + "narHash": "sha256-Ht7NG7IfVTLIu7CWdPl06yrKL8sjsTB4w6BDqMf0w5M=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "c7648f36d9ae0d5e38aa0f7417b05e317eb162ba", + "rev": "243bb282a21cdede947362dd93544640f765ab48", "type": "github" }, "original": { @@ -1427,22 +1498,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1702151865, "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", @@ -1458,7 +1513,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1712883908, "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", @@ -1474,7 +1529,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1728538411, "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", @@ -1490,7 +1545,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -1506,7 +1561,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1719931832, "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=", @@ -1520,7 +1575,7 @@ "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 0, "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", @@ -1533,22 +1588,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1712883908, - "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1702151865, "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", @@ -1564,13 +1603,29 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -1581,22 +1636,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -1612,13 +1651,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1731245184, - "narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -1628,13 +1667,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -1644,7 +1683,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1730958623, "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", @@ -1660,10 +1699,26 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pnpm2nix": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1706694632, @@ -1681,8 +1736,8 @@ }, "pnpm2nix_2": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_11" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1706694632, @@ -1709,11 +1764,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -1770,8 +1825,8 @@ }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_12", - "systems": "systems_12" + "nixpkgs": "nixpkgs_11", + "systems": "systems_13" }, "locked": { "lastModified": 1729835932, @@ -1780,11 +1835,11 @@ "rev": "8a737fbb37d096ac822bea361bf762542aef4983", "revCount": 27, "type": "git", - "url": "https://git.zoeys.computer/zoey/resume" + "url": "https://git.zoeys.cloud/zoey/resume" }, "original": { "type": "git", - "url": "https://git.zoeys.computer/zoey/resume" + "url": "https://git.zoeys.cloud/zoey/resume" } }, "rio-term": { @@ -1794,14 +1849,14 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_3", - "systems": "systems_13" + "systems": "systems_14" }, "locked": { - "lastModified": 1731456097, - "narHash": "sha256-moAGKMHAVW2EE+GN3CzRNBca/mYjqHQg1FErwR1p1LA=", + "lastModified": 1732221455, + "narHash": "sha256-lzW3DCYMNd/BAbAPudxIQJGmxEnyWDg1rxHWuwF5wZY=", "owner": "raphamorim", "repo": "rio", - "rev": "29484e7a2ed964d742fed3f6ef8fedab090b650c", + "rev": "1d598cac8da30d5e023e3421d2e8fc8c83006523", "type": "github" }, "original": { @@ -1823,9 +1878,10 @@ "hyprland": "hyprland", "kb-gui": "kb-gui", "lanzaboote": "lanzaboote", + "lix-module": "lix-module", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-wayland": "nixpkgs-wayland", "pnpm2nix": "pnpm2nix_2", @@ -1835,7 +1891,7 @@ "snowfall-lib": "snowfall-lib", "solaar": "solaar", "spicetify-nix": "spicetify-nix", - "systems": "systems_16", + "systems": "systems_17", "waybar": "waybar", "zen-browser": "zen-browser", "zoeycomputer": "zoeycomputer" @@ -1844,7 +1900,7 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1709259239, @@ -1887,14 +1943,14 @@ }, "rust-overlay_3": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1731119076, - "narHash": "sha256-2eVhmocCZHJlFAz6Mt3EwPdFFVAtGgIySJc1EHQVxcc=", + "lastModified": 1731724228, + "narHash": "sha256-3R48B+BVeZ8IWsXF7TdRm441RsdJt21yQ5ZgxuNTXYc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "23c4b3ba5f806fcf25d5a3b6b54fa0d07854c032", + "rev": "f6c4c2a7b8969c2b172847b3ef474e0d3bd8bdce", "type": "github" }, "original": { @@ -1910,11 +1966,11 @@ ] }, "locked": { - "lastModified": 1731464916, - "narHash": "sha256-WZ5rpjr/wCt7yBOUsvDE2i22hYz9g8W921jlwVktRQ4=", + "lastModified": 1732242723, + "narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2c19bad6e881b5a154cafb7f9106879b5b356d1f", + "rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a", "type": "github" }, "original": { @@ -2000,11 +2056,11 @@ ] }, "locked": { - "lastModified": 1731471404, - "narHash": "sha256-xrqZLeXOI5qm90iN5sgyINMU2621jf+WBMJivpTNEWc=", + "lastModified": 1732248994, + "narHash": "sha256-ZVX0BPZkyn8M9JD+62xml6ir6ejzdG5hwhiulDeym9M=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c80ea8541d55731f143828a574e00d50553e9c7c", + "rev": "31e976ab41721e156ef44e0e7b6b0bd46c80dedd", "type": "github" }, "original": { @@ -2074,7 +2130,6 @@ } }, "systems_13": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2090,6 +2145,7 @@ } }, "systems_14": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2164,6 +2220,21 @@ "type": "github" } }, + "systems_19": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1689347949, @@ -2314,11 +2385,11 @@ ] }, "locked": { - "lastModified": 1731512188, - "narHash": "sha256-fELrde5IDAgdYQQL/EAPBPFZIN73p/zd33rtfJQsA4s=", + "lastModified": 1732089758, + "narHash": "sha256-5uRSlSdsfCudEFanhXJ8cRV+U18QZdu2cWYjIzeOvEs=", "owner": "Alexays", "repo": "Waybar", - "rev": "86451156190e69afafb2162fb5891c0fc68c26e7", + "rev": "20ca48c3b863a8b11dc149161a3e6e33ce97eea5", "type": "github" }, "original": { @@ -2355,11 +2426,11 @@ ] }, "locked": { - "lastModified": 1730743262, - "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", + "lastModified": 1731703417, + "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", + "rev": "8070f36deec723de71e7557441acb17e478204d3", "type": "github" }, "original": { @@ -2370,7 +2441,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1727721329, @@ -2390,9 +2461,9 @@ "inputs": { "flake-parts": "flake-parts_7", "lexical": "lexical", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "process-compose-flake": "process-compose-flake", - "systems": "systems_18" + "systems": "systems_19" }, "locked": { "lastModified": 1731607548, @@ -2401,11 +2472,11 @@ "rev": "49677f2d9b2cb94c36fe7a9df2bd5e9a8c00b94f", "revCount": 75, "type": "git", - "url": "https://git.zoeys.computer/zoey/zoeys.computer" + "url": "https://git.zoeys.cloud/zoey/zoeys.computer" }, "original": { "type": "git", - "url": "https://git.zoeys.computer/zoey/zoeys.computer" + "url": "https://git.zoeys.cloud/zoey/zoeys.computer" } } }, diff --git a/flake.nix b/flake.nix index cbc57bd..14f4177 100644 --- a/flake.nix +++ b/flake.nix @@ -23,10 +23,11 @@ nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - resume.url = "git+https://git.zoeys.computer/zoey/resume"; + resume.url = "git+https://git.zoeys.cloud/zoey/resume"; anyrun.url = "github:anyrun-org/anyrun/a808e6d801d9e216a0c077a003fba22cfc3a1990"; anyrun.inputs.nixpkgs.follows = "nixpkgs"; - ags.url = "github:Aylur/ags"; + ags.url = "github:Aylur/ags/v1"; + ags.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.darwin.follows = ""; @@ -45,7 +46,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - blog.url = "git+https://git.zoeys.computer/zoey/web"; + blog.url = "git+https://git.zoeys.cloud/zoey/web"; lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; @@ -104,10 +105,15 @@ zen-browser.url = "github:MarceColl/zen-browser-flake"; zoeycomputer = { - url = "git+https://git.zoeys.computer/zoey/zoeys.computer"; + url = "git+https://git.zoeys.cloud/zoey/zoeys.computer"; # inputs.nixpkgs.follows = "nixpkgs"; }; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + systems.url = "github:nix-systems/default"; spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; @@ -154,6 +160,7 @@ agenix.nixosModules.default solaar.nixosModules.default zoeycomputer.nixosModules.default + lix-module.nixosModules.default ]; }; in diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index 66379d4..77797e7 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -30,7 +30,7 @@ helpers = { anyrun.enable = true; - ags.enable = true; + waybar.enable = true; }; }; @@ -142,10 +142,10 @@ options = ["--cmd cd"]; }; - programs.cava = { - enable = true; - catppuccin.enable = true; - }; + # programs.cava = { + # enable = true; + # catppuccin.enable = true; + # }; programs.btop = { enable = true; diff --git a/modules/home/apps/helpers/waybar/default.nix b/modules/home/apps/helpers/waybar/default.nix new file mode 100644 index 0000000..a2a40b6 --- /dev/null +++ b/modules/home/apps/helpers/waybar/default.nix @@ -0,0 +1,174 @@ +{ + options, + config, + lib, + inputs, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.apps.helpers.waybar; +in { + options.apps.helpers.waybar = with types; { + enable = mkBoolOpt false "Enable WayBar"; + }; + + config = mkIf cfg.enable { + programs.waybar = { + enable = true; + style = '' + * { + color: @text; + font-family: Iosevka Nerd Font; + font-weight: bold; + font-size: 14px; + } + + window#waybar { + background-color: rgba(0, 0, 0, 0); + } + + #waybar > box { + margin: 10px 15px 0px; + background-color: @base; + border: 2px solid @mauve; + } + + #workspaces, + #window, + #idle_inhibitor, + #wireplumber, + #network, + #cpu, + #memory, + #battery, + #clock, + #power-profiles-daemon, + #tray, + #waybar > box { + border-radius: 12px; + } + + #workspaces * { + color: @red; + } + + #idle_inhibitor { + color: @peach; + } + + #window * { + color: @mauve; + } + + #wireplumber { + color: @yellow; + } + + #network { + color: @green; + } + + #power-profiles-daemon { + color: @teal; + } + + #battery { + color: @blue; + } + + #clock { + color: @lavender; + } + + #tray { + color: @text; + } + + #idle_inhibitor, + #wireplumber, + #network, + #cpu, + #memory, + #battery, + #clock, + #power-profiles-daemon, + #tray { + padding: 0 5px; + } + ''; + + settings = { + mainBar = { + layer = "top"; + position = "top"; + spacing = 4; + modules-left = [ + "hyprland/workspaces" + "hyprland/window" + ]; + modules-center = [ + ]; + modules-right = [ + "idle_inhibitor" + "wireplumber" + "network" + "power-profiles-daemon" + "battery" + "clock" + "tray" + ]; + + "hyprland/workspaces" = { + disable-scroll = true; + all-outputs = true; + warp-on-scroll = false; + format = "{name}: {icon}"; + format-icons = { + "urgent" = ""; + "active" = ""; + "default" = ""; + }; + }; + + #cava = { + # cava_config = "$HOME/.config/cava/config"; + # framerate = 60; + # bars = 16; + # method = "pipewire"; + # format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█" ]; + # bar_delimiter = 0; + #}; + + idle_inhibitor = { + format = "Idle: {icon} "; + format-icons = { + "deactivated" = ""; + "activated" = ""; + }; + }; + + wireplumber = { + format = "Volume: {icon} {volume}% "; + format-icons = ["" "" ""]; + format-muted = "Muted "; + }; + + clock = { + format = " {:%H:%M}"; + }; + + network = { + format = " {essid} 󰓅 {signalStrength}"; + }; + + battery = { + format-icons = ["" "" "" "" ""]; + format = "{icon} {capacity}%"; + }; + }; + }; + }; + }; +} diff --git a/modules/home/apps/term/kitty/default.nix b/modules/home/apps/term/kitty/default.nix index 2d57c4d..afef99b 100644 --- a/modules/home/apps/term/kitty/default.nix +++ b/modules/home/apps/term/kitty/default.nix @@ -12,14 +12,14 @@ in { enable = mkBoolOpt false "Enable Kitty Term"; fonts = { - # normal = mkStringOpt "ZedMono Nerd Font Mono Bold" "Normal Font"; - # bold = mkStringOpt "ZedMono Nerd Font Mono ExtraBold" "Bold Font"; - # italic = mkStringOpt "ZedMono Nerd Font Mono Bold Italic" "Italic Font"; - # bold_italic = mkStringOpt "ZedMono Nerd Font Mono ExtraBold Italic" "Bold Italic Font"; - normal = mkStringOpt "Iosevka Bold" "Normal Font"; - bold = mkStringOpt "Iosevka ExtraBold" "Bold Font"; - italic = mkStringOpt "Iosevka Bold Italic" "Italic Font"; - bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font"; + normal = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold" "Normal Font"; + bold = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold" "Bold Font"; + italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono Bold Italic" "Italic Font"; + bold_italic = mkStringOpt "JetBrainsMonoNL Nerd Font Mono ExtraBold Italic" "Bold Italic Font"; + # normal = mkStringOpt "Iosevka Bold" "Normal Font"; + # bold = mkStringOpt "Iosevka ExtraBold" "Bold Font"; + # italic = mkStringOpt "Iosevka Bold Italic" "Italic Font"; + # bold_italic = mkStringOpt "Iosevka ExtraBold Italic" "Bold Italic Font"; }; }; diff --git a/modules/home/apps/tools/neovim/NeoVim.png b/modules/home/apps/tools/neovim/NeoVim.png deleted file mode 100644 index 7eea350..0000000 Binary files a/modules/home/apps/tools/neovim/NeoVim.png and /dev/null differ diff --git a/modules/home/apps/tools/neovim/config/lazyvim.json b/modules/home/apps/tools/neovim/config/lazyvim.json index 39af63e..db94d6b 100644 --- a/modules/home/apps/tools/neovim/config/lazyvim.json +++ b/modules/home/apps/tools/neovim/config/lazyvim.json @@ -25,7 +25,8 @@ "lazyvim.plugins.extras.test.core", "lazyvim.plugins.extras.util.dot", "lazyvim.plugins.extras.util.mini-hipatterns", - "lazyvim.plugins.extras.coding.luasnip" + "lazyvim.plugins.extras.coding.luasnip", + "lazyvim.plugins.extras.coding.blink" ], "news": { "NEWS.md": "6520" diff --git a/modules/home/apps/tools/neovim/config/lua/config/keymaps.lua b/modules/home/apps/tools/neovim/config/lua/config/keymaps.lua index 91ddc41..e28acd4 100644 --- a/modules/home/apps/tools/neovim/config/lua/config/keymaps.lua +++ b/modules/home/apps/tools/neovim/config/lua/config/keymaps.lua @@ -119,3 +119,4 @@ end -- Set up the keybinding (you can modify this to your preferred key combination) vim.keymap.set("n", "zc", create_gist, { noremap = true, silent = true, expr = true }) +vim.keymap.set("n", "T", "TimerlyToggle", { noremap = true }) diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua index ec43fe8..9db96e5 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua @@ -7,97 +7,7 @@ return { }, }, "f-person/git-blame.nvim", - { - "3rd/image.nvim", - build = false, - lazy = false, - config = function() - require("image").setup({ - backend = "kitty", - kitty_method = "normal", - processor = "magick_cli", - integrations = { - markdown = { - enabled = true, - }, - }, - }) - end, - }, - { - "nvimdev/dashboard-nvim", - event = "VimEnter", - lazy = true, - opts = function() - local logo = "" - logo = string.rep("\n", 12) .. logo .. "\n\n" - local opts = { - theme = "hyper", - hide = { - statusline = true, - }, - config = { - header = vim.split(logo, "\n"), - shortcut = { - { - desc = "Find File", - action = "lua LazyVim.pick()()", - key = "f", - }, - { - desc = "New File", - action = "ene | startinsert", - key = "n", - }, - { - desc = "Lazy", - action = "Lazy", - icon = "󰒲 ", - key = "l", - }, - { - desc = "Quit", - action = function() - vim.api.nvim_input("qa") - end, - key = "q", - }, - }, - packages = { enable = true }, -- show how many plugins neovim loaded - project = { enable = true, limit = 8 }, - mru = { limit = 10 }, - }, - } - - -- Handle reopening dashboard after closing lazy - if vim.o.filetype == "lazy" then - vim.api.nvim_create_autocmd("WinClosed", { - pattern = tostring(vim.api.nvim_get_current_win()), - once = true, - callback = function() - vim.schedule(function() - vim.api.nvim_exec_autocmds("UIEnter", { group = "dashboard" }) - end) - end, - }) - end - - return opts - end, - }, { "nvim-lualine/lualine.nvim", enabled = false }, - -- { - -- "nvim-neorg/neorg", - -- lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default - -- version = "*", -- Pin Neorg to the latest stable release - -- config = true, - -- opts = { - -- load = { - -- ["core.defaults"] = {}, - -- ["core.concealer"] = {}, - -- }, - -- }, - -- }, { "echasnovski/mini.statusline", opts = {} }, { "stevearc/conform.nvim", @@ -108,10 +18,16 @@ return { typescriptreact = { "prettierd" }, javascriptreact = { "prettierd" }, javascript = { "prettierd" }, + htmlangular = { "prettierd" }, }, }, }, - { "hrsh7th/nvim-cmp", enabled = false }, + { + "saghen/blink.cmp", + opts = { + nerd_font_variant = "normal", + }, + }, { "lukas-reineke/indent-blankline.nvim", main = "ibl", @@ -137,76 +53,10 @@ return { require("force-cul").setup() end, }, - { - "saghen/blink.cmp", - lazy = false, -- lazy loading handled internally - -- optional: provides snippets for the snippet source - dependencies = { "rafamadriz/friendly-snippets", "saghen/blink.compat" }, - - build = "cargo build --release", - - sources = { - completion = { - enabled_providers = { "lsp", "path", "snippets", "buffer", "dadbod", "crates" }, - }, - - providers = { - dadbod = { - name = "vim-dadbod-completion", - module = "blink.compat", - opts = {}, - }, - crates = { - name = "crates", - module = "blink.compat", - opts = {}, - }, - }, - }, - - ---@module 'blink.cmp' - ---@type blink.cmp.Config - opts = { - keymap = { - [""] = { "scroll_documentation_down", "fallback" }, - [""] = { "scroll_documentation_up", "fallback" }, - [""] = { "select_prev", "fallback" }, - [""] = { "select_next", "fallback" }, - [""] = { "show", "show_documentation", "hide_documentation" }, - [""] = { - function(cmp) - if cmp.is_in_snippet() then - return cmp.accept() - else - return cmp.select_and_accept() - end - end, - "snippet_forward", - "fallback", - }, - }, - - windows = { - documentation = { - auto_show = true, - }, - }, - - highlight = { - -- sets the fallback highlight groups to nvim-cmp's highlight groups - -- useful for when your theme doesn't support blink.cmp - -- will be removed in a future release, assuming themes add support - use_nvim_cmp_as_default = true, - }, - -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- adjusts spacing to ensure icons are aligned - nerd_font_variant = "normal", - - -- experimental auto-brackets support - -- accept = { auto_brackets = { enabled = true } } - - -- experimental signature help support - -- trigger = { signature_help = { enabled = true } } - }, - }, + -- { + -- "supermaven-inc/supermaven-nvim", + -- config = function() + -- require("supermaven-nvim").setup({}) + -- end, + -- }, } diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/timer.lua b/modules/home/apps/tools/neovim/config/lua/plugins/timer.lua new file mode 100644 index 0000000..cdf31c6 --- /dev/null +++ b/modules/home/apps/tools/neovim/config/lua/plugins/timer.lua @@ -0,0 +1,5 @@ +return { + "nvzone/volt", + { "nvzone/timerly", cmd = "TimerlyToggle" }, + { "nvzone/showkeys", cmd = "ShowkeysToggle" }, +} diff --git a/modules/home/apps/tools/neovim/default.nix b/modules/home/apps/tools/neovim/default.nix index ba5801c..f01a52f 100644 --- a/modules/home/apps/tools/neovim/default.nix +++ b/modules/home/apps/tools/neovim/default.nix @@ -139,89 +139,6 @@ in { vim.opt.rtp:prepend(lazypath) require('config.lazy') - - local dashboardImage = vim.api.nvim_create_augroup("DashboardImage", { clear = true }) - local img = require("image").from_file("${./NeoVim.png}") - local is_visible = false - - -- Known image dimensions - local IMG_WIDTH = 50 -- characters - local IMG_HEIGHT = 14 -- lines - - -- Debug notification function - local function debug_notify(message) - -- vim.notify(message, vim.log.levels.INFO) - end - - -- Function to calculate centered position - local function center_image() - local win_width = vim.o.columns - local win_height = vim.o.lines - - local x = math.floor((win_width - IMG_WIDTH) / 2) - local y = math.floor((win_height - IMG_HEIGHT) / 6) - - return math.max(0, x), math.max(0, y) - end - - -- Function to update image position - local function update_image() - debug_notify("Attempting to update image. is_visible = " .. tostring(is_visible)) - if is_visible then - local x, y = center_image() - debug_notify("Positioning image at x=" .. x .. ", y=" .. y) - img:clear() - img:render() - img:move(x, y) - end - end - - -- Show image on both VimEnter and when dashboard buffer is created - vim.api.nvim_create_autocmd({ "VimEnter", "BufWinEnter", "BufEnter" }, { - group = dashboardImage, - callback = function(ev) - local filetype = vim.api.nvim_buf_get_option(ev.buf, "filetype") - debug_notify("Event triggered: " .. ev.event .. ", filetype: " .. filetype) - if filetype == "dashboard" then - debug_notify("Dashboard detected, setting visible") - is_visible = true - vim.schedule(update_image) - end - end, - }) - - -- Handle window resize - vim.api.nvim_create_autocmd("VimResized", { - group = dashboardImage, - callback = function() - debug_notify("Window resized") - update_image() - end, - }) - - -- Clear image when leaving dashboard - vim.api.nvim_create_autocmd("BufLeave", { - group = dashboardImage, - callback = function() - debug_notify("Leaving buffer") - is_visible = false - img:clear() - end, - }) - - -- Catch when returning to dashboard - vim.api.nvim_create_autocmd("FileType", { - group = dashboardImage, - pattern = "dashboard", - callback = function() - debug_notify("FileType dashboard detected") - is_visible = true - vim.schedule(update_image) - end, - }) - - -- Initial debug message - debug_notify("Dashboard image setup loaded") ''; }; diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index 7c26f57..71bda63 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -46,6 +46,7 @@ in { wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; # systemd = { # enable = true; @@ -150,11 +151,13 @@ in { brightness = 1; }; - # shadow config - drop_shadow = "yes"; - shadow_range = 60; - shadow_render_power = 5; - "col.shadow" = "rgba(07061f29)"; + shadow = { + # shadow config + enabled = true; + range = 60; + render_power = 5; + color = "rgba(07061f29)"; + }; }; misc = { diff --git a/modules/nixos/sites/gitlab/default.nix b/modules/nixos/sites/gitlab/default.nix index 4e08f4c..d03b995 100644 --- a/modules/nixos/sites/gitlab/default.nix +++ b/modules/nixos/sites/gitlab/default.nix @@ -15,7 +15,7 @@ in { options.sites.gitlab = with types; { enable = mkBoolOpt false "Enable GitLab"; - domain = mkStringOpt "git.zoeys.computer" "Domain for GitLab"; + domain = mkStringOpt "git.zoeys.cloud" "Domain for GitLab"; }; config = mkIf cfg.enable { @@ -75,7 +75,7 @@ in { mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root mkdir -p -m 0700 "$HOME/.nix-defexpr" . ${pkgs.nix}/etc/profile.d/nix-daemon.sh - ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-20.09 nixpkgs # 3 + ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-24.05 nixpkgs # 3 ${pkgs.nix}/bin/nix-channel --update nixpkgs ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [nix cacert git openssh])} ''; diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index 3bd9528..385f8a4 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -17,6 +17,8 @@ dates = ["03:45"]; }; + nix.package = inputs.lix-module.packages.${pkgs.system}.default; + nix.gc = { automatic = true; dates = "weekly";