diff --git a/flake.lock b/flake.lock index ee6e155..1fb0f47 100644 --- a/flake.lock +++ b/flake.lock @@ -1,42 +1,5 @@ { "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "xremap", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "xremap", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1751740947, - "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "dfc1db15a08c4cd234288f66e1199c653495301f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -58,17 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -107,11 +70,11 @@ }, "crane": { "locked": { - "lastModified": 1751562746, - "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", + "lastModified": 1766774972, + "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", "owner": "ipetkov", "repo": "crane", - "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", + "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", "type": "github" }, "original": { @@ -120,24 +83,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", - "owner": "numtide", - "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -162,11 +107,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -207,22 +152,6 @@ "type": "github" } }, - "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -231,11 +160,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -252,11 +181,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -270,11 +199,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -335,38 +264,15 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "xremap", - "hyprland", - "pre-commit-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" - } - }, "gnome-shell": { "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -377,6 +283,22 @@ "type": "gitlab" } }, + "godotdev": { + "flake": false, + "locked": { + "lastModified": 1768050065, + "narHash": "sha256-52tWEZ092Sskxn1113aWBSTQW6iBPPhyAfpwCS+F9XI=", + "ref": "refs/heads/master", + "rev": "61fcb7a627d6a417d70913cecb0fda17a181a49a", + "revCount": 80, + "type": "git", + "url": "https://code.capytal.cc/dot013/godotdev.nvim" + }, + "original": { + "type": "git", + "url": "https://code.capytal.cc/dot013/godotdev.nvim" + } + }, "heart-modpack": { "inputs": { "nix-minecraft": "nix-minecraft", @@ -408,11 +330,11 @@ ] }, "locked": { - "lastModified": 1763182882, - "narHash": "sha256-jZi+9yKmeTMsJ4ZNqRei/wL16+QwYGrCl4EJ3QHfoDU=", + "lastModified": 1765774562, + "narHash": "sha256-UQhfCggNGDc7eam+EittlYmeW89CZVT1KkFIHZWBH7k=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "b0585849abe7d02a774a853f7952d07bb910fd9e", + "rev": "edcbb19948b6caf1700434e369fde6ff9e6a3c93", "type": "github" }, "original": { @@ -428,11 +350,11 @@ ] }, "locked": { - "lastModified": 1765605144, - "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", + "lastModified": 1767910483, + "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "90b62096f099b73043a747348c11dbfcfbdea949", + "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", "type": "github" }, "original": { @@ -442,305 +364,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1756842514, - "narHash": "sha256-XbtRMewPGJwTNhBC4pnBu3w/xT1XejvB0HfohC2Kga8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "30fc1b532645a21e157b6e33e3f8b4c154f86382", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "xremap", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "xremap", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1751808145, - "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_6", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_4", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1751995875, - "narHash": "sha256-ud9sl1RjmzAzalH2ocmGPs182xvr7GktjVIYvzJamwo=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "9517d0eaa4ef93de67dc80fecca7a826f7ad556d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "xremap", - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "xremap", - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "xremap", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "xremap", - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1750371812, - "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "xremap", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1750371198, - "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1751888065, - "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "a8229739cf36d159001cfc203871917b83fdf917", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1751881472, - "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "mdfmt": { "flake": false, "locked": { @@ -759,15 +382,16 @@ }, "neovim": { "inputs": { + "godotdev": "godotdev", "mdfmt": "mdfmt", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765240766, - "narHash": "sha256-2Mwksv/Tu7EVrjIgiywiVsRlEPSEBBVfCBxOtZcznmM=", + "lastModified": 1768053560, + "narHash": "sha256-AFGNbQxWNbzKWqBU3eQs6uZqpSvJTjFyoDrUdiS39QM=", "ref": "refs/heads/main", - "rev": "2fb6af9ea26187c6056d85cb157d9098efa30b2c", - "revCount": 154, + "rev": "b5908349cb6914c7c2c27ba86cd4a5f67ab171eb", + "revCount": 186, "type": "git", "url": "https://code.capytal.cc/dot013/nvim" }, @@ -778,11 +402,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1739444422, - "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "lastModified": 1767983141, + "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "rev": "440818969ac2cbd77bfe025e884d0aa528991374", "type": "github" }, "original": { @@ -824,11 +448,11 @@ ] }, "locked": { - "lastModified": 1765591348, - "narHash": "sha256-GI5eC3BWNBnYk+FV1cTYrjPLrqv1Q5HXD7kwHkqnZ8c=", + "lastModified": 1767838769, + "narHash": "sha256-KCLU6SUU80tEBKIVZsBrSjRYX6kn1eVIYI3fEEqOp24=", "owner": "infinidoge", "repo": "nix-minecraft", - "rev": "37f2aad139533c27689c00cef0d43f7c51d0b14e", + "rev": "4da21f019f6443f513f16af7f220ba4db1cdfc04", "type": "github" }, "original": { @@ -846,11 +470,11 @@ ] }, "locked": { - "lastModified": 1765420302, - "narHash": "sha256-VEuTCHI7JBfwHsgfLMDPkzUw62E7MRpoJXllC5cCq2c=", + "lastModified": 1767234689, + "narHash": "sha256-b44HZf+3NbRvxH3rXtjLNTW3ojAXn172iygCcJr6NhA=", "owner": "nixpak", "repo": "nixpak", - "rev": "1741bbc053c7fea792f7179ba6b0c73d8488d1a6", + "rev": "ff179ec0158164037ee9036f93c081de6a8bf949", "type": "github" }, "original": { @@ -877,11 +501,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -892,11 +516,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { @@ -908,11 +532,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762844143, - "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { @@ -924,11 +548,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1767799921, + "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "type": "github" }, "original": { @@ -938,70 +562,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1722073938, - "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": [ @@ -1014,11 +574,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767886815, + "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", "type": "github" }, "original": { @@ -1027,30 +587,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore", - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "rec-sh": { "inputs": { "nixpkgs": [ @@ -1097,11 +633,11 @@ ] }, "locked": { - "lastModified": 1765553226, - "narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=", + "lastModified": 1768032389, + "narHash": "sha256-BVpTd93G0XmAK1iXiBdhUA5Uvt+WmM1YL0mA4REcT68=", "owner": "Mic92", "repo": "sops-nix", - "rev": "496a6f625f63b780ce849891868f2fad22fd49c6", + "rev": "a8cfe238b93166f9f96c0df67a94e572554ee624", "type": "github" }, "original": { @@ -1131,11 +667,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765478257, - "narHash": "sha256-GMCAQgs+h4aHhLP3LF6JxI5uNg+fLPlRhHwRrJJ+3+Y=", + "lastModified": 1767983286, + "narHash": "sha256-zuS1vcjZjtipzH1MgQUp/lRURIp6CXOVjGHQMQ1UBFI=", "owner": "danth", "repo": "stylix", - "rev": "a7fb3944d1fb4daa073ba82e1a9d34b5f05adb9f", + "rev": "5ad96253be7ee7f66298d28a24ac8faba8e0fe54", "type": "github" }, "original": { @@ -1190,21 +726,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1241,11 +762,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767817087, + "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "bd99656235aab343e3d597bf196df9bc67429507", "type": "github" }, "original": { @@ -1257,11 +778,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1273,11 +794,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -1286,90 +807,21 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "xremap", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "xremap", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "xremap", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "xremap", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "xremap", - "hyprland", - "nixpkgs" - ], - "systems": [ - "xremap", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1751300244, - "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "xremap": { "inputs": { "crane": "crane", - "devshell": "devshell", "flake-parts": "flake-parts_3", - "home-manager": "home-manager_2", - "hyprland": "hyprland", "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix", "xremap": "xremap_2" }, "locked": { - "lastModified": 1765504354, - "narHash": "sha256-Nw+pODpVmU+M00CRUSKMMaKaK1VEvbL9UJtcchmdemY=", + "lastModified": 1767318478, + "narHash": "sha256-h3oE50RedA8DRGrFU+Hv2kirt4rmzdaC9oSD+MSg9Ms=", "owner": "xremap", "repo": "nix-flake", - "rev": "2162570e24b5df19df053bf7b3b4817a850dcb8a", + "rev": "9a2224aa01a3c86e94b398c33329c8ff6496dc5d", "type": "github" }, "original": { @@ -1381,16 +833,16 @@ "xremap_2": { "flake": false, "locked": { - "lastModified": 1765400488, - "narHash": "sha256-QkrZltxJf5GhWczhBj3K8G6LRqlYEbZjhMtEbY8bdsk=", + "lastModified": 1766606475, + "narHash": "sha256-FPZ4iQA/vVZGzbO8i8lTK8i9A3zs9BLqMvTMeAVv9rQ=", "owner": "k0kubun", "repo": "xremap", - "rev": "95289472fc25b0ca0b0bf655f1ffb88fed7b014f", + "rev": "cdc744d873c19899ef21f329c4305b4b5e53d459", "type": "github" }, "original": { "owner": "k0kubun", - "ref": "v0.14.6", + "ref": "v0.14.8", "repo": "xremap", "type": "github" } @@ -1405,11 +857,11 @@ ] }, "locked": { - "lastModified": 1765589985, - "narHash": "sha256-jsaE3UG7BpthBJZtaXCCuH1rYdQBauUA3Otv3NF20FM=", + "lastModified": 1767763594, + "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c79311e5b4f299ab3713b23dfbc98c853bb5f070", + "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7303f21..d625937 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -14,7 +14,7 @@ }; stylix = { - url = "github:danth/stylix/release-25.05"; + url = "github:danth/stylix/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; diff --git a/home/guz-lite/configuration.nix b/home/guz-lite/configuration.nix index ff7ac82..18df6da 100644 --- a/home/guz-lite/configuration.nix +++ b/home/guz-lite/configuration.nix @@ -33,10 +33,6 @@ xdg-desktop-portal-gtk ]; - environment.systemPackages = with pkgs; [ - kdePackages.xwaylandvideobridge - ]; - services.xserver.displayManager.gdm.enable = true; fonts.fontDir.enable = true; diff --git a/home/guz/configuration.nix b/home/guz/configuration.nix index 6525e56..e44168c 100644 --- a/home/guz/configuration.nix +++ b/home/guz/configuration.nix @@ -22,6 +22,7 @@ # Xbox Controller driver hardware.xone.enable = true; + hardware.xpad-noone.enable = lib.mkForce false; # Build failure https://github.com/NixOS/nixpkgs/issues/467803 # OpenTabletDriver hardware.opentabletdriver.enable = true; @@ -32,7 +33,6 @@ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "davinci-resolve" - "megasync" "reaper" "steam" "steam-unwrapped" diff --git a/hosts/battleship/gpu-configuration.nix b/hosts/battleship/gpu-configuration.nix index 3f3e903..97163d8 100644 --- a/hosts/battleship/gpu-configuration.nix +++ b/hosts/battleship/gpu-configuration.nix @@ -28,7 +28,6 @@ libvdpau-va-gl vulkan-loader vulkan-validation-layers - amdvlk mesa.opencl ]; diff --git a/modules/home-manager/devkit.nix b/modules/home-manager/devkit.nix index b880cc7..5ddc785 100644 --- a/modules/home-manager/devkit.nix +++ b/modules/home-manager/devkit.nix @@ -62,8 +62,9 @@ in { home.sessionVariables = { SHELL = lib.mkIf cfg.zsh.enable "${lib.getExe config.programs.zsh.package}"; - TERM = lib.mkIf cfg.ghostty.enable "xterm-ghostty"; - TERMINAL = lib.mkIf cfg.ghostty.enable "${lib.getExe config.programs.ghostty.package}"; + TERM = lib.mkIf cfg.ghostty.enable "xterm-256color"; + # Used to be ghostty, but it is borked + TERMINAL = lib.mkIf cfg.ghostty.enable "${lib.getExe config.programs.wezterm.package}"; EXPLORER = lib.mkIf cfg.yazi.enable "${lib.getExe config.programs.yazi.package}"; }; @@ -107,6 +108,8 @@ in { package = config._devkit.packages.ghostty; }; + programs.wezterm.enable = true; + ## Git programs.git = lib.mkIf cfg.git.enable { enable = true; diff --git a/packages/devkit/lazygit/default.nix b/packages/devkit/lazygit/default.nix index 64520f6..9afc836 100644 --- a/packages/devkit/lazygit/default.nix +++ b/packages/devkit/lazygit/default.nix @@ -9,8 +9,12 @@ # YAML is a superset of JSON, so any JSON is valid YAML. colors = import ../colors.nix; cfg = pkgs.writeText "config.yml" (builtins.toJSON ({ - git.paging.colorArg = "always"; - git.paging.pager = "${lib.getExe pkgs.delta} --dark --paging=never"; + git.pagers = [ + { + colorArg = "always"; + pager = "${lib.getExe pkgs.delta} --dark --paging=never"; + } + ]; gui.theme = { activeBorderColor = [colors.base07 "bold"]; diff --git a/packages/devkit/zellij/default.nix b/packages/devkit/zellij/default.nix index fb689a2..87ea8d7 100644 --- a/packages/devkit/zellij/default.nix +++ b/packages/devkit/zellij/default.nix @@ -79,4 +79,4 @@ in cp ${desktopEntry}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop ''; } - // {inherit (zellij) meta;}) + // {inherit (zellij) meta version;})