diff --git a/configuration.nix b/configuration.nix index 142cab3..162789c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -32,4 +32,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/flake.lock b/flake.lock index 6c03153..d61d946 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1770165109, - "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1773436376, - "narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=", + "lastModified": 1767024902, + "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8", + "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1773079031, - "narHash": "sha256-RvCzINnVISBT3d0F1DoIcQFbQsbRJISW9qZeKTzmNaA=", + "lastModified": 1769016387, + "narHash": "sha256-sDdvlidw6DEktudOLPWxj2OIsd5WVTAbfig4J3SJA7g=", "owner": "abenz1267", "repo": "elephant", - "rev": "53afe39cef252010f7c55bd33c5bae6dd50dcf0c", + "rev": "03cbbf77d48fa462057353cd7e3f1a3a82f5b998", "type": "github" }, "original": { @@ -127,16 +127,32 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -195,11 +211,11 @@ ] }, "locked": { - "lastModified": 1774135471, - "narHash": "sha256-TVeIGOxnfSPM6JvkRkXHpJECnj1OG2dXkWMSA4elzzQ=", + "lastModified": 1769015285, + "narHash": "sha256-MlqzCJbckJsgwfkRs64H2xaX2Uxl4o6Z9XYfkYS1N/E=", "owner": "nix-community", "repo": "home-manager", - "rev": "856b01ebd1de3f53c3929ce8082d9d67d799d816", + "rev": "ec0247a7a19f641595c24ac1ea4df6461d1cdb36", "type": "github" }, "original": { @@ -224,11 +240,11 @@ ] }, "locked": { - "lastModified": 1772461003, - "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -253,11 +269,11 @@ ] }, "locked": { - "lastModified": 1772461523, - "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", + "lastModified": 1766946335, + "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", + "rev": "4af02a3925b454deb1c36603843da528b67ded6c", "type": "github" }, "original": { @@ -283,11 +299,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1774136452, - "narHash": "sha256-pSwj8WNWXMuZaDqCyhQwlngRD3JyNmZwldSe6UqWAos=", + "lastModified": 1769011011, + "narHash": "sha256-lIF9wyXxf5QTv2D0HbI5n+l780S+WK6xxFgFZmoC7/M=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "bf31f642b08a8d8ca796a1b713285f2580805c2f", + "rev": "22fc8136a21676472b232f9462318e16b1d16745", "type": "github" }, "original": { @@ -329,11 +345,11 @@ ] }, "locked": { - "lastModified": 1772467975, - "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", "type": "github" }, "original": { @@ -359,11 +375,11 @@ ] }, "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", + "lastModified": 1767723101, + "narHash": "sha256-jObY8O7OI+91hoE137APsDxm0235/Yx+HhFIip187zM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", + "rev": "fef398ed5e4faf59bc43b915e46a75cfe8b16697", "type": "github" }, "original": { @@ -384,11 +400,11 @@ ] }, "locked": { - "lastModified": 1772460177, - "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -413,11 +429,11 @@ ] }, "locked": { - "lastModified": 1772459629, - "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -465,11 +481,11 @@ ] }, "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -490,11 +506,11 @@ ] }, "locked": { - "lastModified": 1773948364, - "narHash": "sha256-S76omfIVQ1TpGiXFbqih6o6XcH3sA5+5QI+SXB4HvlY=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b85b779e3e3a1adcd9b098e3447cf48f9e780b35", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -515,11 +531,11 @@ ] }, "locked": { - "lastModified": 1772459835, - "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -544,11 +560,11 @@ ] }, "locked": { - "lastModified": 1773074819, - "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", + "lastModified": 1767473322, + "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "f68afd0e73687598cc2774804fedad76693046f0", + "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11", "type": "github" }, "original": { @@ -565,11 +581,11 @@ "optnix": "optnix" }, "locked": { - "lastModified": 1773211698, - "narHash": "sha256-7MO8/1kby+CHc7KwNDfz3+GvVifA2F1V4nZR+w0r6w4=", + "lastModified": 1769038775, + "narHash": "sha256-JkbtQg0fLTOg96IWbKUuylrMZ8NtICiQwCaoOGEJ0YQ=", "owner": "nix-community", "repo": "nixos-cli", - "rev": "35c01291b1bd707def2d1613543c7fe2e4132d43", + "rev": "6f07e6d616f1232b7d7d38f1df306e52342bd5b7", "type": "github" }, "original": { @@ -596,11 +612,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -627,11 +643,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -643,11 +659,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1772956932, - "narHash": "sha256-M0yS4AafhKxPPmOHGqIV0iKxgNO8bHDWdl1kOwGBwRY=", + "lastModified": 1767151656, + "narHash": "sha256-ujL2AoYBnJBN262HD95yer7QYUmYp5kFZGYbyCCKxq8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "608d0cadfed240589a7eea422407a547ad626a14", + "rev": "f665af0cdb70ed27e1bd8f9fdfecaf451260fc55", "type": "github" }, "original": { @@ -659,32 +675,32 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", - "owner": "nixos", + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -709,15 +725,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "noctalia-qs": "noctalia-qs" + ] }, "locked": { - "lastModified": 1774190046, - "narHash": "sha256-fAtmC9Yy2VNExCaxO7kZgPH8LIQP8M9LEGcAp23gXMk=", + "lastModified": 1769090704, + "narHash": "sha256-8jNDSoBIRMmg+YmKNabzua6a3kmZghsJeeWS5K2AdLU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "4e44886a79cf39e04d625961e2906537723f631a", + "rev": "a3774c0687e5e3ab228933631f1a16e563d69f25", "type": "github" }, "original": { @@ -726,46 +741,17 @@ "type": "github" } }, - "noctalia-qs": { - "inputs": { - "nixpkgs": [ - "noctalia", - "nixpkgs" - ], - "systems": "systems_4", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1774059741, - "narHash": "sha256-ObYsrf7XLJDqWVbJ+GWH5JYV/EUc7SVdhGx5r5wWKno=", - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "rev": "c9beee5c634ec784af128b8e7c56db14012ab17f", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "type": "github" - } - }, "optnix": { "inputs": { - "flake-compat": [ - "nixos-cli", - "flake-compat" - ], - "nixpkgs": [ - "nixos-cli", - "nixpkgs" - ] + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1770000117, - "narHash": "sha256-kZ1eLvCxfN+6RYQdcWUdIf+2WuiNiAfbJq+VetT+kos=", + "lastModified": 1765418479, + "narHash": "sha256-33VCCXiEnEL9N2wVxo9FHLwL8KWH6qk+MNRcSThOPWs=", "owner": "water-sucks", "repo": "optnix", - "rev": "e3a8a63d8a9dcad01f499b2ece87db3545443f05", + "rev": "01facc3de860bf479723bf19535586564e59fe73", "type": "github" }, "original": { @@ -784,11 +770,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -805,7 +791,7 @@ "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "nixos-cli": "nixos-cli", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "noctalia": "noctalia", "walker": "walker", "zen-browser": "zen-browser" @@ -871,53 +857,20 @@ "type": "github" } }, - "systems_5": { - "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" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "walker": { "inputs": { "elephant": [ "elephant" ], "nixpkgs": "nixpkgs_7", - "systems": "systems_5" + "systems": "systems_4" }, "locked": { - "lastModified": 1773675699, - "narHash": "sha256-GrormZ2KxchtCLuO90+5fioEQmlUCKBIil0Mzr9w0Iw=", + "lastModified": 1769016454, + "narHash": "sha256-FYfvyIed3v6IBNoc88jKAGfNy+FAO/AX3q5yhB1w5TM=", "owner": "abenz1267", "repo": "walker", - "rev": "d2702235710da3d7daf55c912ca7534261cf20f5", + "rev": "e7d271735bd49152c4385b0a7ee59a941c35bc04", "type": "github" }, "original": { @@ -954,11 +907,11 @@ ] }, "locked": { - "lastModified": 1772669058, - "narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "906d0ac159803a7df2dc1f948df9327670380f69", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { @@ -974,11 +927,11 @@ ] }, "locked": { - "lastModified": 1773722260, - "narHash": "sha256-U8MsSiqqYZHR3oKE+cCZ2AJt3b4LcXs+oQuNLipaO78=", + "lastModified": 1767618227, + "narHash": "sha256-9+XVF47E9NCVs249SSsDtr7YdG/23/lCJmWAjQvOfqI=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "0e6e43342fb3e9a3439fafa777d8cdf98e4ffc49", + "rev": "1586e49b3908b058e221f11d843eb46392dba17b", "type": "github" }, "original": { diff --git a/hosts/marty-latitude/default.nix b/hosts/marty-latitude/default.nix index e963b18..f70da1e 100644 --- a/hosts/marty-latitude/default.nix +++ b/hosts/marty-latitude/default.nix @@ -35,5 +35,4 @@ light.enable = true; }; services.flatpak.enable = true; - system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/hosts/marty-pc/default.nix b/hosts/marty-pc/default.nix index a691050..1a6ba06 100644 --- a/hosts/marty-pc/default.nix +++ b/hosts/marty-pc/default.nix @@ -36,16 +36,6 @@ localNetworkGameTransfers.openFirewall = true; gamescopeSession.enable = true; protontricks.enable = true; - extraCompatPackages = with pkgs; [ - proton-ge-bin - ]; - extraPackages = with pkgs; [ - gamescope - ]; - }; - programs.gamescope = { - enable = true; - capSysNice = true; }; services.flatpak.enable = true; virtualisation.docker.enable = true; @@ -84,5 +74,4 @@ vial ]; }; - system.stateVersion = "25.05"; # Did you read the comment? } diff --git a/hosts/marty-pc/hardware.nix b/hosts/marty-pc/hardware.nix index 523fef7..d934fcd 100644 --- a/hosts/marty-pc/hardware.nix +++ b/hosts/marty-pc/hardware.nix @@ -20,7 +20,7 @@ "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = { diff --git a/hosts/marty-pc/home.nix b/hosts/marty-pc/home.nix index f9c1281..4e9b0bf 100644 --- a/hosts/marty-pc/home.nix +++ b/hosts/marty-pc/home.nix @@ -87,7 +87,6 @@ "desc:AOC Q27G2WG4 0x00005F45, 2560x1440@144, 3840x0, 1 # main monitor" "desc:Samsung Electric Company S24D330 0x5A5A5131, 1920x1080@60, 3840x1440, 1 # side monitor" "desc:Panasonic Industry Company Panasonic-TV, 3840x2160@30, 0x0, 1 # tv" - "desc:Valve Corporation Index HMD 0x3DEBE38D, preffered, auto, 1" ]; workspaces.workspaces = [ diff --git a/hosts/marty-server/default.nix b/hosts/marty-server/default.nix index 8403779..8cf2c59 100644 --- a/hosts/marty-server/default.nix +++ b/hosts/marty-server/default.nix @@ -32,5 +32,4 @@ imports = [ ./hardware.nix ]; virtualisation.docker.enable = true; - system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index a6a7123..7867923 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -15,7 +15,7 @@ default = [ ",preferred,auto,1" ]; - description = "declare monitors"; + description = ''declare monitors''; }; workspaces = { workspaces = lib.mkOption { @@ -32,11 +32,11 @@ ) config.desktop.hyprland.workspaces.amount ) ); - description = "declare workspace"; + description = ''declare workspace''; }; amount = lib.mkOption { default = 9; - description = "declare workspace amount"; + description = ''declare workspace amount''; }; }; numlock = lib.mkEnableOption "numlock by default"; @@ -78,11 +78,6 @@ settings = { monitor = config.desktop.hyprland.monitors; workspace = config.desktop.hyprland.workspaces.workspaces; - env = [ - "XDG_CURRENT_DESKTOP,Hyprland" - "XDG_SESSION_TYPE,wayland" - "XDG_SESSION_DESKTOP,Hyprland" - ]; exec-once = [ #"hyprctl plugin load " (lib.mkIf (config.desktop.walker.enable) "elephant") @@ -92,7 +87,6 @@ (lib.mkIf (config.desktop.wallpaper.enable) "waypaper --restore --random") (lib.mkIf (config.gaming.steam.enable) "adwaita-steam-gtk -u; steam -silent") (lib.mkIf (config.internet.mail.providers.protonmail.enable) "protonmail-bridge -n") - "echo $HYPRLAND_INSTANCE_SIGNATURE > ~/.config/hypr/instance_signature" ]; "$mod" = "SUPER"; "$shiftmod" = "SUPER_SHIFT"; diff --git a/modules/development/default.nix b/modules/development/default.nix index 458ed9f..4cf882c 100644 --- a/modules/development/default.nix +++ b/modules/development/default.nix @@ -11,10 +11,6 @@ ./vscodium.nix ./python.nix ./godot.nix - ./openssl.nix - ]; - home.packages = with pkgs; [ - bc - imagemagick + ]; } diff --git a/modules/development/openssl.nix b/modules/development/openssl.nix deleted file mode 100644 index 23e455e..0000000 --- a/modules/development/openssl.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - home.packages = with pkgs; [ - openssl - ]; -} diff --git a/modules/gaming/steam.nix b/modules/gaming/steam.nix index bb9d744..dfb178f 100644 --- a/modules/gaming/steam.nix +++ b/modules/gaming/steam.nix @@ -14,6 +14,7 @@ config = lib.mkIf config.gaming.steam.enable { home.packages = with pkgs; [ + steam adwsteamgtk ]; }; diff --git a/modules/media/video.nix b/modules/media/video.nix index efac50c..8172c9c 100644 --- a/modules/media/video.nix +++ b/modules/media/video.nix @@ -13,8 +13,6 @@ mpv.enable = lib.mkEnableOption "enable mpv"; kdenlive.enable = lib.mkEnableOption "enable kdenlive"; tsukimi.enable = lib.mkEnableOption "enable tsukimi (jellyfin client)"; - jellyfin.enable = lib.mkEnableOption "enable jellyin (jellyfin client)"; - pipeline.enable = lib.mkEnableOption "enable pipeline (you/peertube client)"; }; }; }; @@ -24,14 +22,10 @@ kdenlive.enable = lib.mkDefault true; mpv.enable = lib.mkDefault true; tsukimi.enable = lib.mkDefault true; - jellyfin.enable = lib.mkDefault true; - pipeline.enable = lib.mkDefault true; }; home.packages = with pkgs; [ (lib.mkIf (config.media.video.kdenlive.enable) kdePackages.kdenlive) (lib.mkIf (config.media.video.tsukimi.enable) tsukimi) - (lib.mkIf (config.media.video.jellyfin.enable) jellyfin-desktop) - (lib.mkIf (config.media.video.pipeline.enable) pipeline) ]; programs = { mpv = lib.mkIf config.media.video.mpv.enable { diff --git a/system/boot.nix b/system/boot.nix index 82c1b0b..d5076f5 100644 --- a/system/boot.nix +++ b/system/boot.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - inputs, ... }: @@ -22,21 +21,11 @@ timeout = 3; efi.canTouchEfiVariables = true; }; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_zen; kernel = { sysctl = { "vm.swappiness" = 10; }; }; }; - services = { - dbus.implementation = "broker"; - }; - - hardware = { - graphics = { - enable = true; - enable32Bit = true; - }; - }; } diff --git a/system/display-manager.nix b/system/display-manager.nix index 795f410..50c1398 100644 --- a/system/display-manager.nix +++ b/system/display-manager.nix @@ -2,7 +2,6 @@ config, pkgs, lib, - inputs, ... }: @@ -24,22 +23,5 @@ programs.hyprland = { enable = true; withUWSM = true; - xwayland.enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - }; - # programs.sway.enable = true; - # programs.uwsm = { - # enable = true; - # waylandCompositors = { - # hyprland = { - # prettyName = "Hyprland"; - # comment = "Hyprland compositor managed by UWSM"; - # binPath = "${config.programs.hyprland.package}/share/wayland-sessions/hyprland.desktop"; - # }; - - # }; - # }; } diff --git a/system/networking.nix b/system/networking.nix index 872e5a3..ebf19e5 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -8,14 +8,8 @@ allowedUDPPorts = [ config.services.tailscale.port 53317 - 16261 - 16262 - ]; - allowedTCPPorts = [ - 53317 - 16261 - 16262 ]; + allowedTCPPorts = [ 53317 ]; trustedInterfaces = [ "tailscale0" ]; }; }; diff --git a/system/nixos-cli.nix b/system/nixos-cli.nix index 5efa0f7..bebd807 100644 --- a/system/nixos-cli.nix +++ b/system/nixos-cli.nix @@ -6,5 +6,5 @@ }: { - programs.nixos-cli.enable = true; + services.nixos-cli.enable = true; }