From 6f52c1d453d857fb507697703b8595a2e6679632 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 15 Nov 2025 16:50:38 -0600 Subject: [PATCH] Updated system --- flake.lock | 402 +++++++++++++-------------- flake.nix | 58 ++-- modules/system/hyprland/default.nix | 17 +- modules/user/art/default.nix | 15 +- modules/user/engineering/default.nix | 31 ++- modules/user/hyprland/default.nix | 1 - modules/user/music/default.nix | 36 +-- modules/user/recording/default.nix | 16 +- 8 files changed, 312 insertions(+), 264 deletions(-) diff --git a/flake.lock b/flake.lock index 97bea80..4d566f1 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1755946532, - "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1762541446, - "narHash": "sha256-9L4jyN+ByqdjpsymZW+W56IV3D1mi63D9hm4bcltlfI=", + "lastModified": 1762914521, + "narHash": "sha256-L+K/guWSudeo2AuhyijFAb48CBAkPoBO1kBVYN5jRnU=", "owner": "StevenBlack", "repo": "hosts", - "rev": "99bdb28ee250dd2ad83eeefda0bf64e6262a46ca", + "rev": "eb8b88d342f8f7b23427c17df6590926849a33af", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762542222, - "narHash": "sha256-d46HIbWOP7NXcKPYnO+E1ihn2O5cscsvGr8oQSrVQKg=", + "lastModified": 1762971638, + "narHash": "sha256-p7v0KH6uvX04lRPD0yOjUhciCYwtaCl7TY2MUESFzWM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "38976b6f30bf13c208066a2f9271b4f5367e4b78", + "rev": "505b7eae237867d71c65011c3e9dbcbf07e1925c", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1762593927, - "narHash": "sha256-5MYTB/RUF197w6KwTqnZB0sgOiPp+tqaDdEOJrZ6cuA=", + "lastModified": 1763223771, + "narHash": "sha256-3+vbAtk04eTXTo2P1T5OBeaJLS47M5axdMkTNk0hdPM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4aaea6591714bb81186d13dcdbf9cecbcb20de72", + "rev": "fc4db08d1849e801ac15a5200602c5dae23abfaa", "type": "github" }, "original": { @@ -243,7 +243,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1762463325, - "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1762463325, - "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", + "lastModified": 1763228015, + "narHash": "sha256-1rYieMVUyZ3kK/cBIr8mOusxrOEJ1/+2MsOg0oJ7b3A=", "owner": "nix-community", "repo": "home-manager", - "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", + "rev": "96156a9e86281c4bfc451236bc2ddfe4317e6f39", "type": "github" }, "original": { @@ -401,11 +401,11 @@ ] }, "locked": { - "lastModified": 1756891319, - "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -448,13 +448,11 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": [ - "hyprland-qtutils" - ], "hyprlang": "hyprlang", "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], @@ -463,20 +461,62 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1757508065, - "narHash": "sha256-JkUkn8p/sHqjmykejd9ZMUlYyaXA+Ve9IPA71ybqloY=", + "lastModified": 1762731096, + "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "46174f78b374b6cea669c48880877a8bdcf7802f", + "rev": "967c3c7404d4fa00234e29c70df3e263386d2597", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.51.0", + "ref": "v0.52.1", "repo": "Hyprland", "type": "github" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1762465111, + "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "a415eba866a953f3096d661318f771aa0082eb98", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -489,11 +529,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1759610243, + "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "type": "github" }, "original": { @@ -502,64 +542,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "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": "hyprlang_2", - "hyprutils": [ - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -576,11 +558,11 @@ ] }, "locked": { - "lastModified": 1756810301, - "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -590,32 +572,6 @@ } }, "hyprlang_2": { - "inputs": { - "hyprutils": "hyprutils_2", - "nixpkgs": [ - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749145882, - "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_3": { "inputs": { "hyprutils": [ "hyprlock", @@ -647,13 +603,13 @@ "hyprlock": { "inputs": { "hyprgraphics": "hyprgraphics_2", - "hyprlang": "hyprlang_3", - "hyprutils": "hyprutils_3", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1759399385, @@ -670,6 +626,54 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -682,11 +686,11 @@ ] }, "locked": { - "lastModified": 1756117388, - "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", + "lastModified": 1762387740, + "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", + "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", "type": "github" }, "original": { @@ -696,33 +700,6 @@ } }, "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprland-qtutils", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprland-qtutils", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1749135356, - "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprlock", @@ -748,6 +725,35 @@ } }, "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "hyprtoolkit", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "hyprtoolkit", + "systems" + ] + }, + "locked": { + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -772,7 +778,7 @@ "type": "github" } }, - "hyprwayland-scanner_2": { + "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprlock", @@ -806,11 +812,11 @@ ] }, "locked": { - "lastModified": 1762452596, - "narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", + "lastModified": 1762856455, + "narHash": "sha256-x7zgteJWIlbVexL2ubOadUXKlHSjh0RAjLO1KfWdgpU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "99919fd35e70c1b18ce948d5329928d751031312", + "rev": "29a671ae20223d182eaf54b963a735230497c2f9", "type": "github" }, "original": { @@ -859,11 +865,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -875,11 +881,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { @@ -891,11 +897,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { @@ -906,11 +912,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -986,11 +992,11 @@ ] }, "locked": { - "lastModified": 1762274591, - "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", + "lastModified": 1762784320, + "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", + "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321", "type": "github" }, "original": { @@ -1009,11 +1015,11 @@ ] }, "locked": { - "lastModified": 1757239681, - "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -1029,7 +1035,6 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager_2", "hyprland": "hyprland", - "hyprland-qtutils": "hyprland-qtutils", "hyprlock": "hyprlock", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", @@ -1048,11 +1053,11 @@ ] }, "locked": { - "lastModified": 1762483116, - "narHash": "sha256-Z8EVsTH10BjCdFyPxbUu5jBV+HGL39rh9+beQcnNRm0=", + "lastModified": 1762915112, + "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9de55b59b6aaadbd9dbf223765a835239b767ee5", + "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "type": "github" }, "original": { @@ -1066,11 +1071,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1762569282, - "narHash": "sha256-vINZAJpXQTZd5cfh06Rcw7hesH7sGSvi+Tn+HUieJn8=", + "lastModified": 1763174172, + "narHash": "sha256-u6dcvXk2K6eYVYhmfiN3xmhIf3yUo5KPwm79UOD37Jo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a35a6144b976f70827c2fe2f5c89d16d8f9179d8", + "rev": "89af6762b01409edbb595888a69311e8e5954110", "type": "github" }, "original": { @@ -1110,7 +1115,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_4", + "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1162,21 +1167,6 @@ } }, "systems_3": { - "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" - } - }, - "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1191,7 +1181,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1297,11 +1287,11 @@ ] }, "locked": { - "lastModified": 1762415361, - "narHash": "sha256-po1Ao4hmrC4+o0fvLLT4LN2z1hJ7XPRxpEpzF3cSarQ=", + "lastModified": 1763230603, + "narHash": "sha256-ohqK5qUPGUdgOAWHI4GGzDOBXovFOzzI5p/wafTaaUI=", "owner": "winapps-org", "repo": "winapps", - "rev": "c088928440fdf80946de9131e81e081528a5e47a", + "rev": "1b43dd0fd8e99511b8933a8f3a5b80fd2536ccb8", "type": "github" }, "original": { @@ -1338,11 +1328,11 @@ ] }, "locked": { - "lastModified": 1755354946, - "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9b8cb7d..6da18af 100644 --- a/flake.nix +++ b/flake.nix @@ -1,22 +1,22 @@ { description = "Flake of LibrePhoenix"; - outputs = inputs@{ self, ... }: + outputs = + inputs@{ self, ... }: let system = "x86_64-linux"; # create patched nixpkgs - nixpkgs-patched = - (import inputs.nixpkgs { inherit system; }).applyPatches { - name = "nixpkgs-patched"; - src = inputs.nixpkgs; - patches = [ - #(builtins.fetchurl { - # url = "https://asdf1234.patch"; - # sha256 = "sha256:qwerty123456..."; - #}) - ]; - }; + nixpkgs-patched = (import inputs.nixpkgs { inherit system; }).applyPatches { + name = "nixpkgs-patched"; + src = inputs.nixpkgs; + patches = [ + #(builtins.fetchurl { + # url = "https://asdf1234.patch"; + # sha256 = "sha256:qwerty123456..."; + #}) + ]; + }; # configure pkgs # use nixpkgs if running a server (homelab or worklab profile) @@ -27,7 +27,11 @@ allowUnfree = true; allowUnfreePredicate = (_: true); }; - overlays = [ inputs.rust-overlay.overlays.default inputs.emacs-overlay.overlays.default inputs.chaotic.overlays.default ]; + overlays = [ + inputs.rust-overlay.overlays.default + inputs.emacs-overlay.overlays.default + inputs.chaotic.overlays.default + ]; }; pkgs-stable = import inputs.nixpkgs-stable { @@ -43,12 +47,17 @@ # create a list of all directories inside of ./hosts # every directory in ./hosts has config for that machine - hosts = builtins.filter (x: x != null) (lib.mapAttrsToList (name: value: if (value == "directory") then name else null) (builtins.readDir ./hosts)); + hosts = builtins.filter (x: x != null) ( + lib.mapAttrsToList (name: value: if (value == "directory") then name else null) ( + builtins.readDir ./hosts + ) + ); - in { + in + { # generate a nixos configuration for every host in ./hosts - nixosConfigurations = builtins.listToAttrs - (map (host: { + nixosConfigurations = builtins.listToAttrs ( + map (host: { name = host; value = lib.nixosSystem { system = "x86_64-linux"; @@ -79,7 +88,8 @@ inherit inputs; }; }; - }) hosts); + }) hosts + ); }; inputs = { @@ -91,16 +101,16 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland = { - url = "github:hyprwm/Hyprland/v0.51.0?submodules=true"; + url = "github:hyprwm/Hyprland/v0.52.1?submodules=true"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.hyprland-qtutils.follows = "hyprland-qtutils"; + # inputs.hyprland-qtutils.follows = "hyprland-qtutils"; }; # FIXME tmp fix - hyprland-qtutils = { - url = "github:hyprwm/hyprland-qtutils/629b15c19fa4082e4ce6be09fdb89e8c3312aed7"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #hyprland-qtutils = { + # url = "github:hyprwm/hyprland-qtutils/629b15c19fa4082e4ce6be09fdb89e8c3312aed7"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; hyprlock = { url = "github:hyprwm/hyprlock/v0.9.2"; diff --git a/modules/system/hyprland/default.nix b/modules/system/hyprland/default.nix index 001d6a0..00568cc 100644 --- a/modules/system/hyprland/default.nix +++ b/modules/system/hyprland/default.nix @@ -1,4 +1,10 @@ -{ inputs, pkgs, config, lib, ... }: +{ + inputs, + pkgs, + config, + lib, + ... +}: let cfg = config.systemSettings.hyprland; @@ -55,7 +61,9 @@ in ScreenWidth = 1920; ScreenHeight = 1080; blur = false; - };})]; + }; + }) + ]; }; services.upower.enable = true; @@ -90,7 +98,9 @@ in }; # # Ensures SDDM starts after the service. - systemd.services.sddm = { after = [ "sddm-avatar.service" ]; }; + systemd.services.sddm = { + after = [ "sddm-avatar.service" ]; + }; # xwayland services.xserver = { @@ -122,7 +132,6 @@ in alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - jack.enable = true; }; # Auto rotate screen diff --git a/modules/user/art/default.nix b/modules/user/art/default.nix index a667e6d..558768e 100644 --- a/modules/user/art/default.nix +++ b/modules/user/art/default.nix @@ -1,8 +1,15 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + pkgs-stable, + ... +}: let cfg = config.userSettings.art; -in { +in +{ options = { userSettings.art = { enable = lib.mkEnableOption "Enable art apps"; @@ -10,7 +17,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ + home.packages = with pkgs-stable; [ krita pinta inkscape @@ -22,7 +29,7 @@ in { ]; userSettings.blender.enable = true; xdg.mimeApps.defaultApplications = lib.mkForce { - "image/svg+xml" = ["org.inkscape.Inkscape.desktop"]; + "image/svg+xml" = [ "org.inkscape.Inkscape.desktop" ]; }; }; } diff --git a/modules/user/engineering/default.nix b/modules/user/engineering/default.nix index 9b692bb..0728c58 100644 --- a/modules/user/engineering/default.nix +++ b/modules/user/engineering/default.nix @@ -1,8 +1,15 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + pkgs-stable, + ... +}: let cfg = config.userSettings.engineering; -in { +in +{ options = { userSettings.engineering = { enable = lib.mkEnableOption "Enable engineering programs"; @@ -10,7 +17,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ + home.packages = with pkgs-stable; [ freecad openscad kicad @@ -24,7 +31,23 @@ in { genericName = "3D Printing Software"; icon = "cura-icon"; exec = "cura -platformtheme gtk3 %u"; - mimeType = [ "model/stl" "application/vnd.ms-3mfdocument" "application/prs.wavefront-obj" "image/bmp" "image/gif" "image/jpeg" "image/png" "text/x-gcode" "application/x-amf" "application/x-ply" "application/x-ctm" "model/vnd.collada+xml" "model/gltf-binary" "model/gltf+json" "model/vnd.collada+xml+zip" ]; + mimeType = [ + "model/stl" + "application/vnd.ms-3mfdocument" + "application/prs.wavefront-obj" + "image/bmp" + "image/gif" + "image/jpeg" + "image/png" + "text/x-gcode" + "application/x-amf" + "application/x-ply" + "application/x-ctm" + "model/vnd.collada+xml" + "model/gltf-binary" + "model/gltf+json" + "model/vnd.collada+xml+zip" + ]; terminal = false; type = "Application"; prefersNonDefaultGPU = true; diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix index 35fc567..c298016 100644 --- a/modules/user/hyprland/default.nix +++ b/modules/user/hyprland/default.nix @@ -391,7 +391,6 @@ in "size 70% 70%,title:(Resource)" "center,title:(Resource)" "tile,title:(Godot)" - "suppressevent maximize,class:^(steam)$" "float,title:^(Unlock Database - KeePassXC)$" "size 80% 85%,title:^(Unlock Database - KeePassXC)$" "center,title:^(Unlock Database - KeepassXC)$" diff --git a/modules/user/music/default.nix b/modules/user/music/default.nix index 97cba87..2989dc9 100644 --- a/modules/user/music/default.nix +++ b/modules/user/music/default.nix @@ -1,8 +1,14 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.userSettings.music; -in { +in +{ options = { userSettings.music = { enable = lib.mkEnableOption "Enable apps for making music"; @@ -11,26 +17,24 @@ in { config = lib.mkIf cfg.enable { home.packages = with pkgs; [ - ardour rosegarden - tenacity mediainfo easytag bottles # The following requires 64-bit FL Studio (FL64) to be installed to a bottle # With a bottle name of "FL Studio" (pkgs.writeShellScriptBin "flstudio" '' - #!/bin/sh - if [ -z "$1" ] - then - bottles-cli run -b "FL Studio" -p FL64 - #flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 - else - filepath=$(winepath --windows "$1") - echo \'"$filepath"\' - bottles-cli run -b "FL Studio" -p "FL64" --args \'"$filepath"\' - #flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 -args "$filepath" - fi + #!/bin/sh + if [ -z "$1" ] + then + bottles-cli run -b "FL Studio" -p FL64 + #flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 + else + filepath=$(winepath --windows "$1") + echo \'"$filepath"\' + bottles-cli run -b "FL Studio" -p "FL64" --args \'"$filepath"\' + #flatpak run --command=bottles-cli com.usebottles.bottles run -b FL\ Studio -p FL64 -args "$filepath" + fi '') (pkgs.makeDesktopItem { name = "flstudio"; @@ -39,7 +43,7 @@ in { terminal = false; type = "Application"; icon = "flstudio"; - mimeTypes = ["application/octet-stream"]; + mimeTypes = [ "application/octet-stream" ]; }) (stdenv.mkDerivation { name = "flstudio-icon"; diff --git a/modules/user/recording/default.nix b/modules/user/recording/default.nix index 065a278..85c151a 100644 --- a/modules/user/recording/default.nix +++ b/modules/user/recording/default.nix @@ -1,8 +1,15 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + pkgs-stable, + ... +}: let cfg = config.userSettings.recording; -in { +in +{ options = { userSettings.recording = { enable = lib.mkEnableOption "Enable studio recording and editing programs"; @@ -16,10 +23,9 @@ in { obs-vaapi obs-scale-to-sound ]; - home.packages = with pkgs; [ + home.packages = with pkgs-stable; [ kdePackages.kdenlive - tenacity - ardour + #tenacity ]; }; }