diff --git a/flake.lock b/flake.lock index 960276c..5cd83df 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-hU9uZ4UrSrBntg9vhwQUzn7nC3UTeIV1iC5uprGhj+Y=", - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/ags", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/ags", "type": "path" }, "original": { - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/ags", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/ags", "type": "path" } }, @@ -140,14 +140,38 @@ "locked": { "lastModified": 1, "narHash": "sha256-FJjoGC78eG2j8FTz8sELu6Cujzec4OumAZqhHoTyRcw=", - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/bat", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/bat", "type": "path" }, "original": { - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/bat", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/bat", "type": "path" } }, + "devshell": { + "inputs": { + "nixpkgs": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "owner": "numtide", + "repo": "devshell", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "digital": { "flake": false, "locked": { @@ -169,11 +193,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-71q6+u+ztKLS1V8MHPbIYyENwCenJspceTrY4TbLLh0=", - "path": "/nix/store/qfvx4x0x7rs9wl3ncrxcnykbs3vw37qc-source/external", + "path": "/nix/store/m7b6b1k0v0njy6i5yf1q00pry3zlww82-source/external", "type": "path" }, "original": { - "path": "/nix/store/qfvx4x0x7rs9wl3ncrxcnykbs3vw37qc-source/external", + "path": "/nix/store/m7b6b1k0v0njy6i5yf1q00pry3zlww82-source/external", "type": "path" } }, @@ -196,15 +220,29 @@ "locked": { "lastModified": 1, "narHash": "sha256-k5AmFL4QVNTziCDiw5UBRMQn1JYpCsawHCtn95t9rYw=", - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/eza", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/eza", "type": "path" }, "original": { - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/eza", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/eza", "type": "path" } }, "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -220,18 +258,142 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fzf": { "locked": { "lastModified": 1, "narHash": "sha256-GbjneK0hMLwVcIwri+7tIHPP6dI4IgQW2YsGxlbyPmc=", - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/fzf", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/fzf", "type": "path" }, "original": { - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/fzf", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/fzf", "type": "path" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727805723, + "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -253,6 +415,30 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -336,11 +522,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-PoIwfLB8FwRvchRfLuR5Zt1Xez/G35ivu7y3ne4BrVo=", - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/hyprland", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/hyprland", "type": "path" }, "original": { - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/hyprland", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/hyprland", "type": "path" } }, @@ -485,11 +671,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1727860939, - "narHash": "sha256-ZRYHQ/ZduCPxthuCFDYSDjKoSReYZy95rSm6ut8l/qE=", + "lastModified": 1727900725, + "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=", "ref": "refs/heads/main", - "rev": "e2426942e5716a742ea353d2a1de7d7760fbbb41", - "revCount": 5286, + "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2", + "revCount": 5287, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -523,16 +709,16 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_8", - "systems": "systems_3", + "nixpkgs": "nixpkgs_10", + "systems": "systems_4", "xdph": "xdph_2" }, "locked": { - "lastModified": 1727860939, - "narHash": "sha256-ZRYHQ/ZduCPxthuCFDYSDjKoSReYZy95rSm6ut8l/qE=", + "lastModified": 1727900725, + "narHash": "sha256-yS4oC5G/FKrsrRjk03cGzTEXHAwfjP7azFHoKvlFfD8=", "ref": "refs/heads/main", - "rev": "e2426942e5716a742ea353d2a1de7d7760fbbb41", - "revCount": 5286, + "rev": "de68e065fe861d7ca01eca267df4c305bc6e73c2", + "revCount": 5287, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -747,11 +933,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-GzevfSGVuMyFSa9mgoxCUGDNY7hzocMkXS+BIEC/1iw=", - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/kitty", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/kitty", "type": "path" }, "original": { - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/kitty", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/kitty", "type": "path" } }, @@ -775,25 +961,37 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-d88FyZ+mMPLSr4SKuqnZQcwOsYSqnU+/vWCLh6yk+kQ=", - "path": "/nix/store/ln10g9parrikdk4nnp52wnwmz5z799qn-source/home", + "narHash": "sha256-OsaVnAjd0RdNQZtDLwTMLcCsL0fHJlAfhuTpIG52tUM=", + "path": "/nix/store/d35alzzh9xlsq1rvl5r2sqvvhaf0hjng-source/home", "type": "path" }, "original": { - "path": "/nix/store/ln10g9parrikdk4nnp52wnwmz5z799qn-source/home", + "path": "/nix/store/d35alzzh9xlsq1rvl5r2sqvvhaf0hjng-source/home", "type": "path" } }, - "neovim": { + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1, - "narHash": "sha256-tvSCDDUIW6BkzWSel1NV1dEKNplJHNBvMTkpWNSAO6I=", - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/neovim", - "type": "path" + "lastModified": 1727707210, + "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", + "type": "github" }, "original": { - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/neovim", - "type": "path" + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" } }, "nixpkgs": { @@ -812,6 +1010,18 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, "nixpkgs-old": { "locked": { "lastModified": 1720535198, @@ -860,6 +1070,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1725634671, @@ -894,15 +1120,15 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -910,15 +1136,15 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", - "owner": "nixos", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -934,17 +1160,49 @@ "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_7": { + "locked": { + "lastModified": 1727672256, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1727672256, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 0, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", - "path": "/nix/store/mvz96grv31nxq69ldw5a5pn2qh1s6ca6-source", + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "path": "/nix/store/s9hbmmf7hgg7imnm5q6ny7gznbh0amfy-source", "type": "path" }, "original": { @@ -952,19 +1210,71 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixvim": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_4", + "nixvim": "nixvim_2" + }, "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "lastModified": 1, + "narHash": "sha256-z7+Wa2JaaJyyGCiiEE6Ta5m7f98ZWVRQ6HV+Seu2tEM=", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/nixvim", + "type": "path" + }, + "original": { + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/nixvim", + "type": "path" + } + }, + "nixvim_2": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_5", + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1727871072, + "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727599661, + "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", + "owner": "NuschtOS", + "repo": "search", + "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", "type": "github" } }, @@ -989,12 +1299,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-0dUQI6QYiZgvK+mil2a6Y3ARdHAfuVI3muoGadpwd9I=", - "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/packages", + "narHash": "sha256-c/j1wAoDhJC3sxfp1mX1p3FfQdksPp20wnRXQPxwT+g=", + "path": "/nix/store/v77lyg83sn9mhjnagzc8qbf3yc5gpx9y-source/packages", "type": "path" }, "original": { - "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/packages", + "path": "/nix/store/v77lyg83sn9mhjnagzc8qbf3yc5gpx9y-source/packages", "type": "path" } }, @@ -1005,11 +1315,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", - "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/packages", + "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/packages", "type": "path" }, "original": { - "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/packages", + "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/packages", "type": "path" } }, @@ -1017,19 +1327,19 @@ "inputs": { "ags": "ags", "hyprland": "hyprland", - "neovim": "neovim", + "nixvim": "nixvim", "pywal": "pywal", "rofi": "rofi", "terminal": "terminal" }, "locked": { "lastModified": 1, - "narHash": "sha256-9/J/KnEYKUFv2/3L2asbZWMG1oB5Ya2Svt+CwL6iEAs=", - "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/programs", + "narHash": "sha256-lIWkTRmFS1h/L9rM+lZX/AHv/aET4tw8GExvv6EEh5I=", + "path": "/nix/store/v77lyg83sn9mhjnagzc8qbf3yc5gpx9y-source/programs", "type": "path" }, "original": { - "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/programs", + "path": "/nix/store/v77lyg83sn9mhjnagzc8qbf3yc5gpx9y-source/programs", "type": "path" } }, @@ -1041,11 +1351,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-96Dpr1ejZUBA7m2x2YfNJJxwDRj7Z8r5QV4UrGGxdoU=", - "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/programs", + "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/programs", "type": "path" }, "original": { - "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/programs", + "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/programs", "type": "path" } }, @@ -1059,11 +1369,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-EVhBDAt1miiP7BA3SooJNTCm0pESsl4VlRYCDSMutFY=", - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/pywal", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/pywal", "type": "path" }, "original": { - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/pywal", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/pywal", "type": "path" } }, @@ -1087,11 +1397,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-W1pO/5h94bemSfBkgwMcjnRJAySAtzd5RMTWKcmLkOI=", - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/rofi", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/rofi", "type": "path" }, "original": { - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/rofi", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/rofi", "type": "path" } }, @@ -1099,19 +1409,19 @@ "inputs": { "home-manager": "home-manager", "nathan": "nathan", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "system": "system" } }, "scripts": { "locked": { "lastModified": 1, - "narHash": "sha256-xIJ15kilsIIsZ52uO6hZA9MeT9ypeJLTtWCwUf0WIQQ=", - "path": "/nix/store/qfvx4x0x7rs9wl3ncrxcnykbs3vw37qc-source/scripts", + "narHash": "sha256-3gz8CcgRRpjmlapraNgn6or9kWsnw7VwAI1P7mjhQWo=", + "path": "/nix/store/m7b6b1k0v0njy6i5yf1q00pry3zlww82-source/scripts", "type": "path" }, "original": { - "path": "/nix/store/qfvx4x0x7rs9wl3ncrxcnykbs3vw37qc-source/scripts", + "path": "/nix/store/m7b6b1k0v0njy6i5yf1q00pry3zlww82-source/scripts", "type": "path" } }, @@ -1122,11 +1432,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-1lPCRKFKK2qmdS+akk6dkrSjXOBe0iBgQp6oTi5vCWM=", - "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/sddm", + "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/sddm", "type": "path" }, "original": { - "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/sddm", + "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/sddm", "type": "path" } }, @@ -1148,15 +1458,15 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_4" + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1727842659, - "narHash": "sha256-2m5hx16ayKSvRFQyHDfRXMWVZDyDpI3DMwr7ujf+3tg=", + "lastModified": 1727929035, + "narHash": "sha256-buGueZsmGX/TKzSIO8alIK4QWcm0ciZ6j6veO1nxVKM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "3e033244348288c6995b155a493a229e499a7c4f", + "rev": "829a81049fb019d12be8daf867c03de2ee52d49f", "type": "github" }, "original": { @@ -1172,11 +1482,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-cuHsChgkjeeNyQiP8xebtVcqixs7dJLV59Q9BKIVXqI=", - "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/services", + "path": "/nix/store/v77lyg83sn9mhjnagzc8qbf3yc5gpx9y-source/services", "type": "path" }, "original": { - "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/services", + "path": "/nix/store/v77lyg83sn9mhjnagzc8qbf3yc5gpx9y-source/services", "type": "path" } }, @@ -1187,11 +1497,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-77xH7oSwHTKWMPseY3d8isc0oV0SgNM+CdrIxhRBOzQ=", - "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/services", + "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/services", "type": "path" }, "original": { - "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/services", + "path": "/nix/store/gxkrkn7r20lrk4liwnmi8kgs4zfp0l4j-source/services", "type": "path" } }, @@ -1204,12 +1514,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-/5EJj/nu2LEpI9O8HsT8OkbsEZoTwrX53bF/y71ijcI=", - "path": "/nix/store/ln10g9parrikdk4nnp52wnwmz5z799qn-source/system", + "narHash": "sha256-M8gn3JNWaujqDckXceQofrr/295Qt2puwAcxkR7p3DI=", + "path": "/nix/store/d35alzzh9xlsq1rvl5r2sqvvhaf0hjng-source/system", "type": "path" }, "original": { - "path": "/nix/store/ln10g9parrikdk4nnp52wnwmz5z799qn-source/system", + "path": "/nix/store/d35alzzh9xlsq1rvl5r2sqvvhaf0hjng-source/system", "type": "path" } }, @@ -1244,6 +1554,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1270,12 +1595,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-/6PqjAXsf3oJokNYPJJpE7izbi8E5y1Vmu7GJewdep0=", - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/terminal", + "narHash": "sha256-2h0M0hXa3L6rQJ2hmDadiZBYJcoxRqFdlXD7tK0LFrM=", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/terminal", "type": "path" }, "original": { - "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/terminal", + "path": "/nix/store/h730mcqnqwjlpl3hrwdqrfyq26k9m5k1-source/terminal", "type": "path" } }, @@ -1296,7 +1621,7 @@ }, "themecord": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1723741990, @@ -1316,17 +1641,41 @@ "locked": { "lastModified": 1, "narHash": "sha256-vkwha2aJoI69KMpfc6msyrBqJ1oy+Rhsq+Cja2A7Fzw=", - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/tmux", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/tmux", "type": "path" }, "original": { - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/tmux", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/tmux", "type": "path" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nathan", + "prgms", + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "waveforms": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1727720938, @@ -1452,23 +1801,23 @@ "locked": { "lastModified": 1, "narHash": "sha256-eBI7Be8dZ4zYMy+swgH83pTBFblMwUiK1Xc5PoyvwGE=", - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/zoxide", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/zoxide", "type": "path" }, "original": { - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/zoxide", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/zoxide", "type": "path" } }, "zsh": { "locked": { "lastModified": 1, - "narHash": "sha256-kPuFq2R3i94eNuEp9Slq2H+/DEHWdL/SNrcnGP4mKxs=", - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/zsh", + "narHash": "sha256-BEUs7EQM66rDZ7QFVXy7PFq1qxsHmIwnwoEl7qJolc0=", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/zsh", "type": "path" }, "original": { - "path": "/nix/store/1v7nq1bra107kjia3g9qkccc773h638a-source/zsh", + "path": "/nix/store/0xqb9n85wk3fb2jz0j6rc6lmd6vifw4c-source/zsh", "type": "path" } } diff --git a/home/packages/scripts/flake.nix b/home/packages/scripts/flake.nix index 6d3c6d2..8de5fb2 100644 --- a/home/packages/scripts/flake.nix +++ b/home/packages/scripts/flake.nix @@ -40,9 +40,11 @@ (pkgs.writeShellScriptBin "setWallpaper" '' img=''$(realpath ''${1:-~/.cache/bg}) - killall .mpvpaper-wrapp - ${pkgs.mpvpaper}/bin/mpvpaper -f -o "loop" '*' $img - changeColors $img $2 + p=''$(ps -e | grep mpvpaper | sed -n -e "s/ *//" -e "s/ /\n/" -e "1 P") + ${pkgs.mpvpaper}/bin/mpvpaper -f -o "loop" '*' $img && \ + changeColors $img $2 && \ + sleep 0.4 && \ + kill $p '') (pkgs.writeShellScriptBin "changeColors" '' diff --git a/home/programs/flake.nix b/home/programs/flake.nix index 9d3ae96..78c79c5 100644 --- a/home/programs/flake.nix +++ b/home/programs/flake.nix @@ -5,7 +5,7 @@ ags.url = "./ags"; - neovim.url = "./neovim"; + nixvim.url = "./nixvim"; terminal.url = "./terminal"; #home manager only @@ -22,7 +22,6 @@ imports = [ inputs.ags.hmModule - inputs.neovim.hmModule inputs.hyprland.hmModule inputs.terminal.hmModule inputs.rofi.hmModule @@ -30,6 +29,10 @@ ./calcurse ]; + home.packages = [ + inputs.nixvim.packages.${pkgs.system}.default + ]; + }; }; diff --git a/home/programs/nixvim/config/default.nix b/home/programs/nixvim/config/default.nix index d0c98e4..a583f4e 100644 --- a/home/programs/nixvim/config/default.nix +++ b/home/programs/nixvim/config/default.nix @@ -22,6 +22,8 @@ treesitter.enable = true; + render-markdown.enable = true; + web-devicons.enable = true; lsp = { @@ -167,7 +169,6 @@ pywal-nvim tokyonight-nvim llm-nvim - nvim-lspconfig ]; diff --git a/home/programs/nixvim/flake.lock b/home/programs/nixvim/flake.lock index 5f8e218..9c994ca 100644 --- a/home/programs/nixvim/flake.lock +++ b/home/programs/nixvim/flake.lock @@ -40,11 +40,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1727805723, + "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1726742753, - "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=", + "lastModified": 1727707210, + "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2", + "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -204,23 +204,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727118532, - "narHash": "sha256-nRzlwdPaSb1UCoqndT52AUNpx9e8wLCEjY28eAkCHIg=", + "lastModified": 1727871072, + "narHash": "sha256-t+YLQwBB1soQnVjT6d7nQq4Tidaw7tpB8i6Zvpc+Zbs=", "owner": "nix-community", "repo": "nixvim", - "rev": "47364df49645e89d8aa03aa61c893e12ecbac366", + "rev": "0ca98d02104f7f0a703787a7a080a570b7f1bedd", "type": "github" }, "original": { @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1726816132, - "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=", + "lastModified": 1727599661, + "narHash": "sha256-0R+1ih0Rfqrz/lcduvpNSnUw3uthUHiaGh0aWPyIqeQ=", "owner": "NuschtOS", "repo": "search", - "rev": "7733a39a1321057172d87e6251ded7cdeb67171e", + "rev": "c3c3928b8de7d300c34e9d90fdc19febd1a32062", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1726734507, - "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", "type": "github" }, "original": { diff --git a/home/programs/terminal/zsh/zsh.nix b/home/programs/terminal/zsh/zsh.nix index d13fd60..5fdd097 100644 --- a/home/programs/terminal/zsh/zsh.nix +++ b/home/programs/terminal/zsh/zsh.nix @@ -20,6 +20,9 @@ ksh = "kitten ssh"; + vi = "nvim"; + vim = "nvim"; + }; history = { diff --git a/system/configuration/configuration.nix b/system/configuration/configuration.nix index be3f45e..ee9832c 100644 --- a/system/configuration/configuration.nix +++ b/system/configuration/configuration.nix @@ -31,7 +31,7 @@ modesetting.enable = true; powerManagement.enable = true; powerManagement.finegrained = false; - open = true; + open = false; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.beta;