diff --git a/flake.lock b/flake.lock index b00119f..1f48227 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1731959031, - "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", + "lastModified": 1738183445, + "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", + "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74", "type": "github" }, "original": { @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1738033138, + "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "type": "github" }, "original": { @@ -54,6 +54,27 @@ "type": "github" } }, + "devshell": { + "inputs": { + "nixpkgs": [ + "nh_darwin", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "owner": "numtide", + "repo": "devshell", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -118,27 +139,30 @@ "type": "github" } }, - "flake-utils": { + "flake-parts": { "inputs": { - "systems": "systems" + "nixpkgs-lib": [ + "nh_darwin", + "nixpkgs" + ] }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "flake-utils_2": { + "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -154,9 +178,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1705309234, @@ -172,9 +196,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -190,9 +214,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -208,26 +232,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1733179821, - "narHash": "sha256-dKJpRERwG4b/HBsG/U4VLXn603dOU3nfYsqghQr4OYw=", - "ref": "refs/heads/main", - "rev": "91ae0e16f4ef142d86b59b489e4f0610ac60f3fd", - "revCount": 8153, - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - }, - "original": { - "type": "git", - "url": "ssh://git@github.com/ghostty-org/ghostty" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -294,11 +298,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1738178313, + "narHash": "sha256-/8TLf6LkXGRGERzcWMNDeXjYaHSbexmfV+ofheo7K6k=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "420a0d9506b5dac4d86a68b9ef8e763624ad86c6", "type": "github" }, "original": { @@ -313,11 +317,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733165231, - "narHash": "sha256-NV0u/JezyBGFk0wPz74/w+3PTsTyoJ7R5ZlupOBo7Jk=", + "lastModified": 1737949234, + "narHash": "sha256-rkOIzVI0ND7775hWR+N4RxnI31ajYrsqkXVStB+Qf+8=", "owner": "StevenBlack", "repo": "hosts", - "rev": "485083e4bc8947248c3eab3e416f7d0b5917dafd", + "rev": "a0af3d5cb1b0fb88c8e6f2037331758f8fcb6109", "type": "github" }, "original": { @@ -342,11 +346,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1738178255, + "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82", "type": "github" }, "original": { @@ -355,25 +359,56 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1738018829, + "narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b", + "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_2", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1733157082, - "narHash": "sha256-rmJkUKyvaejRaQeEOpInjGjQv6rgFkm2uJ2iVlMEuOk=", + "lastModified": 1738183538, + "narHash": "sha256-USMuV15YsPaz0FMTZrLHWOg8KNgUF3PPdx/JZhsJTgs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888", + "rev": "6fc9c8e4797a272c688fc74b872db5d828c21f02", "type": "github" }, "original": { @@ -399,11 +434,11 @@ ] }, "locked": { - "lastModified": 1732053779, - "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=", + "lastModified": 1738011374, + "narHash": "sha256-WSgu+IWBUhUZdnrdx19yE4afevtheDV88Q6kawsJ1pE=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991", + "rev": "014003b2bd3744dfabb8c2c20a80e89f721be238", "type": "github" }, "original": { @@ -424,11 +459,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -437,6 +472,74 @@ "type": "github" } }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1737981711, + "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -453,11 +556,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", "type": "github" }, "original": { @@ -478,11 +581,11 @@ ] }, "locked": { - "lastModified": 1732288281, - "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", + "lastModified": 1737978343, + "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", + "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", "type": "github" }, "original": { @@ -503,11 +606,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -530,17 +633,18 @@ }, "nh_darwin": { "inputs": { - "nix-darwin": "nix-darwin", + "devshell": "devshell", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1733092619, - "narHash": "sha256-kpzViKJZFIU8DryCQzdpdHdOZN5nWrryZBiMLy3kEEE=", + "lastModified": 1734649198, + "narHash": "sha256-ZgHTep4WPfIeCQYP6y7ls3YFYmLxBZckZ6aPiZ1mqVA=", "owner": "ToyVo", "repo": "nh_darwin", - "rev": "80e64a85d349aa2075973c68053ab475949f3bfd", + "rev": "5549630d2a9556209f287c6982865875a87f3e77", "type": "github" }, "original": { @@ -549,39 +653,18 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nh_darwin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733047432, - "narHash": "sha256-fQUKxgxAEHlL5bevRkdsQB7sSpAMhlvxf7Zw0KK8QIg=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "e30a3622b606dffc622305b4bbe1cfe37e78fa40", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-options-search": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "gitignore": "gitignore_2", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1721325991, - "narHash": "sha256-eJ9nFrrbWystBX9EhHE3wou+1kqf+CjVeys12z7u3fs=", + "lastModified": 1737269558, + "narHash": "sha256-8FgCXvokcoSEF4LK8AwE+zhCXKp0OI1IoccNGGj4g1c=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "e7b9b6e4be12bfb5fb6792372f18470e3718027a", + "rev": "9bcdff5e825021a2f4775910f1619dd1d573f698", "type": "github" }, "original": { @@ -596,15 +679,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3", - "rust-overlay": "rust-overlay" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1733095793, - "narHash": "sha256-woqkmcGxOleK1RyoZpXU3NaC4+epr2qYau2mVhVQFjY=", + "lastModified": 1738041275, + "narHash": "sha256-4Oqq357Q//Ra5qV9PdPLMkdH0uFFxy1stQF8hTe8xEM=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "e468c8b79dd55f1ce8803887d3593fb0016f1f81", + "rev": "36eabddc2d033f4fd31c53570db7e1e21591cba3", "type": "github" }, "original": { @@ -616,8 +698,8 @@ "nixpkgs": { "locked": { "lastModified": 0, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", - "path": "/nix/store/sh0v21n9zc03b94qjj4jkkg5mbsjkpzr-source", + "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "path": "/nix/store/2g3q36zra5ix7qhkb8b4ikr5pmmhfm6g-source", "type": "path" }, "original": { @@ -627,53 +709,21 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726062281, - "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", - "owner": "nixos", + "lastModified": 1737885640, + "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", + "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "type": "github" }, "original": { - "owner": "nixos", - "ref": "release-24.05", + "owner": "NixOS", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { "locked": { "lastModified": 1720535198, "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", @@ -688,29 +738,13 @@ "type": "indirect" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -722,11 +756,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -738,11 +772,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -790,15 +824,14 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -810,7 +843,6 @@ "root": { "inputs": { "darwin": "darwin", - "ghostty": "ghostty", "home-manager": "home-manager", "hosts": "hosts", "hyprland": "hyprland", @@ -819,48 +851,12 @@ "nix-options-search": "nix-options-search", "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_4", - "zig": "zig_2", + "nixpkgs-stable": "nixpkgs-stable_2", + "zig": "zig", "zls": "zls" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -875,6 +871,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -920,21 +931,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -963,11 +959,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { @@ -978,21 +974,16 @@ }, "zig": { "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "lastModified": 1737419334, + "narHash": "sha256-xEQ+2zoihSR8TSHH5KMceReUd9Ae2tPNLFoQviGpaAg=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "rev": "11ba4193561b6096b2c72174163940a50251a99c", "type": "github" }, "original": { @@ -1004,7 +995,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "zls", "nixpkgs" @@ -1024,29 +1015,9 @@ "type": "github" } }, - "zig_2": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1733141566, - "narHash": "sha256-ZEI6jN6KS2CHuSQuvo1zB4ty8x78XYiWvySn2c5vVE0=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "2b42ec31944b58fb08a0e7501bbae558935a9a2c", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, "zls": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "gitignore": "gitignore_3", "langref": "langref", "nixpkgs": "nixpkgs_6", diff --git a/flake.nix b/flake.nix index 778369d..c6c542b 100644 --- a/flake.nix +++ b/flake.nix @@ -30,10 +30,6 @@ # foundryvtt.url = "github:reckenrode/nix-foundryvtt"; - ghostty = { - url = "git+ssh://git@github.com/ghostty-org/ghostty"; - }; - nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs"; @@ -58,7 +54,6 @@ hyprland-plugins, zig, zls, - ghostty, nixos-cosmic, nh_darwin, ... @@ -87,7 +82,6 @@ home-manager.extraSpecialArgs = { inherit hyprland-plugins; inherit zls; - inherit ghostty; }; } nixos-cosmic.nixosModules.default @@ -113,7 +107,6 @@ }; home-manager.extraSpecialArgs = { inherit zls; - inherit ghostty; }; users.users.nmarks.home = "/Users/nmarks"; } @@ -121,7 +114,6 @@ specialArgs = { inherit nh_darwin; inherit inputs; - inherit ghostty; }; }; }; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index abe11aa..1ad44ef 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -16,6 +16,8 @@ openFirewall = true; }; + programs.gamemode.enable = true; + programs._1password.enable = true; programs._1password-gui = { enable = true; @@ -43,23 +45,26 @@ virtualisation.containers.enable = true; virtualisation.podman = { enable = true; - dockerCompat = true; + # dockerCompat = true; }; + virtualisation.docker.enable = true; nix.settings.trusted-users = ["root" "nmarks"]; nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings = { substituters = [ - "https://nix-community.cachix.org" "https://cache.nixos.org/" - "https://cuda-maintainers.cachix.org" + "https://nix-community.cachix.org" "https://cosmic.cachix.org/" + "https://cache.iog.io" + "https://cuda-maintainers.cachix.org" ]; trusted-public-keys = [ "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ]; }; programs.hyprland.enable = true; @@ -99,7 +104,8 @@ }; fonts.packages = with pkgs; [ - (nerdfonts.override {fonts = ["FiraCode" "Iosevka"];}) + nerd-fonts.fira-code + nerd-fonts.iosevka ]; imports = [ @@ -160,19 +166,21 @@ #boot.loader.systemd-boot.enable = true; #boot.loader.efi.canTouchEfiVariables = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.loader = { - systemd-boot.enable = true; + # systemd-boot.enable = true; efi = { canTouchEfiVariables = true; # assuming /boot is the mount point of the EFI partition in NixOS (as the installation section recommends). - efiSysMountPoint = "/boot"; + efiSysMountPoint = "/boot/efi"; + }; + grub = { + enable = true; + device = "nodev"; + theme = pkgs.nixos-grub2-theme; + useOSProber = true; }; - # grub = { - # enable = true; - # device = "/dev/sdb1"; - # theme = pkgs.nixos-grub2-theme; - # useOSProber = true; - # }; }; boot.supportedFilesystems = ["ntfs"]; @@ -205,7 +213,7 @@ # Enable the KDE Plasma Desktop Environment. # services.displayManager.sddm.enable = true; - # services.desktopManager.plasma6.enable = true; + services.desktopManager.plasma6.enable = true; services.desktopManager.cosmic.enable = true; services.displayManager.cosmic-greeter.enable = true; @@ -220,14 +228,15 @@ services.printing.enable = true; # Enable sound with pipewire. - #sound.enable = true; - #hardware.pulseaudio.enable = false; + # services.pulseaudio.enable = true; security.rtkit.enable = true; services.pipewire = { enable = true; + audio.enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + # systemWide = true; # If you want to use JACK applications, uncomment this #jack.enable = true; @@ -269,6 +278,11 @@ package = with pkgs; steam.override {extraPkgs = pkgs: [attr];}; }; + programs.git = { + enable = true; + lfs.enable = true; + }; + # Allow unfree packages # List packages installed in system profile. To search, run: # $ nix search wget @@ -407,7 +421,7 @@ nss openssl pango - pipewire + # pipewire stdenv.cc.cc systemd vulkan-loader diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 04e7cc2..92f5c10 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -1,37 +1,41 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "ahci" "xhci_pci" "usbhid" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2319-EE79"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/2319-EE79"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - fileSystems."/home/nmarks/Games/steam" = - { device = "/dev/disk/by-uuid/e7ac46ce-edcb-4763-8717-a7c67de5c7f3"; - fsType = "ext4"; - }; + fileSystems."/home/nmarks/Games/steam" = { + device = "/dev/disk/by-uuid/e7ac46ce-edcb-4763-8717-a7c67de5c7f3"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/a4128bb9-239c-4aa9-9777-5067feb77b28"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/a4128bb9-239c-4aa9-9777-5067feb77b28";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 9961199..85b6df9 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -3,7 +3,6 @@ config, pkgs, zls, - ghostty, nix-options-search, ... }: { @@ -49,7 +48,6 @@ imagemagick lua51Packages.lua lua51Packages.luarocks-nix - lemonade legcord calibre pyright @@ -68,7 +66,7 @@ pavucontrol efibootmgr zigpkgs.master - ghostty.packages.x86_64-linux.default + ghostty stylua webcord cachix @@ -136,8 +134,6 @@ alejandra statix texlab - typst-fmt - typst-lsp clang-tools # rust-analyzer #clippy