From 624c5100fdd82c3354b253b0665cf211df03aeef Mon Sep 17 00:00:00 2001 From: pupbrained Date: Thu, 13 Jun 2024 23:47:00 -0400 Subject: [PATCH] bleghh --- .gitignore | 1 + flake.in.nix | 44 +- flake.lock | 841 +++++------------- flake.nix | 1 - homes/x86_64-linux/marshall@navis/default.nix | 4 + modules/home/hyprland/default.nix | 24 +- modules/home/shell/default.nix | 2 +- modules/home/shell/wezterm.lua | 136 +++ modules/home/shell/wezterm.nix | 111 +-- systems/x86_64-linux/navis/default.nix | 68 +- 10 files changed, 432 insertions(+), 800 deletions(-) create mode 100644 modules/home/shell/wezterm.lua diff --git a/.gitignore b/.gitignore index 7b869ae..914eff4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .direnv/ +.luarc.json home.nix sys.nix diff --git a/flake.in.nix b/flake.in.nix index fe952ed..67b29a6 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -31,7 +31,6 @@ nix-super = mkCustomUrl "git+https://git.privatevoid.net/max/nix-super.git"; nixvim = mkInput "pupbrained/nixvim"; schizofox = mkInput "schizofox/schizofox"; - sops-nix = mkInput "Mic92/sops-nix"; treefmt-nix = mkInput "numtide/treefmt-nix"; home-manager = mkFollowingNixpkgs "nix-community/home-manager"; @@ -51,6 +50,7 @@ formatter.${system} = treefmt-nix.lib.mkWrapper pkgs { projectRootFile = "flake.nix"; + programs = { alejandra.enable = true; deadnix.enable = true; @@ -60,42 +60,8 @@ overlays = [ snowfall-flake.overlays.default - (_final: prev: { + (_final: _prev: { nixSuper = nix-super.packages.${system}.default; - - ccacheWrapper = prev.ccacheWrapper.override { - extraConfig = '' - export CCACHE_COMPRESS=1 - export CCACHE_DIR="${config.programs.ccache.cacheDir}" - export CCACHE_UMASK=007 - if [ ! -d "$CCACHE_DIR" ]; then - echo "=====" - echo "Directory '$CCACHE_DIR' does not exist" - echo "Please create it with:" - echo " sudo mkdir -m0770 '$CCACHE_DIR'" - echo " sudo chown root:nixbld '$CCACHE_DIR'" - echo "=====" - exit 1 - fi - if [ ! -w "$CCACHE_DIR" ]; then - echo "=====" - echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)" - echo "Please verify its access permissions" - echo "=====" - exit 1 - fi - ''; - }; - - picom = prev.picom.overrideAttrs { - src = prev.fetchFromGitHub { - owner = "yshui"; - repo = "picom"; - rev = "94faacbd4ac917cca5abac3ac5c539f5fe1dc61d"; - hash = "sha256-KfMy8lV3FMS+AWDozlpPRkXX1eZCWsj39Y5T8q+c9Bs="; - fetchSubmodules = true; - }; - }; }) ]; @@ -131,11 +97,7 @@ git nvfetcher statix - (writeScriptBin "build" '' - nix fmt - nh os switch . -- --impure - nh home switch - '') + (writeScriptBin "build" "nix fmt && nh os switch . -- --impure && nh home switch") (writeScriptBin "up" "nix flake update") ]; }; diff --git a/flake.lock b/flake.lock index e6b3156..e22cab0 100644 --- a/flake.lock +++ b/flake.lock @@ -21,39 +21,6 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": [ - "chaotic", - "crane" - ], - "flake-compat": [ - "chaotic", - "flake-compat" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", - "revCount": 197, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.197%2Brev-4dbdbee45728d8ce5788db6461aaaa89d98081f0/018e8bce-1229-7d78-a052-5121272f0341/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz" - } - }, "base16-schemes": { "flake": false, "locked": { @@ -72,11 +39,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1716884128, - "narHash": "sha256-hzTzcX/qIGf93WVvk2jlLL3N7IgIlWylOBQkgwfTq8w=", + "lastModified": 1718178283, + "narHash": "sha256-Syt2bvPvzcdx+VQEXckhfLw96Q2yY++vw0wHQK1NkhQ=", "owner": "catppuccin", "repo": "nix", - "rev": "296adaf9331cd2c1eb479a25d5207508fbd06188", + "rev": "d34a94a17c6ec4a0c4e24b3e4336ea504d021f6d", "type": "github" }, "original": { @@ -87,29 +54,20 @@ }, "chaotic": { "inputs": { - "attic": "attic", "compare-to": "compare-to", - "conduit": "conduit", - "crane": "crane", - "fenix": "fenix", - "flake-compat": "flake-compat", "flake-schemas": "flake-schemas", - "flake-utils": "flake-utils", "home-manager": "home-manager_2", "jovian": "jovian", - "jujutsu": "jujutsu", - "niri": "niri", - "nix-filter": "nix-filter", "nixpkgs": "nixpkgs_2", "systems": "systems_2", "yafas": "yafas" }, "locked": { - "lastModified": 1716816472, - "narHash": "sha256-u+Ub8IHGEIxj0gwpCXds4cWIc+hkTlRBL9RCBY/daNA=", + "lastModified": 1718291710, + "narHash": "sha256-yp3pQStGFCd0qSAULA7RaI9evMRZHPuN4dUuNNOhH80=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a6f43e450d97eece8757e6cb6136f4cd4f141a3b", + "rev": "edbd85ef842fad14b8fe26cad2067868674dcf8d", "type": "github" }, "original": { @@ -121,7 +79,7 @@ }, "codeium": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -152,92 +110,7 @@ "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" } }, - "complement": { - "flake": false, - "locked": { - "lastModified": 1715700731, - "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", - "owner": "matrix-org", - "repo": "complement", - "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "conduit": { - "inputs": { - "attic": [ - "chaotic", - "attic" - ], - "complement": "complement", - "crane": [ - "chaotic", - "crane" - ], - "fenix": [ - "chaotic", - "fenix" - ], - "flake-compat": [ - "chaotic", - "flake-compat" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "liburing": "liburing", - "nix-filter": [ - "chaotic", - "nix-filter" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1716800097, - "narHash": "sha256-A8AXq7GqwLNOwCP6UyHzrusf2he6IYlD363/SrBKgts=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "6ccf578437a42cf8f32a454ca99b78df23cfa4dc", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, "crane": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716745752, - "narHash": "sha256-8K1R9Yg4r08rYk86Yq+lu3E9L3uRUb4xMqYHgl0VGS0=", - "rev": "19ca94ec2d288de334ae932107816b4a97736cd8", - "revCount": 575, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.17.2/018fb607-1f2c-764b-bd8d-5ea0dd2a7665/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "schizofox", @@ -283,7 +156,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixvim", "nixvim", @@ -291,11 +164,11 @@ ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -304,43 +177,7 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1714544767, - "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", - "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", - "revCount": 1852, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1852%2Brev-73124e1356bde9411b163d636b39fe4804b7ca45/018f333a-c195-795f-9e07-b43b47d5391f/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A.tar.gz" - } - }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -356,7 +193,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -370,6 +207,22 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_4": { "flake": false, "locked": { @@ -387,22 +240,6 @@ } }, "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -419,7 +256,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1650374568, @@ -435,7 +272,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1650374568, @@ -481,11 +318,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -502,11 +339,11 @@ ] }, "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": { @@ -533,21 +370,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-schemas": { "locked": { "lastModified": 1693491534, @@ -563,28 +385,23 @@ } }, "flake-utils": { - "inputs": { - "systems": [ - "chaotic", - "systems" - ] - }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "revCount": 92, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.92%2Brev-b1d9ab70662946ef0850d488da1c9019f3a9752a/018e2ca5-e5a2-7f80-9261-445a8cecd4d7/source.tar.gz" + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/numtide/flake-utils/0.1.%2A.tar.gz" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_5" }, "locked": { "lastModified": 1715533576, @@ -603,7 +420,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_7" + "flake-utils": "flake-utils_6" }, "locked": { "lastModified": 1715533576, @@ -621,21 +438,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_5" }, @@ -653,7 +455,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { "systems": "systems_6" }, @@ -671,7 +473,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": "systems_7" }, @@ -689,7 +491,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -704,7 +506,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { "systems": "systems_9" }, @@ -740,12 +542,41 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ "nixvim", "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -777,11 +608,11 @@ ] }, "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -819,11 +650,11 @@ ] }, "locked": { - "lastModified": 1716736760, - "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { @@ -839,11 +670,11 @@ ] }, "locked": { - "lastModified": 1716847642, - "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { @@ -861,11 +692,11 @@ ] }, "locked": { - "lastModified": 1716448020, - "narHash": "sha256-u1ddoBOILtLVX4NYzqSZ9Qaqusql1M4reLd1fs554hY=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "25dedb0d52c20448f6a63cc346df1adbd6ef417e", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -882,11 +713,11 @@ ] }, "locked": { - "lastModified": 1712759992, - "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", + "lastModified": 1717097707, + "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", + "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "type": "github" }, "original": { @@ -911,11 +742,11 @@ ] }, "locked": { - "lastModified": 1716576411, - "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "type": "github" }, "original": { @@ -928,17 +759,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1716842732, - "narHash": "sha256-b80p4J7OSp9LslyJimj2a4wCCNLdjJL3bIgGt+f9Gz4=", + "lastModified": 1718313803, + "narHash": "sha256-xyptaxC172FB/m4fSCSEYaCVYp6e8IWLDHvDLiSuu6M=", "ref": "refs/heads/main", - "rev": "722d537a91a9beacf9c12fc1317ff1fbe10ffac5", - "revCount": 4747, + "rev": "8055b1c00a102f5419e40f5eddfb6ee8be693f33", + "revCount": 4822, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -954,6 +786,11 @@ "hyprland": [ "hyprland" ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], "systems": [ "hyprland-plugins", "hyprland", @@ -961,11 +798,11 @@ ] }, "locked": { - "lastModified": 1715722806, - "narHash": "sha256-KrSLG2H3KGELxTFdiBhv8U6D53Q3UsJsQO+KgEabsNA=", + "lastModified": 1718111105, + "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "c28d1011f4868c1a1ee80b10d9ee79900686df82", + "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", "type": "github" }, "original": { @@ -1003,6 +840,10 @@ }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1013,11 +854,11 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -1026,6 +867,31 @@ "type": "github" } }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881334, + "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -1038,11 +904,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1717784906, + "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "type": "github" }, "original": { @@ -1053,11 +919,11 @@ }, "impermanence": { "locked": { - "lastModified": 1708968331, - "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", + "lastModified": 1717932370, + "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=", "owner": "nix-community", "repo": "impermanence", - "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", + "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f", "type": "github" }, "original": { @@ -1075,11 +941,11 @@ ] }, "locked": { - "lastModified": 1716618639, - "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=", + "lastModified": 1718173451, + "narHash": "sha256-ySzjpSDAmecKsoSqgqjKfEsgzRMiI87pLLJgY8haP+s=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38", + "rev": "326c1ab2b816f520d298b7a4319a0b50cde01c48", "type": "github" }, "original": { @@ -1088,32 +954,6 @@ "type": "github" } }, - "jujutsu": { - "inputs": { - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1716773713, - "narHash": "sha256-++tmVuLwprXWSSq9AmfcZ4MjorMueuO5ThwuTzhp5SE=", - "owner": "martinvonz", - "repo": "jj", - "rev": "a075a5c6cabd493759fc973d99d3fd88feb74735", - "type": "github" - }, - "original": { - "owner": "martinvonz", - "repo": "jj", - "type": "github" - } - }, "libgit2": { "flake": false, "locked": { @@ -1130,60 +970,6 @@ "type": "github" } }, - "liburing": { - "flake": false, - "locked": { - "lastModified": 1716565485, - "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", - "owner": "axboe", - "repo": "liburing", - "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", - "type": "github" - }, - "original": { - "owner": "axboe", - "ref": "master", - "repo": "liburing", - "type": "github" - } - }, - "niri": { - "inputs": { - "crane": [ - "chaotic", - "crane" - ], - "fenix": [ - "chaotic", - "fenix" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nix-filter": [ - "chaotic", - "nix-filter" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716744562, - "narHash": "sha256-th1cXNfqbNstk6LNC2siouLQP5N4Ur69iV3idlKj8iE=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "ae7fb4c4f405aa0ff49930040d414581a812d938", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -1212,11 +998,11 @@ ] }, "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -1225,21 +1011,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1270,11 +1041,11 @@ ] }, "locked": { - "lastModified": 1716772633, - "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", + "lastModified": 1718011381, + "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", + "rev": "88ad3d7501e22b2401dd72734b032b7baa794434", "type": "github" }, "original": { @@ -1285,7 +1056,7 @@ }, "nix-super": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "libgit2": "libgit2", "nixpkgs": "nixpkgs_4", @@ -1319,11 +1090,11 @@ ] }, "locked": { - "lastModified": 1709985524, - "narHash": "sha256-29ZwMJBErP41ZPis1MskhdheDRgt+reDuf53jONSkc8=", + "lastModified": 1717036060, + "narHash": "sha256-Bm1pBy1goxIz9PD0PRJ9ZgQzl7MQOQ6n5IB4wLNdXrA=", "owner": "nixpak", "repo": "nixpak", - "rev": "b0862a125da8fe5d179633d6cc7aed57d5316871", + "rev": "3a68b5453f75b1c8e5d31859a654e061a57dc059", "type": "github" }, "original": { @@ -1397,45 +1168,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_10": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -1446,22 +1185,6 @@ } }, "nixpkgs_11": { - "locked": { - "lastModified": 1716651315, - "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -1479,25 +1202,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", - "revCount": 630835, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.630835%2Brev-bfb7a882678e518398ce9a31a881538679f6f092/018fafb0-ec0d-7254-8082-b09ecc86e5fc/source.tar.gz" + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -1525,11 +1250,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -1557,11 +1282,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716626504, - "narHash": "sha256-/+8auPmHkvTzPVZz8IJDFd4IdatQQ/me+QW8LXsOWFc=", + "lastModified": 1717956656, + "narHash": "sha256-hUURs/cju8hV5B6Wzs+/u1RFZo7HR6IdnxikLbyhhRA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d091b7f681e8e5c21947e5de45b7f397a57011ae", + "rev": "e27c2cf0b43e406089d284ceb85a9e2fd88e8e8c", "type": "github" }, "original": { @@ -1572,11 +1297,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -1605,17 +1330,17 @@ "nixvim": { "inputs": { "codeium": "codeium", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_7", "nixvim": "nixvim_2", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716650528, - "narHash": "sha256-+sfNAVyDkA94fGJkofcy4uBbrr3lmFqhY/QBX5ggki8=", + "lastModified": 1718329709, + "narHash": "sha256-o83NYWJOyPmrcdBhU6rzNQeIa1tvuIeWLaZooAHyM2w=", "owner": "pupbrained", "repo": "nixvim", - "rev": "47b77b1d918e746a2cd02fa98c70ea13be8f170b", + "rev": "65d99106bb8c124358106dfda09ce5b588f6499a", "type": "github" }, "original": { @@ -1627,21 +1352,20 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "flake-root": "flake-root", + "git-hooks": "git-hooks", "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_8", - "pre-commit-hooks": "pre-commit-hooks_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716566815, - "narHash": "sha256-WO3MF4W1SrSD0lanU1n7dfuHizeSLfDHJNEir9exlcM=", + "lastModified": 1717922156, + "narHash": "sha256-C/TgTnKY4iWXnBmKocV9KeV+OtZGCh+1Pcw26Elx7JM=", "owner": "nix-community", "repo": "nixvim", - "rev": "9d858de2e9ab136d1c53d92af62fed8fccf492ab", + "rev": "8a462dc9570bce1de5a7dd1beabd83f95958315b", "type": "github" }, "original": { @@ -1655,7 +1379,7 @@ "flake-compat": [ "nix-super" ], - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "gitignore": [ "nix-super" ], @@ -1682,52 +1406,6 @@ "type": "github" } }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1716773462, - "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.2.1", - "repo": "rocksdb", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -1746,57 +1424,12 @@ "schizofox": "schizofox", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_2", - "sops-nix": "sops-nix", "treefmt-nix": "treefmt-nix_3" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1714501997, - "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "chaotic", - "jujutsu", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "jujutsu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714961776, - "narHash": "sha256-LiIxWRKbm1DZ+7l1a6FMmIO8leQx5yrRLIApCMai1DY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f3b20ea4131408ea585bddb1f41f91c4de9499cf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "schizofox": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_3", "home-manager": "home-manager_5", "nixpak": "nixpak", @@ -1805,11 +1438,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1714677453, - "narHash": "sha256-MlkAYTZz5/bFJgNIewbJa8mbtoVqg6Pq7t8A5Z1wVvc=", + "lastModified": 1717289290, + "narHash": "sha256-NS2WFE2mEodtPATQIC16N0ylWnog8B0IownZWnM9JPE=", "owner": "schizofox", "repo": "schizofox", - "rev": "9c7263441064d0e3e4c94e1d8dbd8d260d00408d", + "rev": "04e204d8f605a45e2537343a5e467d5af0518eef", "type": "github" }, "original": { @@ -1820,7 +1453,7 @@ }, "searx-randomizer": { "inputs": { - "crane": "crane_2", + "crane": "crane", "flake-parts": "flake-parts_4", "nixpkgs": [ "schizofox", @@ -1843,7 +1476,7 @@ }, "snowfall-flake": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ], @@ -1865,7 +1498,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "snowfall-flake", @@ -1889,18 +1522,18 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1716563019, - "narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=", + "lastModified": 1717625599, + "narHash": "sha256-qX9VJizFEoiRWDEiVs5+2w4FclQNQVVPvGPESsZ1F8k=", "owner": "snowfallorg", "repo": "lib", - "rev": "727d634555bc6749c19cce1ac63d56b6400c82ed", + "rev": "5a10d2e37b6c6223763fa7c00b974875e49f93cc", "type": "github" }, "original": { @@ -1910,25 +1543,6 @@ "type": "github" } }, - "sops-nix": { - "inputs": { - "nixpkgs": "nixpkgs_11", - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -2073,11 +1687,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "type": "github" }, "original": { @@ -2091,11 +1705,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "type": "github" }, "original": { @@ -2106,14 +1720,14 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1718271476, + "narHash": "sha256-35hUMmFesmchb+u7heKHLG5B6c8fBOcSYo0jj0CHLes=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "e75ba0a6bb562d2ce275db28f6a36a2e4fd81391", "type": "github" }, "original": { @@ -2139,11 +1753,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1717918856, + "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "72907822c19afc0983c69d59d299204381623725", "type": "github" }, "original": { @@ -2166,14 +1780,15 @@ "locked": { "lastModified": 1695926485, "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", + "owner": "UbiqueLambda", + "repo": "yafas", "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", - "revCount": 4, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/UbiqueLambda/yafas/0.1.4%2Brev-7772afd6686458ca0ddbc599a52cf5d337367653/018add18-ebb4-72c6-93fe-d1d8da361703/source.tar.gz" + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz" + "owner": "UbiqueLambda", + "repo": "yafas", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 0532243..981d0b5 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,6 @@ inputs.nixpkgs.follows = "nixpkgs"; url = "github:snowfallorg/lib/dev"; }; - sops-nix.url = "github:Mic92/sops-nix"; treefmt-nix.url = "github:numtide/treefmt-nix"; }; outputs = inputs: inputs.flakegen ./flake.in.nix inputs; diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 03fe13c..7d0abad 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -11,10 +11,12 @@ [ duf eternal-terminal + glow grc iamb jamesdsp jetbrains-toolbox + jdk21 killall libnotify lm_sensors @@ -22,10 +24,12 @@ mpv playerctl prismlauncher + slack telegram-desktop vesktop youki jetbrains.clion + jetbrains.idea-ultimate ] ++ (with inputs; [ nixvim.packages.${pkgs.system}.default diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 53b8f49..39983ae 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -59,12 +59,21 @@ in ]; modules-right = [ + "mpris" "network" "custom/notification" "tray" "clock" ]; + "mpris" = { + format = "{player_icon} {title} - {artist}"; + format-paused = "{status_icon} {title} - {artist}"; + player-icons.default = "󰝚"; + status-icons.paused = "󰏤"; + max-length = 40; + }; + "hyprland/workspaces" = { format = "{name}"; format-icons = { @@ -72,8 +81,8 @@ in active = " "; urgent = " "; }; - on-scroll-up = "hyprctl dispatch workspace e+1"; - on-scroll-down = "hyprctl dispatch workspace e-1"; + on-scroll-up = "hyprctl dispatch workspace e-1"; + on-scroll-down = "hyprctl dispatch workspace e+1"; }; "clock" = { @@ -84,9 +93,11 @@ in "hyprland/window" = { max-length = 22; - separate-outputs = false; rewrite = { "" = "Desktop"; + "(.*) — Firefox Nightly" = "󰈹 $1"; + ".*?Discord \\| @?(.*)" = " $1"; + "WezTerm - (?:\\[.*] ?)?(.*)" = " $1"; }; }; @@ -275,7 +286,7 @@ in padding: 0px 30px 0px 15px; } - #network, #custom-notification, #tray { + #mpris, #network, #custom-notification, #tray { background: #${palette.base01}; border-radius: 10px 24px 10px 24px; color: #${palette.base05}; @@ -342,7 +353,10 @@ in decoration.rounding = 10; dwindle.preserve_split = true; gestures.workspace_swipe = true; - input.touchpad.natural_scroll = true; + input = { + sensitivity = -0.4; + touchpad.natural_scroll = true; + }; layerrule = [ "dimaround, rofi" diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index dba039c..28c8075 100644 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -2,8 +2,8 @@ imports = [ ./fish.nix ./git.nix - ./wezterm.nix ./macchina.nix + ./wezterm.nix ./nushell ]; diff --git a/modules/home/shell/wezterm.lua b/modules/home/shell/wezterm.lua new file mode 100644 index 0000000..53bd727 --- /dev/null +++ b/modules/home/shell/wezterm.lua @@ -0,0 +1,136 @@ +wezterm.on('user-var-changed', function(window, pane, name, value) + local overrides = window:get_config_overrides() or {} + if name == "ZEN_MODE" then + local incremental = value:find("+") + local number_value = tonumber(value) + if incremental ~= nil then + while (number_value > 0) do + window:perform_action(wezterm.action.IncreaseFontSize, pane) + number_value = number_value - 1 + end + overrides.enable_tab_bar = false + elseif number_value < 0 then + window:perform_action(wezterm.action.ResetFontSize, pane) + overrides.font_size = nil + overrides.enable_tab_bar = true + else + overrides.font_size = number_value + overrides.enable_tab_bar = false + end + end + window:set_config_overrides(overrides) +end) + +wezterm.on('format-window-title', function(tab, tabs) + local zoomed = "" + + if tab.active_pane.is_zoomed then + zoomed = '[Z] ' + end + + local index = "" + + if #tabs > 1 then + index = string.format('[%d/%d] ', tab.tab_index + 1, #tabs) + end + + return 'WezTerm - ' .. zoomed .. index .. tab.active_pane.title +end) + +local c = wezterm.config_builder() + +wezterm.plugin.require('https://github.com/nekowinston/wezterm-bar').apply_to_config(c, { + position = 'bottom', + max_width = 32, + dividers = 'slant_right', + indicator = { + leader = { + enabled = true, + off = ' ', + on = ' ', + }, + mode = { + enabled = true, + names = { + resize_mode = 'RESIZE', + copy_mode = 'VISUAL', + search_mode = 'SEARCH', + }, + }, + }, + tabs = { + numerals = 'arabic', + pane_count = 'subscript', + brackets = { + active = { "", ':' }, + inactive = { "", ':' }, + }, + }, + clock = { + enabled = true, + format = '%l:%M %p', + }, +}) + +local act = wezterm.action + +local keybinds = { + { + key = 'Enter', + mods = 'CTRL|SHIFT', + action = act.SplitHorizontal({ domain = 'CurrentPaneDomain' }), + }, + { + key = 'h', + mods = 'CTRL|SHIFT', + action = act.ActivatePaneDirection('Left'), + }, + { + key = 'l', + mods = 'CTRL|SHIFT', + action = act.ActivatePaneDirection 'Right', + }, + { + key = 'k', + mods = 'CTRL|SHIFT', + action = act.ActivatePaneDirection 'Up', + }, + { + key = 'j', + mods = 'CTRL|SHIFT', + action = act.ActivatePaneDirection 'Down', + }, + { + key = 't', + mods = 'CTRL|SHIFT', + action = act.SpawnCommandInNewTab { cwd = wezterm.home_dir }, + } +} + +local config = { + adjust_window_size_when_changing_font_size = false, + color_scheme = 'Catppuccin Mocha', + cursor_blink_ease_in = 'Constant', + cursor_blink_ease_out = 'Constant', + cursor_blink_rate = 500, + default_cursor_style = 'BlinkingBar', + enable_kitty_graphics = true, + enable_scroll_bar = false, + enable_wayland = false, + font_size = 12, + font = wezterm.font('Maple Mono NF'), + front_end = 'OpenGL', + initial_cols = 160, + keys = keybinds, + underline_position = -4, + use_fancy_tab_bar = false, + warn_about_missing_glyphs = false, + window_background_opacity = 0.8, + window_padding = { left = 0, right = 0, top = 0, bottom = 0 }, +} + +for k, v in pairs(config) do + c[k] = v +end + +return c diff --git a/modules/home/shell/wezterm.nix b/modules/home/shell/wezterm.nix index fe0d047..7e8ed97 100644 --- a/modules/home/shell/wezterm.nix +++ b/modules/home/shell/wezterm.nix @@ -1,115 +1,6 @@ {...}: { programs.wezterm = { enable = true; - extraConfig = '' - local wezterm = require('wezterm') - local c = wezterm.config_builder() - - local resize_amount = 3; - - local wezmodeConfig = { - theme = { - textColor = "white", - hintColor = "#a6e3a1", - normalModeColor = "#cba6f7", - modeTextColor = "#11111b", - } - } - - wezterm.plugin.require('https://github.com/nekowinston/wezterm-bar').apply_to_config(c, { - position = 'bottom', - max_width = 32, - dividers = 'slant_right', - indicator = { - leader = { - enabled = true, - off = ' ', - on = ' ', - }, - mode = { - enabled = true, - names = { - resize_mode = 'RESIZE', - copy_mode = 'VISUAL', - search_mode = 'SEARCH', - }, - }, - }, - tabs = { - numerals = 'arabic', - pane_count = 'subscript', - brackets = { - active = { "", ':' }, - inactive = { "", ':' }, - }, - }, - clock = { - enabled = true, - format = '%l:%M %p', - }, - }) - - local act = wezterm.action - - local keybinds = { - { - key = 'Enter', - mods = 'CTRL|SHIFT', - action = act.SplitHorizontal({ domain = 'CurrentPaneDomain' }), - }, - { - key = 'h', - mods = 'ALT|SHIFT', - action = act.ActivatePaneDirection('Left'), - }, - { - key = 'l', - mods = 'ALT|SHIFT', - action = act.ActivatePaneDirection 'Right', - }, - { - key = 'k', - mods = 'ALT|SHIFT', - action = act.ActivatePaneDirection 'Up', - }, - { - key = 'j', - mods = 'ALT|SHIFT', - action = act.ActivatePaneDirection 'Down', - }, - { - key = 't', - mods = 'CTRL|SHIFT', - action = act.SpawnCommandInNewTab { cwd = wezterm.home_dir }, - } - } - - local config = { - initial_cols = 160, - adjust_window_size_when_changing_font_size = false, - color_scheme = 'Catppuccin Mocha', - cursor_blink_ease_in = 'Constant', - cursor_blink_ease_out = 'Constant', - cursor_blink_rate = 500, - default_cursor_style = 'BlinkingBar', - enable_kitty_graphics = true, - enable_scroll_bar = false, - enable_wayland = false, - font_size = 12, - font = wezterm.font('Maple Mono NF'), - keys = keybinds, - front_end = 'OpenGL', - underline_position = -4, - use_fancy_tab_bar = false, - window_background_opacity = 0.8, - window_padding = { left = 0, right = 0, top = 0, bottom = 0 }, - } - - for k, v in pairs(config) do - c[k] = v - end - - return c - ''; + extraConfig = builtins.readFile ./wezterm.lua; }; } diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index e8f3c33..5b13c49 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -6,35 +6,39 @@ ... }: with lib // pkgs // inputs; { - imports = [ - ./hardware.nix - ]; + imports = [./hardware.nix]; security = { rtkit.enable = true; - pam.loginLimits = [ - { - domain = "*"; - item = "nofile"; - type = "-"; - value = "32768"; - } - { - domain = "*"; - item = "memlock"; - type = "-"; - value = "32768"; - } - ]; + pam = { + services.greetd.enableGnomeKeyring = true; - sudo.extraConfig = '' - Defaults lecture = never, pwfeedback - ''; + loginLimits = [ + { + domain = "*"; + item = "nofile"; + type = "-"; + value = "32768"; + } + { + domain = "*"; + item = "memlock"; + type = "-"; + value = "32768"; + } + ]; + }; + + sudo.wheelNeedsPassword = false; }; console.catppuccin.enable = true; + systemd.tmpfiles.rules = [ + "f /dev/shm/looking-glass 0660 marshall qemu-libvirtd -" + ]; + systemd.user.extraConfig = let path = lib.concatStringsSep ":" [ "/run/wrappers/bin" @@ -68,9 +72,14 @@ with lib // pkgs // inputs; { libvirtd = { enable = true; + + onBoot = "ignore"; + onShutdown = "shutdown"; + qemu = { package = qemu_kvm; swtpm.enable = true; + runAsRoot = false; ovmf.enable = true; ovmf.packages = [OVMFFull.fd]; }; @@ -86,17 +95,20 @@ with lib // pkgs // inputs; { environment = { sessionVariables = { BROWSER = "firefox-nightly"; - EDITOR = "nvim"; - TERMINAL = "wezterm"; DIRENV_WARN_TIMEOUT = "100s"; + EDITOR = "nvim"; + NIXOS_OZONE_WL = "1"; + TERMINAL = "wezterm"; }; systemPackages = [ agenix.packages.${system}.default gnome.nautilus internal.lightly-boehs-qt6 + looking-glass-client snowfallorg.flake sound-theme-freedesktop + virtio-win winetricks wineWowPackages.staging xclip @@ -106,12 +118,13 @@ with lib // pkgs // inputs; { persistence."/persist" = { hideMounts = true; directories = [ + "/etc/mullvad-vpn" "/etc/NetworkManager" "/etc/secrets" "/etc/ssh" - "/etc/mullvad-vpn" "/root/.ssh" "/var/lib/bluetooth" + "/var/lib/libvirt" "/var/lib/nixos" "/var/lib/systemd/coredump" ]; @@ -205,8 +218,6 @@ with lib // pkgs // inputs; { min-free = "${toString (5 * 1024 * 1024 * 1024)}"; max-free = "${toString (10 * 1024 * 1024 * 1024)}"; - extra-sandbox-paths = [config.programs.ccache.cacheDir]; - extra-experimental-features = [ "flakes" # flakes "nix-command" # experimental nix commands @@ -238,7 +249,6 @@ with lib // pkgs // inputs; { }; programs = { - ccache.enable = true; dconf.enable = true; fish.enable = true; gamemode.enable = true; @@ -253,8 +263,6 @@ with lib // pkgs // inputs; { nh = { enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 4d --keep 3"; flake = "/home/marshall/nix-config"; }; }; @@ -316,7 +324,7 @@ with lib // pkgs // inputs; { users.marshall = { isNormalUser = true; - extraGroups = ["wheel" "gamemode" "libvirtd" "networkmanager"]; + extraGroups = ["wheel" "gamemode" "libvirtd" "qemu-libvirtd" "disk" "networkmanager"]; shell = fish; hashedPasswordFile = config.age.secrets.passwd.path; }; @@ -352,5 +360,7 @@ with lib // pkgs // inputs; { }; }; + xdg.portal.enable = true; + system.stateVersion = "24.05"; }