diff --git a/configuration.nix b/configuration.nix index 162789c..142cab3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -32,5 +32,4 @@ # 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 f43e86b..6c03153 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1769428758, - "narHash": "sha256-0G/GzF7lkWs/yl82bXuisSqPn6sf8YGTnbEdFOXvOfU=", + "lastModified": 1773436376, + "narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "def5e74c97370f15949a67c62e61f1459fcb0e15", + "rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1769329000, - "narHash": "sha256-0vibWqmCsG1t4xL2euR6PScB3M4QZigB5JGl+BIH4NY=", + "lastModified": 1773079031, + "narHash": "sha256-RvCzINnVISBT3d0F1DoIcQFbQsbRJISW9qZeKTzmNaA=", "owner": "abenz1267", "repo": "elephant", - "rev": "1988112d1f54dd76e8a90f551945df763586bdad", + "rev": "53afe39cef252010f7c55bd33c5bae6dd50dcf0c", "type": "github" }, "original": { @@ -127,32 +127,16 @@ "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": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -211,11 +195,11 @@ ] }, "locked": { - "lastModified": 1769952507, - "narHash": "sha256-eNTfxT3v8b7s1dqswgposi5Y1CUMoOUhQKiy29QY25U=", + "lastModified": 1774135471, + "narHash": "sha256-TVeIGOxnfSPM6JvkRkXHpJECnj1OG2dXkWMSA4elzzQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b59376563943ce163b2553aeb63d0c170967d74e", + "rev": "856b01ebd1de3f53c3929ce8082d9d67d799d816", "type": "github" }, "original": { @@ -240,11 +224,11 @@ ] }, "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "lastModified": 1772461003, + "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", "type": "github" }, "original": { @@ -269,11 +253,11 @@ ] }, "locked": { - "lastModified": 1769284023, - "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=", + "lastModified": 1772461523, + "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "13c536659d46893596412d180449353a900a1d31", + "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", "type": "github" }, "original": { @@ -299,11 +283,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1769965155, - "narHash": "sha256-KAgGtueNnwLtekIh9tnmLAUDFbRxSff0OZwQwSi05Nk=", + "lastModified": 1774136452, + "narHash": "sha256-pSwj8WNWXMuZaDqCyhQwlngRD3JyNmZwldSe6UqWAos=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a0ec2e4daf8e508761f6bc53fc163fbb92ac7aa1", + "rev": "bf31f642b08a8d8ca796a1b713285f2580805c2f", "type": "github" }, "original": { @@ -345,11 +329,11 @@ ] }, "locked": { - "lastModified": 1767023960, - "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", + "lastModified": 1772467975, + "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", + "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", "type": "github" }, "original": { @@ -375,11 +359,11 @@ ] }, "locked": { - "lastModified": 1769285097, - "narHash": "sha256-eVD4U3Oqzz0VU9ylJ5wo76xDcYKv2CpiiRXq4Is4QdA=", + "lastModified": 1771865848, + "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "06c0749a0dac978d89b1a76ae6adc76a3c15dbfa", + "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", "type": "github" }, "original": { @@ -400,11 +384,11 @@ ] }, "locked": { - "lastModified": 1765214753, - "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", "type": "github" }, "original": { @@ -429,11 +413,11 @@ ] }, "locked": { - "lastModified": 1767983607, - "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=", + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "type": "github" }, "original": { @@ -481,11 +465,11 @@ ] }, "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", "type": "github" }, "original": { @@ -506,11 +490,11 @@ ] }, "locked": { - "lastModified": 1766253372, - "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", + "lastModified": 1773948364, + "narHash": "sha256-S76omfIVQ1TpGiXFbqih6o6XcH3sA5+5QI+SXB4HvlY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", + "rev": "b85b779e3e3a1adcd9b098e3447cf48f9e780b35", "type": "github" }, "original": { @@ -531,11 +515,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "type": "github" }, "original": { @@ -560,11 +544,11 @@ ] }, "locked": { - "lastModified": 1769202094, - "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=", + "lastModified": 1773074819, + "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c", + "rev": "f68afd0e73687598cc2774804fedad76693046f0", "type": "github" }, "original": { @@ -581,11 +565,11 @@ "optnix": "optnix" }, "locked": { - "lastModified": 1769927624, - "narHash": "sha256-7X1ye4EjDaC/IJ8Jgb6cFklXNIQuShisgV2Bg/4Bbw8=", + "lastModified": 1773211698, + "narHash": "sha256-7MO8/1kby+CHc7KwNDfz3+GvVifA2F1V4nZR+w0r6w4=", "owner": "nix-community", "repo": "nixos-cli", - "rev": "770454810b23241f25bea5eb5b6c27df730f371a", + "rev": "35c01291b1bd707def2d1613543c7fe2e4132d43", "type": "github" }, "original": { @@ -612,11 +596,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -643,11 +627,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1773389992, + "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", "type": "github" }, "original": { @@ -659,11 +643,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767151656, - "narHash": "sha256-ujL2AoYBnJBN262HD95yer7QYUmYp5kFZGYbyCCKxq8=", + "lastModified": 1772956932, + "narHash": "sha256-M0yS4AafhKxPPmOHGqIV0iKxgNO8bHDWdl1kOwGBwRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f665af0cdb70ed27e1bd8f9fdfecaf451260fc55", + "rev": "608d0cadfed240589a7eea422407a547ad626a14", "type": "github" }, "original": { @@ -675,32 +659,32 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", - "owner": "NixOS", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1769789167, - "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -725,14 +709,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1769973883, - "narHash": "sha256-hnzHEQLWxzX/SEm0n4z1Eyav7qzl5ImpV3gTUX/XRJQ=", + "lastModified": 1774190046, + "narHash": "sha256-fAtmC9Yy2VNExCaxO7kZgPH8LIQP8M9LEGcAp23gXMk=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "e578ff08924791058519b98988553335a5a9ef21", + "rev": "4e44886a79cf39e04d625961e2906537723f631a", "type": "github" }, "original": { @@ -741,17 +726,46 @@ "type": "github" } }, - "optnix": { + "noctalia-qs": { "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "noctalia", + "nixpkgs" + ], + "systems": "systems_4", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765418479, - "narHash": "sha256-33VCCXiEnEL9N2wVxo9FHLwL8KWH6qk+MNRcSThOPWs=", + "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" + ] + }, + "locked": { + "lastModified": 1770000117, + "narHash": "sha256-kZ1eLvCxfN+6RYQdcWUdIf+2WuiNiAfbJq+VetT+kos=", "owner": "water-sucks", "repo": "optnix", - "rev": "01facc3de860bf479723bf19535586564e59fe73", + "rev": "e3a8a63d8a9dcad01f499b2ece87db3545443f05", "type": "github" }, "original": { @@ -770,11 +784,11 @@ ] }, "locked": { - "lastModified": 1769069492, - "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", + "lastModified": 1772893680, + "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", + "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "type": "github" }, "original": { @@ -791,7 +805,7 @@ "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "nixos-cli": "nixos-cli", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "noctalia": "noctalia", "walker": "walker", "zen-browser": "zen-browser" @@ -857,20 +871,53 @@ "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_4" + "systems": "systems_5" }, "locked": { - "lastModified": 1769093508, - "narHash": "sha256-ccwJ1ADGNFd5LDF2JWdfP7+f1Hs2EvJ+2o6sUOdYi7w=", + "lastModified": 1773675699, + "narHash": "sha256-GrormZ2KxchtCLuO90+5fioEQmlUCKBIil0Mzr9w0Iw=", "owner": "abenz1267", "repo": "walker", - "rev": "e427025bdda667712b08dd56f1a0a23667f1364c", + "rev": "d2702235710da3d7daf55c912ca7534261cf20f5", "type": "github" }, "original": { @@ -907,11 +954,11 @@ ] }, "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", + "lastModified": 1772669058, + "narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", + "rev": "906d0ac159803a7df2dc1f948df9327670380f69", "type": "github" }, "original": { @@ -927,11 +974,11 @@ ] }, "locked": { - "lastModified": 1769747637, - "narHash": "sha256-fRdj480sqW/a+APO6CmelZsa07BRAdEQLUjBQJuyQbU=", + "lastModified": 1773722260, + "narHash": "sha256-U8MsSiqqYZHR3oKE+cCZ2AJt3b4LcXs+oQuNLipaO78=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "09e429679b7cc175e71e2d25800bab66493c1c80", + "rev": "0e6e43342fb3e9a3439fafa777d8cdf98e4ffc49", "type": "github" }, "original": { diff --git a/hosts/marty-latitude/default.nix b/hosts/marty-latitude/default.nix index f70da1e..e963b18 100644 --- a/hosts/marty-latitude/default.nix +++ b/hosts/marty-latitude/default.nix @@ -35,4 +35,5 @@ 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 1a6ba06..a691050 100644 --- a/hosts/marty-pc/default.nix +++ b/hosts/marty-pc/default.nix @@ -36,6 +36,16 @@ 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; @@ -74,4 +84,5 @@ 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 d934fcd..523fef7 100644 --- a/hosts/marty-pc/hardware.nix +++ b/hosts/marty-pc/hardware.nix @@ -20,7 +20,7 @@ "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = { diff --git a/hosts/marty-pc/home.nix b/hosts/marty-pc/home.nix index 4e9b0bf..f9c1281 100644 --- a/hosts/marty-pc/home.nix +++ b/hosts/marty-pc/home.nix @@ -87,6 +87,7 @@ "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 8cf2c59..8403779 100644 --- a/hosts/marty-server/default.nix +++ b/hosts/marty-server/default.nix @@ -32,4 +32,5 @@ 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 7867923..a6a7123 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,6 +78,11 @@ 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") @@ -87,6 +92,7 @@ (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 4cf882c..458ed9f 100644 --- a/modules/development/default.nix +++ b/modules/development/default.nix @@ -11,6 +11,10 @@ ./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 new file mode 100644 index 0000000..23e455e --- /dev/null +++ b/modules/development/openssl.nix @@ -0,0 +1,12 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + home.packages = with pkgs; [ + openssl + ]; +} diff --git a/modules/gaming/steam.nix b/modules/gaming/steam.nix index dfb178f..bb9d744 100644 --- a/modules/gaming/steam.nix +++ b/modules/gaming/steam.nix @@ -14,7 +14,6 @@ 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 1e3e0a6..efac50c 100644 --- a/modules/media/video.nix +++ b/modules/media/video.nix @@ -13,6 +13,8 @@ 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)"; }; }; }; @@ -22,10 +24,14 @@ 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.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 6285da2..82c1b0b 100644 --- a/system/boot.nix +++ b/system/boot.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + inputs, ... }: @@ -21,13 +22,16 @@ timeout = 3; efi.canTouchEfiVariables = true; }; - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxPackages_latest; kernel = { sysctl = { "vm.swappiness" = 10; }; }; }; + services = { + dbus.implementation = "broker"; + }; hardware = { graphics = { diff --git a/system/display-manager.nix b/system/display-manager.nix index 09049d2..795f410 100644 --- a/system/display-manager.nix +++ b/system/display-manager.nix @@ -2,6 +2,7 @@ config, pkgs, lib, + inputs, ... }: @@ -24,16 +25,21 @@ enable = true; withUWSM = true; xwayland.enable = true; - }; - programs.uwsm = { - enable = true; - waylandCompositors = { - hyprland = { - prettyName = "Hyprland"; - comment = "Hyprland compositor managed by UWSM"; - binPath = "/run/current-system/sw/bin/start-hyprland"; - }; + 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 ebf19e5..872e5a3 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -8,8 +8,14 @@ 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 bebd807..5efa0f7 100644 --- a/system/nixos-cli.nix +++ b/system/nixos-cli.nix @@ -6,5 +6,5 @@ }: { - services.nixos-cli.enable = true; + programs.nixos-cli.enable = true; }