From ed77ae6e6b829bb555ca101b931182fdcc5731bd Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 16 Dec 2024 16:39:20 -0500 Subject: [PATCH] updates --- ...panes: too many arguments (need at most 0) | 1 - flake.lock | 1113 +++++++++-------- flake.nix | 20 +- homes/x86_64-linux/zoey@earth/default.nix | 9 +- modules/home/apps/helpers/ags/default.nix | 10 +- .../apps/tools/neovim/config/lazyvim.json | 4 +- .../neovim/config/lua/config/options.lua | 3 + .../tools/neovim/config/lua/plugins/core.lua | 22 +- .../neovim/config/lua/plugins/line_num.lua | 43 + .../neovim/config/lua/plugins/mini.ai.lua | 4 + .../tools/neovim/config/lua/plugins/snow.lua | 5 + .../neovim/config/lua/plugins/subsitute.lua | 8 + modules/home/apps/tools/neovim/default.nix | 2 +- modules/home/shells/zsh/default.nix | 35 +- modules/home/wms/hyprland/default.nix | 2 +- modules/nixos/ui/fonts/default.nix | 9 +- packages/zen-browser-unwrapped/default.nix | 91 +- systems/x86_64-linux/earth/default.nix | 2 - 18 files changed, 800 insertions(+), 583 deletions(-) delete mode 100644 command list-panes: too many arguments (need at most 0) create mode 100644 modules/home/apps/tools/neovim/config/lua/plugins/line_num.lua create mode 100644 modules/home/apps/tools/neovim/config/lua/plugins/mini.ai.lua create mode 100644 modules/home/apps/tools/neovim/config/lua/plugins/snow.lua create mode 100644 modules/home/apps/tools/neovim/config/lua/plugins/subsitute.lua diff --git a/command list-panes: too many arguments (need at most 0) b/command list-panes: too many arguments (need at most 0) deleted file mode 100644 index 110d82d..0000000 --- a/command list-panes: too many arguments (need at most 0) +++ /dev/null @@ -1 +0,0 @@ -Ptmux;_Gd=a,a=d,q=2\\ \ No newline at end of file diff --git a/flake.lock b/flake.lock index 0a59a0f..f3f151f 100644 --- a/flake.lock +++ b/flake.lock @@ -54,17 +54,16 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1730405189, - "narHash": "sha256-Q9TZKW4z5lmDFBK+eTrTIbKy6Ksx7OaBSPWH0+4fkfY=", + "lastModified": 1731092955, + "narHash": "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=", "owner": "anyrun-org", "repo": "anyrun", - "rev": "a808e6d801d9e216a0c077a003fba22cfc3a1990", + "rev": "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc", "type": "github" }, "original": { "owner": "anyrun-org", "repo": "anyrun", - "rev": "a808e6d801d9e216a0c077a003fba22cfc3a1990", "type": "github" } }, @@ -88,11 +87,11 @@ ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1734364797, + "narHash": "sha256-2h1c+P0v3l0Z/ypUSsAPhU/yiSRgFwjVFODWp0S3d/w=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "8e77618b403a82fde2105a8e3cd7cabe7ef00952", "type": "github" }, "original": { @@ -101,11 +100,30 @@ "type": "github" } }, + "awsvpnclient": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1709887232, + "narHash": "sha256-SpJv0a1QORJ0V1I2qWMGGTjkk3i3gb41ELOetlmM8oA=", + "owner": "ymatsiuk", + "repo": "awsvpnclient", + "rev": "56ca114e3f7fe4db9d745a0ab8ed70c6bd803a8f", + "type": "github" + }, + "original": { + "owner": "ymatsiuk", + "repo": "awsvpnclient", + "type": "github" + } + }, "blog": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pnpm2nix": "pnpm2nix", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1729390858, @@ -123,11 +141,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1731232837, - "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=", + "lastModified": 1734057772, + "narHash": "sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs=", "owner": "catppuccin", "repo": "nix", - "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe", + "rev": "20b6328df20ae45752c81311d225fd47cba32483", "type": "github" }, "original": { @@ -137,30 +155,48 @@ } }, "crane": { + "locked": { + "lastModified": 1732407143, + "narHash": "sha256-qJOGDT6PACoX+GbNH2PPx2ievlmtT1NVeTB80EkRLys=", + "owner": "ipetkov", + "repo": "crane", + "rev": "f2b4b472983817021d9ffb60838b2b36b9376b20", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "locked": { + "lastModified": 1733016477, + "narHash": "sha256-Hh0khbqBeCtiNS0SJgqdWrQDem9WlPEc2KF5pAY+st0=", + "owner": "ipetkov", + "repo": "crane", + "rev": "76d64e779e2fbaf172110038492343a8c4e29b55", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "rust-overlay": [ - "lanzaboote", - "rust-overlay" ] }, "locked": { - "lastModified": 1681177078, - "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=", + "lastModified": 1717535930, + "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", "owner": "ipetkov", "repo": "crane", - "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6", + "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", "type": "github" }, "original": { @@ -171,15 +207,15 @@ }, "emacs-overlay": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732439500, - "narHash": "sha256-mo4VuOLi4CnWMoPIFIi1XgqaYNQ64xC4l0AqMaIrl7s=", + "lastModified": 1734369337, + "narHash": "sha256-hUX63V5zo5uqlnV+QSZsiSrvbuRG3Nh49gzJ9DegEXU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "87de50e44afcc4d819f9c65e9ab46222bf15f742", + "rev": "519b67faa4da472a390c579a7310d296994b62f1", "type": "github" }, "original": { @@ -204,7 +240,7 @@ "type": "github" } }, - "flake-compat_10": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -220,30 +256,14 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -269,21 +289,6 @@ } }, "flake-compat_5": { - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "flake": false, "locked": { "lastModified": 1650374568, @@ -299,23 +304,23 @@ "type": "github" } }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_7": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_8": { "flake": false, "locked": { "lastModified": 1650374568, @@ -331,14 +336,30 @@ "type": "github" } }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_9": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -370,17 +391,14 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -391,17 +409,14 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733269028, + "narHash": "sha256-kVq/jAKKtbvWwbL9wf0SKDxtxsC5Gb+nlIYEFnyXhGA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "e37654df08605b510ad84eceaafcc7248495e843", "type": "github" }, "original": { @@ -413,38 +428,37 @@ "flake-parts_4": { "inputs": { "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, "flake-parts_5": { "inputs": { "nixpkgs-lib": [ - "nixpkgs-wayland", - "nix-eval-jobs", + "neovim-nightly-overlay", "nixpkgs" ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -455,14 +469,35 @@ }, "flake-parts_6": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "hercules-ci-effects", + "nixpkgs" + ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_7": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -471,9 +506,9 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_8": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { "lastModified": 1727826117, @@ -489,9 +524,9 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_9": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { "lastModified": 1719994518, @@ -527,7 +562,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_7" + "flake-utils": "flake-utils_6" }, "locked": { "lastModified": 1715533576, @@ -546,7 +581,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_8" + "flake-utils": "flake-utils_7" }, "locked": { "lastModified": 1715533576, @@ -565,14 +600,14 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_8" + "systems": "systems_5" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -583,14 +618,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_9" + "systems": "systems_11" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -601,7 +636,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_10" + "systems": "systems_12" }, "locked": { "lastModified": 1726560853, @@ -619,25 +654,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_11" - }, - "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_6": { - "inputs": { - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1701680307, @@ -653,9 +670,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1694529238, @@ -671,9 +688,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1694529238, @@ -704,6 +721,29 @@ "type": "github" } }, + "g2claude": { + "inputs": { + "crane": "crane", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_5", + "rust-overlay": "rust-overlay", + "systems": "systems_7", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1732553140, + "narHash": "sha256-ufRQbr2td68ymDzDfQi896b958bYHzpgQKHhNkoFNCs=", + "ref": "refs/heads/main", + "rev": "c1d42e1c38c6099fe2779a36b05ab1756cdd46ef", + "revCount": 1, + "type": "git", + "url": "https://git.zoeys.cloud/zoey/g2claude.git" + }, + "original": { + "type": "git", + "url": "https://git.zoeys.cloud/zoey/g2claude.git" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -718,11 +758,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "type": "github" }, "original": { @@ -762,11 +802,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -799,18 +839,18 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_6", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" ] }, "locked": { - "lastModified": 1730903510, - "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -847,11 +887,11 @@ ] }, "locked": { - "lastModified": 1732453510, - "narHash": "sha256-mAOaLu++YRwOxCJ135Bhgf78WYhIKWHL2aGWCAoXoBg=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd58a1132e9b7f121f65313bc662ad6c8a05f878", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -877,11 +917,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734364709, + "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", "type": "github" }, "original": { @@ -890,6 +930,35 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733684019, + "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hypridle": { "inputs": { "hyprlang": "hyprlang", @@ -897,7 +966,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_8" }, "locked": { "lastModified": 1731958956, @@ -917,21 +986,23 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_7", + "systems": "systems_9", "xdph": "xdph" }, "locked": { - "lastModified": 1732460016, - "narHash": "sha256-Kb8TdW9fL/74kYr/Nfhe5EI3JEBn52+wyAxV1ZBGLV8=", + "lastModified": 1734376956, + "narHash": "sha256-J15sxw7bC979T1FhdkCATHfkmMIfWx6w67cWln4Mpeg=", "ref": "refs/heads/main", - "rev": "cc38e7e18fd762d5cdb34d06335223b7d7874106", - "revCount": 5494, + "rev": "e340e9f431c7f1792fd6bfea20eb2f71a59d511f", + "revCount": 5553, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -967,6 +1038,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733940128, + "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -1012,11 +1112,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1734364628, + "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", "type": "github" }, "original": { @@ -1062,11 +1162,11 @@ ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1733502241, + "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "104117aed6dd68561be38b50f218190aa47f2cd8", "type": "github" }, "original": { @@ -1102,22 +1202,21 @@ }, "kb-gui": { "inputs": { - "flake-utils": [ - "kb-gui", - "rust-overlay", - "flake-utils" - ], + "crane": "crane_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2", + "systems": "systems_10", + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1709320541, - "narHash": "sha256-GiEMDFN65u8dkv3y3099IAXpVJ4NLDI/Vva2ZGbI+jA=", + "lastModified": 1733281564, + "narHash": "sha256-Yr9mk33lrryea4b7dlOWgI7Cjrfz5Q3cjEyjPqZ9FK8=", "owner": "zackartz", "repo": "kb-gui", - "rev": "5e4547b36da1afa06e5c1e40a65d3850e6bf16e2", + "rev": "499dab14fc2935e802e259501e86f5ffe8fb2f2e", "type": "github" }, "original": { @@ -1128,36 +1227,36 @@ }, "lanzaboote": { "inputs": { - "crane": "crane", + "crane": "crane_3", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_4", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1682802423, - "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=", + "lastModified": 1718178907, + "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "64b903ca87d18cef2752c19c098af275c6e51d63", + "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.3.0", + "ref": "v0.4.1", "repo": "lanzaboote", "type": "github" } }, "lexical": { "inputs": { - "flake-parts": "flake-parts_8", - "nixpkgs": "nixpkgs_14", - "systems": "systems_18" + "flake-parts": "flake-parts_9", + "nixpkgs": "nixpkgs_17", + "systems": "systems_19" }, "locked": { "lastModified": 1727126932, @@ -1173,25 +1272,6 @@ "type": "github" } }, - "lib-aggregate": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1732450403, - "narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=", - "owner": "nix-community", - "repo": "lib-aggregate", - "rev": "c817444fb8a3042c26be57d8640fb744bc1b516c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lib-aggregate", - "type": "github" - } - }, "lix": { "flake": false, "locked": { @@ -1230,18 +1310,19 @@ "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_5", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_11", + "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1732406787, - "narHash": "sha256-5c1DQGdD0wZl+Ps05M4A7xWbb9b5KBdH3Z7td4UanYk=", + "lastModified": 1734377470, + "narHash": "sha256-2ICLd6Pc1ATA008wHi4k0JsV5mWM4jmEULINxdnd/+c=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6f95702c4fc3ff51b4cd1a626e958fbad50bfc3a", + "rev": "f54ecbd4dc854d955fa3a06cecf5217130b70f61", "type": "github" }, "original": { @@ -1253,11 +1334,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732402479, - "narHash": "sha256-TR8ZCOq4v8ChQMZ0/WEq8Inr3pb7cAgvNpd9W2QqSSw=", + "lastModified": 1734351849, + "narHash": "sha256-fRNSqRIwg/J46FA27cunOXgzBRZ7mfGDCtpdNI0MTtc=", "owner": "neovim", "repo": "neovim", - "rev": "d9b08c58c34ba6c8083f533d5f7a0fd21e262d00", + "rev": "798f9284793ad9693c68352f5d07dafb73fd281e", "type": "github" }, "original": { @@ -1266,56 +1347,13 @@ "type": "github" } }, - "nix-eval-jobs": { - "inputs": { - "flake-parts": "flake-parts_5", - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_8", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1731682758, - "narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=", - "owner": "nix-community", - "repo": "nix-eval-jobs", - "rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-eval-jobs", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "nixpkgs-wayland", - "nix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720066371, - "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixlib": { "locked": { - "lastModified": 1731805462, - "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", + "lastModified": 1734224914, + "narHash": "sha256-hKWALzQ/RxxXdKWsLKXULru6XTag9Cc5exgVyS4a/AE=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", + "rev": "538697b664a64fade8ce628d01f35d1f1fd82d77", "type": "github" }, "original": { @@ -1332,11 +1370,11 @@ ] }, "locked": { - "lastModified": 1732151224, - "narHash": "sha256-5IgpueM8SGLOadzUJK6Gk37zEBXGd56BkNOtoWmnZos=", + "lastModified": 1734311693, + "narHash": "sha256-ODRrnbaUsOe3e4kp+uHl+iJxey5zE3kqiBqJWQxrlnY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c", + "rev": "a5278f7c326205681f1f42a90fa46a75a13627eb", "type": "github" }, "original": { @@ -1347,36 +1385,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712883908, - "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", - "type": "github" + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "path": "/nix/store/fn4i255gjsbqhza45ih8mgxgx47zan8i-source", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "type": "path" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-lib": { - "locked": { - "lastModified": 1732410305, - "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "lastModified": 1730504152, "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", @@ -1388,7 +1408,31 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + } + }, "nixpkgs-lib_3": { + "locked": { + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + } + }, + "nixpkgs-lib_4": { "locked": { "lastModified": 1727825735, "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", @@ -1400,7 +1444,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, - "nixpkgs-lib_4": { + "nixpkgs-lib_5": { "locked": { "lastModified": 1719876945, "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", @@ -1414,16 +1458,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -1446,27 +1490,27 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732238832, - "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", "type": "github" }, "original": { @@ -1476,28 +1520,55 @@ "type": "github" } }, - "nixpkgs-wayland": { - "inputs": { - "flake-compat": "flake-compat_5", - "lib-aggregate": "lib-aggregate", - "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_9" - }, + "nixpkgs_10": { "locked": { - "lastModified": 1732451775, - "narHash": "sha256-lp+R0hd3mH5hBtc833gONBuWqXPJGzJmGedIVxL2fpY=", - "owner": "nix-community", - "repo": "nixpkgs-wayland", - "rev": "3187348afa891b3ee9c1f5c866930a89970148eb", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs-wayland", + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_10": { + "nixpkgs_11": { + "locked": { + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1702151865, "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", @@ -1513,7 +1584,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_14": { "locked": { "lastModified": 1712883908, "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", @@ -1529,7 +1600,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_15": { "locked": { "lastModified": 1728538411, "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", @@ -1545,7 +1616,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_16": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -1561,7 +1632,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_17": { "locked": { "lastModified": 1719931832, "narHash": "sha256-0LD+KePCKKEb4CcPsTBOwf019wDtZJanjoKm1S8q3Do=", @@ -1575,7 +1646,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_18": { "locked": { "lastModified": 0, "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", @@ -1588,6 +1659,22 @@ } }, "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=", @@ -1603,29 +1690,13 @@ "type": "github" } }, - "nixpkgs_3": { - "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" - } - }, "nixpkgs_4": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -1637,11 +1708,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -1653,11 +1724,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { @@ -1669,27 +1740,43 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { @@ -1699,26 +1786,10 @@ "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_2" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1706694632, @@ -1736,8 +1807,8 @@ }, "pnpm2nix_2": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1706694632, @@ -1764,11 +1835,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "type": "github" }, "original": { @@ -1783,10 +1854,6 @@ "lanzaboote", "flake-compat" ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", @@ -1795,11 +1862,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1681413034, - "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -1825,8 +1892,8 @@ }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_11", - "systems": "systems_13" + "nixpkgs": "nixpkgs_14", + "systems": "systems_14" }, "locked": { "lastModified": 1732423120, @@ -1844,19 +1911,19 @@ }, "rio-term": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_3", - "systems": "systems_14" + "rust-overlay": "rust-overlay_4", + "systems": "systems_15" }, "locked": { - "lastModified": 1732407683, - "narHash": "sha256-W/jr5vbQEkNKS2eZZBkOOm3SDFTAZeAE0mhEeDXng5A=", + "lastModified": 1734366706, + "narHash": "sha256-3hlpU1gLjZzVh0M5/TmrhY60cLHZhxtM9y35hJuDMx8=", "owner": "raphamorim", "repo": "rio", - "rev": "fddea5440feb459f8a053217395259b2b4df8166", + "rev": "f08e4abc81f455203faf4148ddeee153eeed8d9f", "type": "github" }, "original": { @@ -1870,9 +1937,11 @@ "agenix": "agenix", "ags": "ags", "anyrun": "anyrun", + "awsvpnclient": "awsvpnclient", "blog": "blog", "catppuccin": "catppuccin", "emacs-overlay": "emacs-overlay", + "g2claude": "g2claude", "home-manager": "home-manager_2", "hypridle": "hypridle", "hyprland": "hyprland", @@ -1881,17 +1950,16 @@ "lix-module": "lix-module", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_12", "nixpkgs-unstable": "nixpkgs-unstable", - "nixpkgs-wayland": "nixpkgs-wayland", "pnpm2nix": "pnpm2nix_2", "resume": "resume", "rio-term": "rio-term", - "rust-overlay": "rust-overlay_4", + "rust-overlay": "rust-overlay_5", "snowfall-lib": "snowfall-lib", "solaar": "solaar", "spicetify-nix": "spicetify-nix", - "systems": "systems_17", + "systems": "systems_18", "waybar": "waybar", "zen-browser": "zen-browser", "zoeycomputer": "zoeycomputer" @@ -1899,15 +1967,14 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1709259239, - "narHash": "sha256-MbrpgqpvUND7+UnOSLazrAMj0+zle16RRiOKTtjBefw=", + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0e031ddb3f5a339dc6eda93d271ae43618b14eec", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -1917,6 +1984,24 @@ } }, "rust-overlay_2": { + "inputs": { + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1733279627, + "narHash": "sha256-NCNDAGPkdFdu+DLErbmNbavmVW9AwkgP7azROFFSB0U=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "4da5a80ef76039e80468c902f1e9f5c0eab87d96", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "flake-utils": [ "lanzaboote", @@ -1928,29 +2013,11 @@ ] }, "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", + "lastModified": 1717813066, + "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "nixpkgs": "nixpkgs_12" - }, - "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", "type": "github" }, "original": { @@ -1960,17 +2027,35 @@ } }, "rust-overlay_4": { + "inputs": { + "nixpkgs": "nixpkgs_15" + }, + "locked": { + "lastModified": 1734143514, + "narHash": "sha256-1+r8wYucn8kp9d/IBW1uYGs31QQmSZURElsiOTx65xM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "81fe5c27cb281a9b796d7ad05ad9179e5bd0c78d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_5": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "lastModified": 1734316514, + "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "83ee8ff74d6294a7657320f16814754c4594127b", "type": "github" }, "original": { @@ -1981,18 +2066,18 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1730136121, - "narHash": "sha256-tfVayj13Zw+zzOKrmJhnvBod7Hdb9ixBR6/4GUlyMA0=", + "lastModified": 1732544274, + "narHash": "sha256-qvzLIxuqukl0nxpXHEh5+iw1BLeLxYOwRC0+7cFUbPo=", "owner": "snowfallorg", "repo": "lib", - "rev": "dd348182c1a010993e68004eada86cf0341fe2c4", + "rev": "cfeacd055545ab5de0ecfd41e09324dcd8fb2bbb", "type": "github" }, "original": { @@ -2003,7 +2088,7 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "solaar", @@ -2027,7 +2112,7 @@ }, "solaar": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "nixpkgs": [ "nixpkgs" ], @@ -2050,17 +2135,17 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_8", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1732421741, - "narHash": "sha256-r3q4NYO3Z/OG3Oy5zHrEjAn+s5Bcgy569fUJUG9Ipuc=", + "lastModified": 1734322624, + "narHash": "sha256-9G6h+hHM8RyUvan2qojZwHlRoJ3gkLwZQLsW7bXyNrE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "8380d08050b6bd1f5c93de48e5ceef5b5105ecf6", + "rev": "f8289a4668187d3866caa7940dfd8ff680e41d0d", "type": "github" }, "original": { @@ -2145,7 +2230,6 @@ } }, "systems_14": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2161,6 +2245,7 @@ } }, "systems_15": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2250,6 +2335,21 @@ "type": "github" } }, + "systems_20": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1689347949, @@ -2297,20 +2397,35 @@ }, "systems_6": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2325,50 +2440,70 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_9": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1732292307, + "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "705df92694af7093dfbb27109ce16d828a79155f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": [ - "nixpkgs-wayland", - "nix-eval-jobs", + "neovim-nightly-overlay", "nixpkgs" ] }, "locked": { - "lastModified": 1723303070, - "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "14c092e0326de759e16b37535161b3cb9770cea3", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -2379,17 +2514,17 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_10", + "flake-compat": "flake-compat_9", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1732089758, - "narHash": "sha256-5uRSlSdsfCudEFanhXJ8cRV+U18QZdu2cWYjIzeOvEs=", + "lastModified": 1733561910, + "narHash": "sha256-TkyWMLnLd5QhAlfAGtuU3n8Gtl2Gp4+8Ye/rE4hs46A=", "owner": "Alexays", "repo": "Waybar", - "rev": "20ca48c3b863a8b11dc149161a3e6e33ce97eea5", + "rev": "e959f1d2300c5f7fcc818630c9eae59d834024ce", "type": "github" }, "original": { @@ -2426,11 +2561,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1734124279, + "narHash": "sha256-YNpFfiQjYt2o6LGcMN9NkjVvprC8ELrIpLHlbZbclRM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "0c6861f819f6d31f6195c9864709b2556f00b5cf", "type": "github" }, "original": { @@ -2441,7 +2576,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1727721329, @@ -2459,11 +2594,11 @@ }, "zoeycomputer": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_8", "lexical": "lexical", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_18", "process-compose-flake": "process-compose-flake", - "systems": "systems_19" + "systems": "systems_20" }, "locked": { "lastModified": 1731607548, diff --git a/flake.nix b/flake.nix index 6a55e52..4922844 100644 --- a/flake.nix +++ b/flake.nix @@ -21,10 +21,10 @@ emacs-overlay.url = "github:nix-community/emacs-overlay"; - nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; + awsvpnclient.url = "github:ymatsiuk/awsvpnclient"; resume.url = "git+https://git.zoeys.cloud/zoey/resume"; - anyrun.url = "github:anyrun-org/anyrun/a808e6d801d9e216a0c077a003fba22cfc3a1990"; + anyrun.url = "github:anyrun-org/anyrun"; anyrun.inputs.nixpkgs.follows = "nixpkgs"; ags.url = "github:Aylur/ags/v1"; ags.inputs.nixpkgs.follows = "nixpkgs"; @@ -49,7 +49,7 @@ blog.url = "git+https://git.zoeys.cloud/zoey/web"; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.3.0"; + url = "github:nix-community/lanzaboote/v0.4.1"; # Optional but recommended to limit the size of your system closure. inputs.nixpkgs.follows = "nixpkgs"; @@ -120,6 +120,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + g2claude.url = "git+https://git.zoeys.cloud/zoey/g2claude.git"; + rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; @@ -135,7 +137,17 @@ inherit inputs; src = ./.; - overlays = [inputs.rust-overlay.overlays.default]; + overlays = [ + inputs.rust-overlay.overlays.default + (final: prev: { + awsvpnclient = + inputs + .awsvpnclient + .packages + ."x86_64-linux" + .awsvpnclient; + }) + ]; snowfall = { namespace = "custom"; diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index c309510..ece70cd 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -83,11 +83,15 @@ pkgs.obs-studio pkgs.ungoogled-chromium + pkgs.uutils-coreutils-noprefix + pkgs.yazi pkgs.thunderbird pkgs.custom.enc + pkgs.nix-tree + pkgs.mongodb-compass pkgs.postman pkgs.mosh @@ -108,6 +112,8 @@ pkgs.nix-output-monitor pkgs.fastfetch + # inputs.g2claude.packages.${pkgs.system}.default + pkgs.signal-desktop pkgs.nh @@ -125,7 +131,6 @@ lib.custom.pkgs-unstable.rmpc pkgs.custom.zen-browser - pkgs.mpc-cli pkgs.openvpn @@ -196,7 +201,7 @@ WantedBy = ["default.target"]; }; Service = { - ExecStart = "${inputs.kb-gui.packages.${pkgs.system}.kb}/bin/kb"; + ExecStart = "${inputs.kb-gui.packages.${pkgs.system}.default}/bin/kb"; }; }; } diff --git a/modules/home/apps/helpers/ags/default.nix b/modules/home/apps/helpers/ags/default.nix index 090d779..6db7f8e 100644 --- a/modules/home/apps/helpers/ags/default.nix +++ b/modules/home/apps/helpers/ags/default.nix @@ -21,19 +21,19 @@ with lib.custom; let ripgrep util-linux gtksourceview - webkitgtk + webkitgtk_4_1 brightnessctl gvfs accountsservice swww - gnome.gnome-control-center - gnome.nautilus - gnome.totem + gnome-control-center + nautilus + totem loupe ]; guiDeps = with pkgs; [ - gnome.gnome-control-center + gnome-control-center overskride wlogout ]; diff --git a/modules/home/apps/tools/neovim/config/lazyvim.json b/modules/home/apps/tools/neovim/config/lazyvim.json index 4cfe9d1..25dec1f 100644 --- a/modules/home/apps/tools/neovim/config/lazyvim.json +++ b/modules/home/apps/tools/neovim/config/lazyvim.json @@ -13,6 +13,7 @@ "lazyvim.plugins.extras.lang.java", "lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.clangd", "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.nix", "lazyvim.plugins.extras.lang.sql", @@ -26,8 +27,7 @@ "lazyvim.plugins.extras.util.dot", "lazyvim.plugins.extras.util.mini-hipatterns", "lazyvim.plugins.extras.coding.luasnip", - "lazyvim.plugins.extras.coding.blink", - "lazyvim.plugins.extras.ai.supermaven" + "lazyvim.plugins.extras.coding.blink" ], "news": { "NEWS.md": "6520" diff --git a/modules/home/apps/tools/neovim/config/lua/config/options.lua b/modules/home/apps/tools/neovim/config/lua/config/options.lua index 54d2a06..b3caf5e 100644 --- a/modules/home/apps/tools/neovim/config/lua/config/options.lua +++ b/modules/home/apps/tools/neovim/config/lua/config/options.lua @@ -6,3 +6,6 @@ if vim.g.neovide then -- Put anything you want to happen only in Neovide here vim.o.guifont = "Iosevka,Noto_Color_Emoji:h14:b" end + +-- in this case. +-- vim.g.lazyvim_blink_main = 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 7761efc..dc5cb23 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua @@ -6,6 +6,12 @@ return { news = { lazyvim = false }, }, }, + { + "catppuccin", + opts = { transparent_background = true, integrations = { + blink_cmp = true, + } }, + }, "f-person/git-blame.nvim", { "nvim-lualine/lualine.nvim", enabled = false }, { "echasnovski/mini.statusline", opts = {} }, @@ -25,7 +31,7 @@ return { { "saghen/blink.cmp", opts = { - nerd_font_variant = "normal", + nerd_font_variant = "mono", }, }, { @@ -38,6 +44,20 @@ return { "sphamba/smear-cursor.nvim", opts = {}, }, + { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + keys = { + { + "z", + function() + Snacks.zen() + end, + desc = "Toggle Zen Mode", + }, + }, + }, { "lukas-reineke/indent-blankline.nvim", main = "ibl", diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/line_num.lua b/modules/home/apps/tools/neovim/config/lua/plugins/line_num.lua new file mode 100644 index 0000000..e5dc5ec --- /dev/null +++ b/modules/home/apps/tools/neovim/config/lua/plugins/line_num.lua @@ -0,0 +1,43 @@ +return { + "sethen/line-number-change-mode.nvim", + config = function() + require("catppuccin").setup({ + flavour = "mocha", + }) + local palette = require("catppuccin.palettes").get_palette("mocha") + + if palette == nil then + return nil + end + + require("line-number-change-mode").setup({ + mode = { + i = { + bg = palette.green, + fg = palette.mantle, + bold = true, + }, + n = { + bg = palette.blue, + fg = palette.mantle, + bold = true, + }, + R = { + bg = palette.maroon, + fg = palette.mantle, + bold = true, + }, + v = { + bg = palette.mauve, + fg = palette.mantle, + bold = true, + }, + V = { + bg = palette.mauve, + fg = palette.mantle, + bold = true, + }, + }, + }) + end, +} diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/mini.ai.lua b/modules/home/apps/tools/neovim/config/lua/plugins/mini.ai.lua new file mode 100644 index 0000000..f2f079f --- /dev/null +++ b/modules/home/apps/tools/neovim/config/lua/plugins/mini.ai.lua @@ -0,0 +1,4 @@ +return { + "echasnovski/mini.ai", + version = false, +} diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/snow.lua b/modules/home/apps/tools/neovim/config/lua/plugins/snow.lua new file mode 100644 index 0000000..7cdd438 --- /dev/null +++ b/modules/home/apps/tools/neovim/config/lua/plugins/snow.lua @@ -0,0 +1,5 @@ +return { + "marcussimonsen/let-it-snow.nvim", + cmd = "LetItSnow", -- Wait with loading until command is run + opts = {}, +} diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/subsitute.lua b/modules/home/apps/tools/neovim/config/lua/plugins/subsitute.lua new file mode 100644 index 0000000..2ca914c --- /dev/null +++ b/modules/home/apps/tools/neovim/config/lua/plugins/subsitute.lua @@ -0,0 +1,8 @@ +return { + "gbprod/substitute.nvim", + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }, +} diff --git a/modules/home/apps/tools/neovim/default.nix b/modules/home/apps/tools/neovim/default.nix index f01a52f..9e7109d 100644 --- a/modules/home/apps/tools/neovim/default.nix +++ b/modules/home/apps/tools/neovim/default.nix @@ -56,7 +56,7 @@ in { lua-language-server nixd (pkgs.rust-bin.selectLatestNightlyWith - (toolchain: toolchain.minimal)) + (toolchain: toolchain.default)) rust-analyzer vscode-langservers-extracted nodePackages.vscode-json-languageserver diff --git a/modules/home/shells/zsh/default.nix b/modules/home/shells/zsh/default.nix index 714b2c8..9448b54 100644 --- a/modules/home/shells/zsh/default.nix +++ b/modules/home/shells/zsh/default.nix @@ -24,7 +24,7 @@ in { SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh"; FLAKE = "/home/zoey/nixos/"; }; - enableAutosuggestions = true; + # zprof.enable = true; history = { save = 2137; size = 2137; @@ -39,10 +39,9 @@ in { "${zsh-history}/share/zsh/init.zsh" "${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh" "${zsh-f-sy-h}/share/zsh/site-functions/F-Sy-H.plugin.zsh" - # "${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh" "${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh" "${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh" - "${oh-my-zsh}/share/oh-my-zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh" + "${zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh" ]; source = map (source: "source ${source}") sources; @@ -52,6 +51,7 @@ in { ] ++ source); in '' + ${plugins} export NIX_LD=$(nix eval --impure --raw --expr 'let pkgs = import {}; NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; in NIX_LD') @@ -60,28 +60,13 @@ in { bindkey "^[[1;5D" backward-word ''; - plugins = [ - { - name = "zsh-tmux"; - file = "zsh-tmux.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "laggardkernel"; - repo = "zsh-tmux"; - rev = "v1.1.0"; - sha256 = "sha256-BB9L84HjUnV1OUIp2U2lHYHEg5q4p/TgqLcsCvInkC8="; - }; - } - { - name = "zsh-autocomplete"; - file = "zsh-autocomplete.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "marlonrichert"; - repo = "zsh-autocomplete"; - rev = "008caaea55780dd2b55f119d6880c5b89e5e4bb2"; - sha256 = "sha256-jibIHwT/oVQUSxVrT0SGFSMu1N05szPyHZ4Qc7v6Ntc="; - }; - } - ]; + # oh my zsh + oh-my-zsh = { + enable = true; + plugins = [ + "colored-man-pages" + ]; + }; dirHashes = { music = "$HOME/Music"; diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index 71bda63..d9d5c15 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -99,7 +99,7 @@ in { "${mod},X,exec, ags --toggle-window \"dashboard\"" "${mod},Print,exec,${lib.getExe pkgs.custom.sc}" - "${mod},Shift&Print,exec,${lib.getExe pkgs.wf-recorder} -g \"$(${lib.getExe pkgs.slurp})\" -f out.mp4" + "${mod},Shift&Print,exec,\"${lib.getExe pkgs.grim} -g ${lib.getExe pkgs.slurp} | wl-copy\"" "${modshift},O,exec,wl-ocr" "${mod},Period,exec, tofi-emoji" diff --git a/modules/nixos/ui/fonts/default.nix b/modules/nixos/ui/fonts/default.nix index 211297d..76b15f7 100644 --- a/modules/nixos/ui/fonts/default.nix +++ b/modules/nixos/ui/fonts/default.nix @@ -48,7 +48,9 @@ in { noto-fonts-cjk-sans noto-fonts-emoji jetbrains-mono - (nerdfonts.override {fonts = ["Iosevka" "JetBrainsMono"];}) + nerd-fonts.iosevka + nerd-fonts.zed-mono + # (nerdfonts.override {fonts = ["ZedMono" "Iosevka"];}) ]; enableDefaultPackages = false; @@ -57,11 +59,12 @@ in { fontconfig = { defaultFonts = { monospace = [ - "Iosevka Font Mono" + # "ZedMono Nerd Font Mono" + "Iosevka Nerd Font Mono" "Iosevka" "Noto Color Emoji" ]; - sansSerif = ["Iosevka" "Noto Color Emoji"]; + sansSerif = ["Inter" "Noto Color Emoji"]; serif = ["Noto Serif" "Noto Color Emoji"]; emoji = ["Noto Color Emoji"]; }; diff --git a/packages/zen-browser-unwrapped/default.nix b/packages/zen-browser-unwrapped/default.nix index f91aae7..3f26e00 100644 --- a/packages/zen-browser-unwrapped/default.nix +++ b/packages/zen-browser-unwrapped/default.nix @@ -1,20 +1,3 @@ -# pname = "zen-browser-unwrapped"; -# version = "715b6df2fb8171336adc8712668a5e8458f7749b"; -# -# src = fetchFromGitHub { -# owner = "zen-browser"; -# repo = "desktop"; -# rev = "${version}"; -# leaveDotGit = true; -# fetchSubmodules = true; -# hash = "sha256-0+x2XoZyMdzP1beJvUSeM/QnFyQ+FSuGIatHh1mtBaw="; -# }; -# -# firefoxVersion = (lib.importJSON "${src}/surfer.json").version.version; -# firefoxSrc = fetchurl { -# url = "mirror://mozilla/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.xz"; -# hash = "sha256-XAMbVywdpyZnfi/5e2rVp+OyM4em/DljORy1YvgKXkg="; -# }; { buildNpmPackage, buildPackages, @@ -170,13 +153,13 @@ in buildStdenv.mkDerivation (finalAttrs: { pname = "zen-browser-unwrapped"; - version = "1.0.1-t.20"; + version = "1.0.2-b.0"; src = fetchFromGitHub { owner = "zen-browser"; repo = "desktop"; - rev = "113a349b56e039a9a98e53a29f38b70c3a6a3ff6"; - hash = "sha256-XBncRNX28hiq953yr7j6seD/HLluzmqbtTncE6fDa30="; + rev = "df4ea8794f957c8e409adef9b2c3325be710c626"; + hash = "sha256-vPe/hTJozJdCbq5GK87MGBh+Nybs8et+6ukm0Fdz3uA="; fetchSubmodules = true; }; @@ -186,10 +169,10 @@ in # The Firefox version is specified by `zen-browser` in the `surfer.json` file. # # We need to manually set the version here to avoid IFD. - firefoxVersion = "132.0.2"; + firefoxVersion = "133.0.3"; firefoxSrc = fetchurl { url = "mirror://mozilla/firefox/releases/${finalAttrs.firefoxVersion}/source/firefox-${finalAttrs.firefoxVersion}.source.tar.xz"; - hash = "sha256-Mp4XZPS04T8R3PH9ezxtj4DlEui37Vv2X75EdJwmEOk="; + hash = "sha256-8TSlQgIAuwOrRg+dKGdQfA7bIiznP69AZM2+oCoKyhs="; }; SURFER_COMPAT = generic; @@ -305,8 +288,6 @@ in "--with-wasi-sysroot=${wasiSysRoot}" "--host=${buildStdenv.buildPlatform.config}" "--target=${buildStdenv.hostPlatform.config}" - ] - ++ [ (lib.enableFeature alsaSupport "alsa") (lib.enableFeature ffmpegSupport "ffmpeg") (lib.enableFeature geolocationSupport "necko-wifi") @@ -320,13 +301,39 @@ in # of RAM, and the 32-bit memory space cannot handle that linking (lib.enableFeature (!debugBuild && !stdenv.hostPlatform.is32bit) "release") (lib.enableFeature enableDebugSymbols "debug-symbols") - ]; + ] + ++ lib.optional stdenv.hostPlatform.isAarch "--disable-wasm-avx"; - configureScript = writeShellScript "configureMozconfig" '' - for flag in $@; do - echo "ac_add_options $flag" >> mozconfig - done - ''; + configureScript = writeShellScript "configureMozconfig" ( + (lib.optionalString stdenv.hostPlatform.isAarch '' + echo "ac_add_options --with-libclang-path=/usr/lib64" >> ./configs/linux/mozconfig + + # linux mozconfig + sed -i 's/x86-\(64\|64-v3\)/native/g' ./configs/linux/mozconfig + sed -i 's/x86_64-pc-linux/aarch64-linux-gnu/g' ./configs/linux/mozconfig + + # eme/widevine must be disabled on arm64 (thx google) + sed -i '/--enable-eme/s/^/# /' ./configs/common/mozconfig + sed -i 's/-msse3//g' ./configs/linux/mozconfig + sed -i 's/-mssse3//g' ./configs/linux/mozconfig + sed -i 's/-msse4.1//g' ./configs/linux/mozconfig + sed -i 's/-msse4.2//g' ./configs/linux/mozconfig + sed -i 's/-mavx2//g' ./configs/linux/mozconfig + sed -i 's/-mavx//g' ./configs/linux/mozconfig + sed -i 's/-mfma//g' ./configs/linux/mozconfig + sed -i 's/-maes//g' ./configs/linux/mozconfig + sed -i 's/-mpopcnt//g' ./configs/linux/mozconfig + sed -i 's/-mpclmul//g' ./configs/linux/mozconfig + sed -i 's/+avx2//g' ./configs/linux/mozconfig + sed -i 's/+sse4.1//g' ./configs/linux/mozconfig + + '') + + '' + for flag in $@; do + echo "ac_add_options $flag" >> mozconfig + done + '' + ); # To the person reading this wondering what is going on here, this is what # happens when a build process relies on Git. Normally you would use `fetchgit` @@ -339,22 +346,9 @@ in export HOME="$TMPDIR" git config --global user.email "nixbld@localhost" git config --global user.name "nixbld" - - # Initialize git repo and handle submodules properly git init - git config --global init.defaultBranch main - - # Force add all files including submodules - git add -A -f - - # Initialize and update submodules if they exist - if [ -f .gitmodules ]; then - git submodule init - git submodule update --init --recursive - fi - - # Commit all changes including submodule state - git commit -m 'nixpkgs' -a --allow-empty + git add --all + git commit -m 'nixpkgs' export LLVM_PROFDATA=llvm-profdata export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system @@ -362,7 +356,7 @@ in export WASM_CXX=${wasi32.stdenv.cc}/bin/${wasi32.stdenv.cc.targetPrefix}c++ export ZEN_RELEASE=1 - surfer ci --brand alpha --display-version ${finalAttrs.version} + surfer ci --brand beta --display-version ${finalAttrs.version} install -D ${finalAttrs.firefoxSrc} .surfer/engine/firefox-${finalAttrs.firefoxVersion}.source.tar.xz surfer download @@ -408,7 +402,10 @@ in matthewpi titaniumtown ]; - platforms = ["x86_64-linux"]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; enableParallelBuilding = true; diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index 385f8a4..4bd083f 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -28,7 +28,6 @@ hardware.audio.enable = true; hardware.nvidia.enable = true; hardware.keyboard.qmk.enable = true; - programs.nix-ld.enable = true; programs.steam.enable = true; @@ -94,7 +93,6 @@ time.timeZone = "America/Detroit"; environment.systemPackages = [ - pkgs.BeatSaberModManager pkgs.sbctl pkgs.vesktop pkgs.mangohud