From bca3b74d1da8b1ee61c213fb0dd1c183138adbf7 Mon Sep 17 00:00:00 2001 From: Joshua Elmasri Date: Wed, 1 Jul 2026 20:59:13 -0500 Subject: [PATCH] stuff --- flake.lock | 680 +++++++++++++++-------- flake.nix | 22 +- hosts/desktop/configuration.nix | 67 ++- hosts/desktop/hardware-configuration.nix | 13 +- hosts/desktop/home.nix | 1 - modules/default.nix | 8 +- modules/dms/default.nix | 12 + modules/dms/settings.nix | 496 +++++++++++++++++ modules/hypr/default.nix | 28 +- modules/kitty/default.nix | 2 + modules/noctalia/default.nix | 136 ----- modules/nvim/default.nix | 31 +- modules/stylix/default.nix | 3 +- modules/zen/default.nix | 39 +- 14 files changed, 1076 insertions(+), 462 deletions(-) create mode 100644 modules/dms/default.nix create mode 100644 modules/dms/settings.nix delete mode 100644 modules/noctalia/default.nix diff --git a/flake.lock b/flake.lock index 56e6655..144462e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1778620495, - "narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=", + "lastModified": 1782073106, + "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e", + "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457", "type": "github" }, "original": { @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1779214112, - "narHash": "sha256-xV3EnoKoA3R0EHtwWWCdBfxfG6U+sY0dNyAu310J3+g=", + "lastModified": 1782062955, + "narHash": "sha256-FGZHls4eQJ8y3pvf5h3b83PfXlve3vD/Gj3g1qoAK6o=", "owner": "aylur", "repo": "astal", - "rev": "f58cae8f268dedffb6d1448b5b32f39b71953958", + "rev": "11842ae3045c1367fb3a62a2302dba0d9ccb4a33", "type": "github" }, "original": { @@ -124,11 +124,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1779085181, - "narHash": "sha256-ZdiBlGOkI9tS3ggyNlJ5gU4qCkvGWLT3sbrnHEemN2o=", + "lastModified": 1781883168, + "narHash": "sha256-raAojJGk0aWdscfFn/9ikZ6V5oUuAZcAz5kjAZ2QN3E=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "391e1e35d62d30dccd14ec3af01d58e5310b7d80", + "rev": "daed450e9b1a4fadfef68fb4fa5e2f3391fedb34", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1779082750, - "narHash": "sha256-yyk+TU5OF0JwTlTVqqvQIwsYWFZeSzGD5JqSUg52vHw=", + "lastModified": 1782242233, + "narHash": "sha256-AUwTZq++PBq0qjDVFKqD0AZNNwa0b1RK41bM9XMbkW8=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "2c2eb7e421e954960dd336d7d45c24f949475958", + "rev": "19250dcc39862169961756c733b8a6ba77754c22", "type": "github" }, "original": { @@ -153,14 +153,55 @@ "type": "github" } }, + "comfyui-nix": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1781842085, + "narHash": "sha256-uGt5HQ+hm0EeIjWoJUq7HefgkSc1h7kf1vFKvOl0tcs=", + "owner": "utensils", + "repo": "comfyui-nix", + "rev": "308a863c136ffc35fce293a81eac5d229b31d56d", + "type": "github" + }, + "original": { + "owner": "utensils", + "repo": "comfyui-nix", + "type": "github" + } + }, + "dms": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1777431599, + "narHash": "sha256-g6r/Gx8PTDzO3jCNzzySA+Ff1lmLF9nDlMCNyyoQjoE=", + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "rev": "eb5afcdc40ea5446c27e18552ff4a19f9daf9484", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "ref": "stable", + "repo": "DankMaterialShell", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1776136500, - "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", + "lastModified": 1779670703, + "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", + "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", "type": "github" }, "original": { @@ -237,11 +278,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -253,10 +294,28 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "nixvim", + "hermes-agent", "nixpkgs" ] }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, "locked": { "lastModified": 1778716662, "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", @@ -271,7 +330,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -279,11 +338,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -328,6 +387,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -392,11 +469,11 @@ ] }, "locked": { - "lastModified": 1778793197, - "narHash": "sha256-8LCG0dpEUHLnBRp3bplUeYVq99ffxCaZyPdaBd+Z0wY=", + "lastModified": 1782472279, + "narHash": "sha256-y8FjnKvdaMWq7MeQ+vIb+baVu7PmWGMl/r7zTZnGi8A=", "owner": "AlvaroParker", "repo": "helium-nix", - "rev": "bc9d6046d947cf1ee72f0bc0a10a483d606e46ac", + "rev": "46dbd8424ea62f65a22358b83788e6d764611529", "type": "github" }, "original": { @@ -405,6 +482,29 @@ "type": "github" } }, + "hermes-agent": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", + "npm-lockfile-fix": "npm-lockfile-fix", + "pyproject-build-systems": "pyproject-build-systems", + "pyproject-nix": "pyproject-nix_2", + "uv2nix": "uv2nix_2" + }, + "locked": { + "lastModified": 1782875301, + "narHash": "sha256-+AaNr17aYLIQEUYawerhGS3DAzl1qJkC1w0O4UxaEEk=", + "owner": "NousResearch", + "repo": "hermes-agent", + "rev": "44ddc552f5e054759a6970af8997ea588a9d81c9", + "type": "github" + }, + "original": { + "owner": "NousResearch", + "repo": "hermes-agent", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -412,11 +512,11 @@ ] }, "locked": { - "lastModified": 1779213149, - "narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=", + "lastModified": 1782839684, + "narHash": "sha256-vzs4SBgPsK4aNzlJR2PpFwtARazXMOxZonQnDz0YHxk=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd868f769a69d3b6091a1da68a75cb83a181033c", + "rev": "2a37d71bbe69e1522ddabf03a4cea0374958bdbe", "type": "github" }, "original": { @@ -470,11 +570,11 @@ ] }, "locked": { - "lastModified": 1776426399, - "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", + "lastModified": 1782566056, + "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", + "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8", "type": "github" }, "original": { @@ -494,17 +594,17 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1779190425, - "narHash": "sha256-C0hPhLeo3ztBXYSnpYarYjw6HDvlgZRnNyFfG5PoaVI=", + "lastModified": 1782851696, + "narHash": "sha256-70eEBTex+S/t+IdaawQNYySspXU9VpT4/44df8dJczs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "203a121537d0868bd4d8258b58861ca970483157", + "rev": "a4284c1e754ca26a0803e223b974045d25fabccd", "type": "github" }, "original": { @@ -546,11 +646,11 @@ ] }, "locked": { - "lastModified": 1776426575, - "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", + "lastModified": 1782563850, + "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "a968d211048e3ed538e47b84cb3649299578f19d", + "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178", "type": "github" }, "original": { @@ -576,11 +676,11 @@ ] }, "locked": { - "lastModified": 1779209205, - "narHash": "sha256-asc7NpeB8vD66gvZeYcQkaWOs2X6Jgd29vBtP17vjxo=", + "lastModified": 1782769258, + "narHash": "sha256-HAhqQOoz4S0gzIOMnClL49B+rMT7zdp3UDWeqxtMs/k=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "1cb37fad68dff5f5840010c314fed5809b4ee66f", + "rev": "71b8953d7d92dbebe87a6ff9895bdd30e7495873", "type": "github" }, "original": { @@ -682,11 +782,11 @@ ] }, "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", + "lastModified": 1782554491, + "narHash": "sha256-+p3MlyN/nqRefcf2IckPlGRUn9+hielqpS9XClbLleM=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", + "rev": "bdba25ced39ea39ab004a8f31593ba0b0ff1ca35", "type": "github" }, "original": { @@ -707,11 +807,11 @@ ] }, "locked": { - "lastModified": 1778234770, - "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=", + "lastModified": 1782639496, + "narHash": "sha256-mjt47Xun3jPcGrXpGpYU85lzUnqvJ2rXLbQjVI1yvLo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2", + "rev": "d2b40ffe7bfcb001bbf5888bb56ff646de53e7db", "type": "github" }, "original": { @@ -774,30 +874,32 @@ "type": "github" } }, - "luajit-src": { - "flake": false, + "lazyvim": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1763177035, - "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", - "owner": "SteamClientHomebrew", - "repo": "LuaJIT", - "rev": "89550023569c3e195e75e12951c067fe5591e0d2", + "lastModified": 1781223826, + "narHash": "sha256-ezB1SLk4wyBkJZC9NHKn21FsheyVdmFha+FO/6tflO4=", + "owner": "pfassina", + "repo": "lazyvim-nix", + "rev": "d1f9bd2bfff35708dfaf75351bce06580a862f61", "type": "github" }, "original": { - "owner": "SteamClientHomebrew", - "ref": "v2.1", - "repo": "LuaJIT", + "owner": "pfassina", + "repo": "lazyvim-nix", "type": "github" } }, "master": { "locked": { - "lastModified": 1779217787, - "narHash": "sha256-TJkFauCqX8VX1SGOcibdCUHAapfRV14+/YhJZw8or4U=", + "lastModified": 1782872117, + "narHash": "sha256-1OTpVD4z4KsG+WPH8O2BshANoWyCaaUCYf3ZMhslsHI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89bd4efcc1560dd8ee8e4562f3cf768b23be8513", + "rev": "536c906eb9a9a2a38e7a454f4a4ff254b1e6f493", "type": "github" }, "original": { @@ -809,17 +911,16 @@ }, "millennium": { "inputs": { - "luajit-src": "luajit-src", "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_5" }, "locked": { "dir": "packages/nix", - "lastModified": 1778870989, - "narHash": "sha256-0GHc0BjLwPIqJxlD8SrG2baM1nXdIt/yc8UbQvyh/Go=", + "lastModified": 1782693511, + "narHash": "sha256-ytACEe0dcb9RgBB4sioGZGzn9H/zhSYI4HE9uXcRgw0=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "b59659da33ee5094cdbff6adb0b71c25bbb335ed", + "rev": "e58ead4df900a4391ee1e6a7efe9294d6283aeb3", "type": "github" }, "original": { @@ -832,23 +933,23 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1778867291, - "narHash": "sha256-NAnUiDGX+dHSj6OgmJgTEnNHyL8WkOGxxt3T3NDoI/Q=", + "lastModified": 1782175707, + "narHash": "sha256-nAgnski2c247PqLtcK3g5NER7hVj/zlCJd9CTb2lne4=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "233f417dd99b3ece34d15b75e7cf5fd9d4487f15", + "rev": "5729ba4bb432a071a0276abb416b2c26d27afa71", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "233f417dd99b3ece34d15b75e7cf5fd9d4487f15", + "rev": "5729ba4bb432a071a0276abb416b2c26d27afa71", "type": "github" } }, "naviterm": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -872,15 +973,15 @@ "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1779131761, - "narHash": "sha256-DIdXwxWzhECkp2n/OF15llkEHoGXLjwjCCg7oU+Qd2o=", + "lastModified": 1782415778, + "narHash": "sha256-Qts73QQA+lADfxWjonL3Q1JcZssVZPsQI38L3qZyS0o=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "56707a2b9725fd5b030f508565ae3a1327d6ac44", + "rev": "1740ec90e7b07730c212a3a1ff5e71af08a5270b", "type": "github" }, "original": { @@ -893,14 +994,14 @@ "nixos-apple-silicon": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1779108522, - "narHash": "sha256-j3nAJ6WzTLE6bXDOgQ7BeXKHP1BBEf5vLmp9lFwGef0=", + "lastModified": 1782749693, + "narHash": "sha256-Dj2m93PXWyOoXyp9tQlyjtBPbpVobKUrgnVDNNsNT1o=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "380d1cc7c8b07ab72ffadf9896748c0aaccd12a3", + "rev": "b6ed8c114eee6739e3a2c06d99e2e19ac608dedf", "type": "github" }, "original": { @@ -911,11 +1012,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -926,6 +1027,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1777168982, "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", @@ -942,15 +1058,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", - "owner": "nixos", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -958,27 +1074,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1779024751, - "narHash": "sha256-fIE/HazjcoU/27WI3//uVg5AIntnVo1Q/GjMuBwPuHw=", + "lastModified": 1782467914, + "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3849902757e881ccbf21df80d592e3b94a35131c", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1777578337, - "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -990,36 +1106,67 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1782378976, + "narHash": "sha256-UqQgBlQATXM3aBvzTRE/1wxHrCdKg5/ePlXfG/7Eqd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "5df71f3d167f0aad71658608361c1301147b9eb6", "type": "github" }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1782467914, + "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1782723713, + "narHash": "sha256-T6OhkwGyyGHer1lr4GkbOp//7ii23xLE7HuMmjrdkXI=", + "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1024265.b5aa0fbd5389/nixexprs.tar.xz" + }, "original": { "id": "nixpkgs", "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -1035,67 +1182,24 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6", - "systems": "systems_4" - }, - "locked": { - "lastModified": 1779199181, - "narHash": "sha256-8x/CeqkYNAAOY+Pa5Huyh0aiUmFcOUAyq3VdYxHb5K4=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "13ba3f7ca9da3d49e959745f6d0d1e7a662c1984", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "noctalia": { + "npm-lockfile-fix": { "inputs": { "nixpkgs": [ + "hermes-agent", "nixpkgs" - ], - "noctalia-qs": "noctalia-qs" + ] }, "locked": { - "lastModified": 1779125269, - "narHash": "sha256-vMF9Hd5/UoLggIJcLKK/oC1SnxoQdgIaUMdVB48zQ7A=", - "owner": "noctalia-dev", - "repo": "noctalia-shell", - "rev": "da95089dfe5148ee7fb33b3faa314e86de1e6f25", + "lastModified": 1775903712, + "narHash": "sha256-2GV79U6iVH4gKAPWYrxUReB0S41ty/Y3dBLquU8AlaA=", + "owner": "jeslie0", + "repo": "npm-lockfile-fix", + "rev": "c6093acb0c0548e0f9b8b3d82918823721930fe8", "type": "github" }, "original": { - "owner": "noctalia-dev", - "repo": "noctalia-shell", - "type": "github" - } - }, - "noctalia-qs": { - "inputs": { - "nixpkgs": [ - "noctalia", - "nixpkgs" - ], - "systems": "systems_5", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1778983195, - "narHash": "sha256-hE3EFK5GoSdbO5WHZ8bZDUVYkofbDLQN/KK25z7IOOI=", - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "rev": "4116b41cdc89e186be7cb8b24a9b6022af95d742", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-qs", + "owner": "jeslie0", + "repo": "npm-lockfile-fix", "type": "github" } }, @@ -1111,11 +1215,11 @@ ] }, "locked": { - "lastModified": 1777598946, - "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", + "lastModified": 1780281641, + "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", "owner": "nix-community", "repo": "NUR", - "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", + "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", "type": "github" }, "original": { @@ -1134,11 +1238,11 @@ ] }, "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", + "lastModified": 1781733627, + "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", + "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", "type": "github" }, "original": { @@ -1147,21 +1251,133 @@ "type": "github" } }, + "pyproject-build-systems": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "nixpkgs" + ], + "pyproject-nix": "pyproject-nix", + "uv2nix": "uv2nix" + }, + "locked": { + "lastModified": 1772555609, + "narHash": "sha256-3BA3HnUvJSbHJAlJj6XSy0Jmu7RyP2gyB/0fL7XuEDo=", + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "rev": "c37f66a953535c394244888598947679af231863", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "build-system-pkgs", + "type": "github" + } + }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "pyproject-build-systems", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769936401, + "narHash": "sha256-kwCOegKLZJM9v/e/7cqwg1p/YjjTAukKPqmxKnAZRgA=", + "owner": "nix-community", + "repo": "pyproject.nix", + "rev": "b0d513eeeebed6d45b4f2e874f9afba2021f7812", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "pyproject.nix", + "type": "github" + } + }, + "pyproject-nix_2": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772865871, + "narHash": "sha256-/ZTSg97aouL0SlPHaokA4r3iuH9QzHVuWPACD2CUCFY=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "e537db02e72d553cea470976b9733581bcf5b3ed", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, + "pyproject-nix_3": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "uv2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771518446, + "narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "dms", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776854048, + "narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=", + "ref": "refs/heads/master", + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", + "revCount": 806, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + }, + "original": { + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + } + }, "root": { "inputs": { "astal": "astal", + "comfyui-nix": "comfyui-nix", + "dms": "dms", "helium": "helium", + "hermes-agent": "hermes-agent", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", + "lazyvim": "lazyvim", "master": "master", "millennium": "millennium", "naviterm": "naviterm", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixos-apple-silicon": "nixos-apple-silicon", - "nixpkgs": "nixpkgs_5", - "nixvim": "nixvim", - "noctalia": "noctalia", + "nixpkgs": "nixpkgs_8", "stylix": "stylix", "subtui": "subtui", "zen-browser": "zen-browser" @@ -1174,24 +1390,24 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur", - "systems": "systems_6", + "systems": "systems_5", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1778776709, - "narHash": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=", + "lastModified": 1782771270, + "narHash": "sha256-1W5Oga37XF1fzjpUut98j32NS9XcLQ5HmZDuOqSSrrY=", "owner": "nix-community", "repo": "stylix", - "rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819", + "rev": "47571deb317bb1e53fbbe9c3cbf2a941cd94f794", "type": "github" }, "original": { @@ -1202,14 +1418,14 @@ }, "subtui": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1779094671, - "narHash": "sha256-TyEYtSFYo4ocJH/C+DiUEZyzrD1PqrTCHrFLFjY9pR8=", + "lastModified": 1781632627, + "narHash": "sha256-95OHepaioeWKE6xCq/nDqqKw/tjf3AxodYkkfJhhwlk=", "owner": "MattiaPun", "repo": "SubTUI", - "rev": "68123dc712b5ba99fa40d2beed9c1b8f3e875037", + "rev": "5c9b59be38340876d803e3f883e663ac3c1cc856", "type": "github" }, "original": { @@ -1279,21 +1495,6 @@ } }, "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" - } - }, - "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1327,11 +1528,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777041405, - "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", + "lastModified": 1777806186, + "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", + "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", "type": "github" }, "original": { @@ -1343,11 +1544,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1777169200, - "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", + "lastModified": 1778379944, + "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", + "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", "type": "github" }, "original": { @@ -1359,11 +1560,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1777463218, - "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", + "lastModified": 1778378178, + "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", + "rev": "9cd816033ff969415b190722cddf134e78a5665f", "type": "github" }, "original": { @@ -1372,25 +1573,52 @@ "type": "github" } }, - "treefmt-nix": { + "uv2nix": { "inputs": { "nixpkgs": [ - "noctalia", - "noctalia-qs", + "hermes-agent", + "pyproject-build-systems", "nixpkgs" + ], + "pyproject-nix": [ + "hermes-agent", + "pyproject-build-systems", + "pyproject-nix" ] }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "lastModified": 1770770348, + "narHash": "sha256-A2GzkmzdYvdgmMEu5yxW+xhossP+txrYb7RuzRaqhlg=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "5d1b2cb4fe3158043fbafbbe2e46238abbc954b0", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "pyproject-nix", + "repo": "uv2nix", + "type": "github" + } + }, + "uv2nix_2": { + "inputs": { + "nixpkgs": [ + "hermes-agent", + "nixpkgs" + ], + "pyproject-nix": "pyproject-nix_3" + }, + "locked": { + "lastModified": 1773039484, + "narHash": "sha256-+boo33KYkJDw9KItpeEXXv8+65f7hHv/earxpcyzQ0I=", + "owner": "pyproject-nix", + "repo": "uv2nix", + "rev": "b68be7cfeacbed9a3fa38a2b5adc0cfb81d9bb1f", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "uv2nix", "type": "github" } }, @@ -1422,11 +1650,11 @@ ] }, "locked": { - "lastModified": 1778265244, - "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=", + "lastModified": 1782311043, + "narHash": "sha256-07zLc2M3/ax+JsjxGTft17/Joua41LHE9/9AC/F9zeU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968", + "rev": "882ad01e195ce201b07c618bbee44a0cad8b9e5a", "type": "github" }, "original": { @@ -1445,11 +1673,11 @@ ] }, "locked": { - "lastModified": 1779093899, - "narHash": "sha256-wzHbwUimm45J5r+d4VOi2rrRWwvYimP6OM8BJBIHbYc=", + "lastModified": 1782812215, + "narHash": "sha256-OPVK9WW9QsO2aj1R+Ln3p7fniFj5h441vb3LyrzpeE4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d21282d88c6bd4b3dc692566c5d84de39f7a96c0", + "rev": "a7c2a9a5e492e0e62072547f7e4c2abf138425c5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 77d4cfb..83c32db 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,8 @@ url = "github:AlvaroParker/helium-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + comfyui-nix.url = "github:utensils/comfyui-nix"; + hermes-agent.url = "github:NousResearch/hermes-agent"; naviterm = { url = "gitlab:detoxify92/naviterm"; inputs.nixpkgs.follows = "nixpkgs"; @@ -29,13 +31,12 @@ millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; master.url = "github:NixOS/nixpkgs/master"; home-manager.url = "github:nix-community/home-manager"; - noctalia = { - url = "github:noctalia-dev/noctalia-shell"; + dms = { + url = "github:AvengeMedia/DankMaterialShell/stable"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim = { - url = "github:nix-community/nixvim"; - #inputs.nixpkgs.follows = "nixpkgs"; + lazyvim = { + url = "github:pfassina/lazyvim-nix"; }; subtui = { url = "github:MattiaPun/SubTUI"; @@ -51,7 +52,7 @@ }; - outputs = { self, stylix, astal, nixpkgs, home-manager, zen-browser, master, nixos-apple-silicon, subtui, nix-cachyos-kernel, nixvim, noctalia,... }@inputs: + outputs = { self, stylix, astal, nixpkgs, home-manager, comfyui-nix, zen-browser, master, nixos-apple-silicon, subtui, nix-cachyos-kernel, hermes-agent, lazyvim,... }@inputs: let system = "x86_64-linux"; lib = nixpkgs.lib; @@ -63,23 +64,24 @@ nixosConfigurations = { nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit nixvim; inherit pkgs-master;}; + specialArgs = {inherit lazyvim; inherit pkgs-master;}; specialArgs.inputs = inputs; modules = [ ./hosts/desktop/configuration.nix + hermes-agent.nixosModules.default home-manager.nixosModules.home-manager { home-manager.useUserPackages = true; home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.users.joshuaelm = { - imports = [ ./hosts/desktop/home.nix nixvim.homeModules.nixvim stylix.homeModules.stylix ]; + imports = [ ./hosts/desktop/home.nix stylix.homeModules.stylix ]; }; } ]; }; nixos-laptop = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; - specialArgs = {inherit nixvim;}; + specialArgs = {inherit lazyvim;}; specialArgs.inputs = inputs; modules = [ { @@ -92,7 +94,7 @@ home-manager.useUserPackages = true; home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.users.joshuaelm = { - imports = [ ./hosts/mac-laptop/home.nix nixvim.homeModules.nixvim stylix.homeModules.stylix ]; + imports = [ ./hosts/mac-laptop/home.nix stylix.homeModules.stylix ]; }; } ]; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index fb96c6a..a43c7b8 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -5,6 +5,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + inputs.dms.nixosModules.dank-material-shell ]; # Bootloader. @@ -14,7 +15,7 @@ boot.loader.grub.efiSupport = true;*/ boot.loader.limine = { enable = true; - secureBoot.enable = true; + resolution = "3840x2160"; }; boot.initrd.systemd.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -91,6 +92,8 @@ boot = { }; + services.udev.packages = [ pkgs.boxflat ]; + services.udev.extraRules = '' # This rule was added by Solaar. # @@ -183,6 +186,10 @@ LABEL="solaar_end" programs.hyprland = { enable = true; }; + services.displayManager.dms-greeter = { + enable = true; + compositor.name = "hyprland"; # Or "hyprland" or "sway" + }; /*services.displayManager = { autoLogin.enable = true; autoLogin.user = "joshuaelm"; @@ -190,7 +197,7 @@ LABEL="solaar_end" security.pam.services.hyprlock = {}; programs.noisetorch.enable = true; - services.greetd = { + /*services.greetd = { enable = true; settings = rec { hyprland_session = { @@ -203,7 +210,8 @@ LABEL="solaar_end" }; default_session = hyprland_session; }; - }; + };*/ + # Steam Deck Gamemode programs.steam.gamescopeSession.enable = true; @@ -285,23 +293,20 @@ services.pulseaudio.extraConfig = '' nix.optimise.automatic = true; + programs.appimage.enable = true; + programs.appimage.binfmt = true; + programs.appimage.package = pkgs.appimage-run.override { extraPkgs = pkgs: [ + pkgs.icu + pkgs.libxcrypt-legacy + pkgs.python312 + pkgs.python312Packages.torch + ]; }; + # Allow unfree packages nixpkgs.config.allowUnfree = true; # Configure drives - fileSystems."/mnt/Games" = { - device = "/dev/disk/by-uuid/732d1907-5225-48a9-834e-e239af475b79"; - fsType = "btrfs"; - options = [ - "users" - "nofail" - "x-gvfs-show" - "exec" - ]; - }; - - fileSystems."/mnt/More-Games" = { device = "/dev/disk/by-uuid/f0f2dd27-f802-40f6-827b-23e0462b55f6"; fsType = "btrfs"; @@ -339,7 +344,22 @@ services.pulseaudio.extraConfig = '' alsa-lib atk cairo cups curl dbus expat file fish fontconfig freetype fuse glib gtk3 libGL libnotify libxml2 libxslt netcat nspr nss openjdk8 openssl.dev cava pango appimage-run pkg-config strace udev vulkan-loader watch wget which - libX11 icu libxcb libXcomposite libXcursor + libX11 icu libxcb libXcomposite libXcursor libgbm libxkbcommon zstd libxcb-cursor qt6.qtwayland + xorg.xcbutilwm # libxcb-icccm.so.4 + xorg.xcbutilkeysyms # libxcb-keysyms.so.1 + xorg.xcbutilimage # libxcb-image.so.0 + xorg.xcbutilrenderutil # libxcb-render-util.so.0 + xorg.xcbutil # libxcb-util.so.1 + xorg.xcbutilcursor # libxcb-cursor.so.0 (belt-and-suspenders) + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXi + libtiff + libkrb5 + wayland + wayland-protocols + fuse2 libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver openssl libxshmfence libXtst xcbutilkeysyms zlib fontconfig.lib SDL2 libGL libuuid libXft @@ -359,19 +379,19 @@ services.pulseaudio.extraConfig = '' # cemu broken with latest update wget unzip + appimage-run wayvr + inputs.comfyui-nix.packages.${pkgs.stdenv.hostPlatform.system}.rocm winetricks cowsay pfetch ryubing - inputs.subtui.packages.${pkgs.stdenv.hostPlatform.system}.default mpv - pkgs-master.gelly + llama-cpp-rocm android-tools gomatrix python3 pavucontrol - sbctl boxflat bluebubbles thunar @@ -379,7 +399,6 @@ services.pulseaudio.extraConfig = '' wiremix steamtinkerlaunch wineWow64Packages.wayland - blueman lapce prismlauncher protonup-qt @@ -485,6 +504,14 @@ services.pulseaudio.extraConfig = '' networking.firewall.allowedUDPPorts = [ 7860 8188 9943 9944 3042 47990 3246 11434 7801 4800 48010 ]; # Or disable the firewall altogether. networking.firewall.enable = false; + services.resolved.enable = true; + + boot.kernel.sysctl = { + "net.core.rmem_max" = 268435456; + "net.core.wmem_max" = 268435456; + "net.ipv4.tcp_rmem" = "4096 87380 268435456"; + "net.ipv4.tcp_wmem" = "4096 65536 268435456"; +}; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index a79152a..4b39670 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -8,31 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/6452f60b-602c-42ae-bff6-7b0a35e59bfb"; + { device = "/dev/disk/by-uuid/21e74977-d8a1-489f-8215-aef8f9bae35a"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/9947-B99A"; + { device = "/dev/disk/by-uuid/1B0C-E66A"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = [ ]; - # 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 - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index b1ecd3b..47259e2 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -29,7 +29,6 @@ home.file.".icons/default".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic"; services.mpd-mpris.enable = true; - gtk.gtk4.theme = null; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage diff --git a/modules/default.nix b/modules/default.nix index 2f88c69..215cfec 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,14 +3,14 @@ { imports = [ - ./stylix + ./dms + ./nvim ./cava ./hypr - ./kitty - ./noctalia + ./kitty ./nushell - ./nvim ./starship + # ./stylix ./yazi ./zen ./helium diff --git a/modules/dms/default.nix b/modules/dms/default.nix new file mode 100644 index 0000000..b783b2e --- /dev/null +++ b/modules/dms/default.nix @@ -0,0 +1,12 @@ +{pkgs, config, inputs, ...}: + +{ + imports = [ + inputs.dms.homeModules.dank-material-shell + ]; + programs.dank-material-shell = { + enable = true; + + settings = import ./settings.nix; + }; +} diff --git a/modules/dms/settings.nix b/modules/dms/settings.nix new file mode 100644 index 0000000..3588711 --- /dev/null +++ b/modules/dms/settings.nix @@ -0,0 +1,496 @@ +{ + currentThemeName = "dynamic"; + currentThemeCategory = "dynamic"; + customThemeFile = ""; + registryThemeVariants = {}; + matugenScheme = "scheme-tonal-spot"; + runUserMatugenTemplates = true; + matugenTargetMonitor = ""; + popupTransparency = 1; + dockTransparency = 1; + widgetBackgroundColor = "sch"; + widgetColorMode = "default"; + controlCenterTileColorMode = "primary"; + buttonColorMode = "primary"; + cornerRadius = 12; + niriLayoutGapsOverride = -1; + niriLayoutRadiusOverride = -1; + niriLayoutBorderSize = -1; + hyprlandLayoutGapsOverride = -1; + hyprlandLayoutRadiusOverride = -1; + hyprlandLayoutBorderSize = -1; + mangoLayoutGapsOverride = -1; + mangoLayoutRadiusOverride = -1; + mangoLayoutBorderSize = -1; + use24HourClock = true; + showSeconds = false; + padHours12Hour = false; + useFahrenheit = false; + windSpeedUnit = "kmh"; + nightModeEnabled = false; + animationSpeed = 1; + customAnimationDuration = 500; + syncComponentAnimationSpeeds = true; + popoutAnimationSpeed = 1; + popoutCustomAnimationDuration = 150; + modalAnimationSpeed = 1; + modalCustomAnimationDuration = 150; + enableRippleEffects = true; + blurEnabled = false; + blurForegroundLayers = true; + blurLayerOutlineOpacity = 0.12; + blurBorderColor = "outline"; + blurBorderCustomColor = "#ffffff"; + blurBorderOpacity = 0.35; + wallpaperFillMode = "Fill"; + blurredWallpaperLayer = false; + blurWallpaperOnOverview = false; + showLauncherButton = true; + showWorkspaceSwitcher = true; + showFocusedWindow = true; + showWeather = true; + showMusic = true; + showClipboard = true; + showCpuUsage = true; + showMemUsage = true; + showCpuTemp = true; + showGpuTemp = true; + selectedGpuIndex = 0; + enabledGpuPciIds = []; + showSystemTray = true; + systemTrayIconTintMode = "none"; + systemTrayIconTintSaturation = 50; + systemTrayIconTintStrength = 135; + showClock = true; + showNotificationButton = true; + showBattery = true; + showControlCenterButton = true; + showCapsLockIndicator = true; + controlCenterShowNetworkIcon = true; + controlCenterShowBluetoothIcon = true; + controlCenterShowAudioIcon = true; + controlCenterShowAudioPercent = false; + controlCenterShowVpnIcon = true; + controlCenterShowBrightnessIcon = false; + controlCenterShowBrightnessPercent = false; + controlCenterShowMicIcon = false; + controlCenterShowMicPercent = false; + controlCenterShowBatteryIcon = false; + controlCenterShowPrinterIcon = false; + controlCenterShowScreenSharingIcon = true; + showPrivacyButton = true; + privacyShowMicIcon = false; + privacyShowCameraIcon = false; + privacyShowScreenShareIcon = false; + controlCenterWidgets = [ + { id = "volumeSlider"; enabled = true; width = 50; } + { id = "brightnessSlider"; enabled = true; width = 50; } + { id = "wifi"; enabled = true; width = 50; } + { id = "bluetooth"; enabled = true; width = 50; } + { id = "audioOutput"; enabled = true; width = 50; } + { id = "audioInput"; enabled = true; width = 50; } + { id = "nightMode"; enabled = true; width = 50; } + { id = "darkMode"; enabled = true; width = 50; } + ]; + showWorkspaceIndex = false; + showWorkspaceName = false; + showWorkspacePadding = false; + workspaceScrolling = false; + showWorkspaceApps = false; + workspaceDragReorder = true; + maxWorkspaceIcons = 3; + workspaceAppIconSizeOffset = 0; + groupWorkspaceApps = true; + workspaceFollowFocus = false; + showOccupiedWorkspacesOnly = false; + reverseScrolling = false; + dwlShowAllTags = false; + workspaceColorMode = "default"; + workspaceOccupiedColorMode = "none"; + workspaceUnfocusedColorMode = "default"; + workspaceUrgentColorMode = "default"; + workspaceFocusedBorderEnabled = false; + workspaceFocusedBorderColor = "primary"; + workspaceFocusedBorderThickness = 2; + workspaceNameIcons = {}; + waveProgressEnabled = true; + scrollTitleEnabled = true; + audioVisualizerEnabled = true; + audioScrollMode = "volume"; + audioWheelScrollAmount = 5; + clockCompactMode = false; + focusedWindowCompactMode = false; + runningAppsCompactMode = true; + barMaxVisibleApps = 0; + barMaxVisibleRunningApps = 0; + barShowOverflowBadge = true; + appsDockHideIndicators = false; + appsDockColorizeActive = false; + appsDockActiveColorMode = "primary"; + appsDockEnlargeOnHover = false; + appsDockEnlargePercentage = 125; + appsDockIconSizePercentage = 100; + keyboardLayoutNameCompactMode = false; + runningAppsCurrentWorkspace = true; + runningAppsGroupByApp = false; + runningAppsCurrentMonitor = false; + appIdSubstitutions = [ + { pattern = "Spotify"; replacement = "spotify"; type = "exact"; } + { pattern = "beepertexts"; replacement = "beeper"; type = "exact"; } + { pattern = "home assistant desktop"; replacement = "homeassistant-desktop"; type = "exact"; } + { pattern = "com.transmissionbt.transmission"; replacement = "transmission-gtk"; type = "contains"; } + { pattern = "^steam_app_(\\d+)$"; replacement = "steam_icon_$1"; type = "regex"; } + ]; + centeringMode = "index"; + clockDateFormat = ""; + lockDateFormat = ""; + greeterRememberLastSession = true; + greeterRememberLastUser = true; + greeterEnableFprint = false; + greeterEnableU2f = false; + greeterWallpaperPath = ""; + mediaSize = 1; + appLauncherViewMode = "list"; + spotlightModalViewMode = "list"; + browserPickerViewMode = "grid"; + browserUsageHistory = {}; + appPickerViewMode = "grid"; + filePickerUsageHistory = {}; + sortAppsAlphabetically = false; + appLauncherGridColumns = 4; + spotlightCloseNiriOverview = true; + spotlightSectionViewModes = {}; + appDrawerSectionViewModes = {}; + niriOverviewOverlayEnabled = true; + dankLauncherV2Size = "compact"; + dankLauncherV2BorderEnabled = false; + dankLauncherV2BorderThickness = 2; + dankLauncherV2BorderColor = "primary"; + dankLauncherV2ShowFooter = true; + dankLauncherV2UnloadOnClose = false; + useAutoLocation = false; + weatherEnabled = true; + networkPreference = "auto"; + iconTheme = "System Default"; + cursorSettings = { + theme = "System Default"; + size = 24; + niri = { + hideWhenTyping = false; + hideAfterInactiveMs = 0; + }; + hyprland = { + hideOnKeyPress = false; + hideOnTouch = false; + inactiveTimeout = 0; + }; + dwl = { + cursorHideTimeout = 0; + }; + }; + launcherLogoMode = "apps"; + launcherLogoCustomPath = ""; + launcherLogoColorOverride = ""; + launcherLogoColorInvertOnMode = false; + launcherLogoBrightness = 0.5; + launcherLogoContrast = 1; + launcherLogoSizeOffset = 0; + fontFamily = "Inter Variable"; + monoFontFamily = "Fira Code"; + fontWeight = 400; + fontScale = 1; + notepadUseMonospace = true; + notepadFontFamily = ""; + notepadFontSize = 14; + notepadShowLineNumbers = false; + notepadTransparencyOverride = -1; + notepadLastCustomTransparency = 0.7; + soundsEnabled = true; + useSystemSoundTheme = false; + soundNewNotification = true; + soundVolumeChanged = true; + soundPluggedIn = true; + acMonitorTimeout = 0; + acLockTimeout = 0; + acSuspendTimeout = 0; + acSuspendBehavior = 0; + acProfileName = ""; + batteryMonitorTimeout = 0; + batteryLockTimeout = 0; + batterySuspendTimeout = 0; + batterySuspendBehavior = 0; + batteryProfileName = ""; + batteryChargeLimit = 100; + lockBeforeSuspend = false; + loginctlLockIntegration = true; + fadeToLockEnabled = true; + fadeToLockGracePeriod = 5; + fadeToDpmsEnabled = true; + fadeToDpmsGracePeriod = 5; + launchPrefix = ""; + brightnessDevicePins = {}; + wifiNetworkPins = {}; + bluetoothDevicePins = {}; + audioInputDevicePins = {}; + audioOutputDevicePins = {}; + gtkThemingEnabled = false; + qtThemingEnabled = false; + syncModeWithPortal = true; + terminalsAlwaysDark = false; + muxType = "tmux"; + muxUseCustomCommand = false; + muxCustomCommand = ""; + muxSessionFilter = ""; + runDmsMatugenTemplates = true; + matugenTemplateGtk = true; + matugenTemplateNiri = true; + matugenTemplateHyprland = true; + matugenTemplateMangowc = true; + matugenTemplateQt5ct = true; + matugenTemplateQt6ct = true; + matugenTemplateFirefox = true; + matugenTemplatePywalfox = true; + matugenTemplateZenBrowser = true; + matugenTemplateVesktop = true; + matugenTemplateEquibop = true; + matugenTemplateGhostty = true; + matugenTemplateKitty = true; + matugenTemplateFoot = true; + matugenTemplateAlacritty = true; + matugenTemplateNeovim = true; + matugenTemplateWezterm = true; + matugenTemplateDgop = true; + matugenTemplateKcolorscheme = true; + matugenTemplateVscode = true; + matugenTemplateEmacs = true; + matugenTemplateZed = true; + showDock = false; + dockAutoHide = false; + dockSmartAutoHide = false; + dockGroupByApp = false; + dockOpenOnOverview = false; + dockPosition = 1; + dockSpacing = 4; + dockBottomGap = 0; + dockMargin = 0; + dockIconSize = 40; + dockIndicatorStyle = "circle"; + dockBorderEnabled = false; + dockBorderColor = "surfaceText"; + dockBorderOpacity = 1; + dockBorderThickness = 1; + dockIsolateDisplays = false; + dockLauncherEnabled = false; + dockLauncherLogoMode = "apps"; + dockLauncherLogoCustomPath = ""; + dockLauncherLogoColorOverride = ""; + dockLauncherLogoSizeOffset = 0; + dockLauncherLogoBrightness = 0.5; + dockLauncherLogoContrast = 1; + dockMaxVisibleApps = 0; + dockMaxVisibleRunningApps = 0; + dockShowOverflowBadge = true; + notificationOverlayEnabled = false; + notificationPopupShadowEnabled = true; + notificationPopupPrivacyMode = false; + modalDarkenBackground = true; + lockScreenShowPowerActions = true; + lockScreenShowSystemIcons = true; + lockScreenShowTime = true; + lockScreenShowDate = true; + lockScreenShowProfileImage = true; + lockScreenShowPasswordField = true; + lockScreenShowMediaPlayer = true; + lockScreenPowerOffMonitorsOnLock = false; + lockAtStartup = false; + enableFprint = false; + maxFprintTries = 15; + enableU2f = false; + u2fMode = "or"; + lockScreenActiveMonitor = "all"; + lockScreenInactiveColor = "#000000"; + lockScreenNotificationMode = 0; + hideBrightnessSlider = false; + notificationTimeoutLow = 5000; + notificationTimeoutNormal = 5000; + notificationTimeoutCritical = 0; + notificationCompactMode = false; + notificationPopupPosition = 0; + notificationAnimationSpeed = 1; + notificationCustomAnimationDuration = 400; + notificationHistoryEnabled = true; + notificationHistoryMaxCount = 50; + notificationHistoryMaxAgeDays = 7; + notificationHistorySaveLow = true; + notificationHistorySaveNormal = true; + notificationHistorySaveCritical = true; + notificationRules = []; + osdAlwaysShowValue = false; + osdPosition = 5; + osdVolumeEnabled = true; + osdMediaVolumeEnabled = true; + osdMediaPlaybackEnabled = false; + osdBrightnessEnabled = true; + osdIdleInhibitorEnabled = true; + osdMicMuteEnabled = true; + osdCapsLockEnabled = true; + osdPowerProfileEnabled = false; + osdAudioOutputEnabled = true; + powerActionConfirm = true; + powerActionHoldDuration = 0.5; + powerMenuActions = [ "reboot" "logout" "poweroff" "lock" "suspend" "restart" ]; + powerMenuDefaultAction = "logout"; + powerMenuGridLayout = false; + customPowerActionLock = ""; + customPowerActionLogout = ""; + customPowerActionSuspend = ""; + customPowerActionHibernate = ""; + customPowerActionReboot = ""; + customPowerActionPowerOff = ""; + updaterHideWidget = false; + updaterUseCustomCommand = false; + updaterCustomCommand = ""; + updaterTerminalAdditionalParams = ""; + displayNameMode = "system"; + screenPreferences = { + wallpaper = [ + "all" + ]; + }; + showOnLastDisplay = {}; + niriOutputSettings = {}; + hyprlandOutputSettings = {}; + displayProfiles = {}; + activeDisplayProfile = {}; + displayProfileAutoSelect = false; + displayShowDisconnected = false; + displaySnapToEdge = true; + barConfigs = [ + { + id = "default"; + name = "Main Bar"; + enabled = true; + position = 0; + screenPreferences = [ "all" ]; + showOnLastDisplay = true; + leftWidgets = [ "launcherButton" "workspaceSwitcher" "focusedWindow" ]; + centerWidgets = [ "music" "clock" "weather" ]; + rightWidgets = [ "systemTray" "clipboard" "cpuUsage" "memUsage" "notificationButton" "battery" "controlCenterButton" ]; + spacing = 4; + innerPadding = 4; + bottomGap = 0; + transparency = 1; + widgetTransparency = 1; + squareCorners = false; + noBackground = false; + maximizeWidgetIcons = false; + maximizeWidgetText = false; + removeWidgetPadding = false; + widgetPadding = 8; + gothCornersEnabled = false; + gothCornerRadiusOverride = false; + gothCornerRadiusValue = 12; + borderEnabled = false; + borderColor = "surfaceText"; + borderOpacity = 1; + borderThickness = 1; + widgetOutlineEnabled = false; + widgetOutlineColor = "primary"; + widgetOutlineOpacity = 1; + widgetOutlineThickness = 1; + fontScale = 1; + iconScale = 1; + autoHide = true; + autoHideDelay = 250; + showOnWindowsOpen = false; + openOnOverview = false; + visible = true; + popupGapsAuto = true; + popupGapsManual = 4; + maximizeDetection = true; + scrollEnabled = true; + scrollXBehavior = "column"; + scrollYBehavior = "workspace"; + shadowIntensity = 0; + shadowOpacity = 60; + shadowColorMode = "text"; + shadowCustomColor = "#000000"; + clickThrough = false; + } + ]; + desktopClockEnabled = false; + desktopClockStyle = "analog"; + desktopClockTransparency = 0.8; + desktopClockColorMode = "primary"; + desktopClockCustomColor = { + r = 1; + g = 1; + b = 1; + a = 1; + hsvHue = -1; + hsvSaturation = 0; + hsvValue = 1; + hslHue = -1; + hslSaturation = 0; + hslLightness = 1; + valid = true; + }; + desktopClockShowDate = true; + desktopClockShowAnalogNumbers = false; + desktopClockShowAnalogSeconds = true; + desktopClockX = -1; + desktopClockY = -1; + desktopClockWidth = 280; + desktopClockHeight = 180; + desktopClockDisplayPreferences = [ "all" ]; + systemMonitorEnabled = false; + systemMonitorShowHeader = true; + systemMonitorTransparency = 0.8; + systemMonitorColorMode = "primary"; + systemMonitorCustomColor = { + r = 1; + g = 1; + b = 1; + a = 1; + hsvHue = -1; + hsvSaturation = 0; + hsvValue = 1; + hslHue = -1; + hslSaturation = 0; + hslLightness = 1; + valid = true; + }; + systemMonitorShowCpu = true; + systemMonitorShowCpuGraph = true; + systemMonitorShowCpuTemp = true; + systemMonitorShowGpuTemp = false; + systemMonitorGpuPciId = ""; + systemMonitorShowMemory = true; + systemMonitorShowMemoryGraph = true; + systemMonitorShowNetwork = true; + systemMonitorShowNetworkGraph = true; + systemMonitorShowDisk = true; + systemMonitorShowTopProcesses = false; + systemMonitorTopProcessCount = 3; + systemMonitorTopProcessSortBy = "cpu"; + systemMonitorGraphInterval = 60; + systemMonitorLayoutMode = "auto"; + systemMonitorX = -1; + systemMonitorY = -1; + systemMonitorWidth = 320; + systemMonitorHeight = 480; + systemMonitorDisplayPreferences = [ "all" ]; + systemMonitorVariants = []; + desktopWidgetPositions = {}; + desktopWidgetGridSettings = {}; + desktopWidgetInstances = []; + desktopWidgetGroups = []; + builtInPluginSettings = {}; + clipboardEnterToPaste = false; + launcherPluginVisibility = {}; + launcherPluginOrder = []; + configVersion = 5; +} + + + diff --git a/modules/hypr/default.nix b/modules/hypr/default.nix index 70beafa..c7d02ff 100644 --- a/modules/hypr/default.nix +++ b/modules/hypr/default.nix @@ -1,9 +1,13 @@ { pkgs, inputs, lib, ... }: { - services.hyprpolkitagent.enable = true; + services.hyprpolkitagent.enable = false; programs.hyprshot.enable = true; programs.hyprlock.enable = true; + wayland.windowManager.hyprland.configType = "hyprlang"; + wayland.windowManager.hyprland.extraConfig = '' + source = ./dms/colors.conf + ''; wayland.windowManager.hyprland = { enable = true; package = null; @@ -12,8 +16,6 @@ # Variables "$terminal" = "kitty -e nu"; "$fileManager" = "kitty -e yazi"; - "$menu" = "noctalia-shell ipc call launcher toggle"; - "$bar" = "noctalia-shell"; "$mainMod" = "SUPER"; # Monitors @@ -34,6 +36,9 @@ sdrbrightness = 1; sdrsaturation = 1; sdr_min_luminance = 0.005; + min_luminance = 0; + max_luminance = 1300; + max_avg_luminance = 400; sdr_max_luminance = 200; supports_hdr = 1; supports_wide_color = 1; @@ -48,11 +53,9 @@ # Startup applications exec-once = [ - "noctalia-shell" - "hyprlock" + "dms run" "hyprctl dispatch workspace 1" "pw-metadata -n settings 0 clock.force-quantum 2048" - "systemctl --user start hyprpolkitagent" "sunshine" "" ]; @@ -145,16 +148,23 @@ bind = [ "$mainMod, Return, exec, $terminal" "$mainMod, Q, killactive" - "$mainMod, M, exec, noctalia-shell ipc call lockScreen lock" + "$mainMod, M, exec, dms ipc call lock lock" "$mainMod, E, exec, $fileManager" + "$mainMod, Y, exec, dms ipc call dankdash wallpaper" + "$mainMod, TAB, exec, dms ipc call hypr toggleOverview" + "$mainMod, C, exec, dms ipc call clipboard toggle" + "$mainMod, comma, exec, dms ipc call settings focusOrToggle" "$mainMod, V, togglefloating" - "$mainMod, Space, exec, $menu" "$mainMod, B, exec, zen" "$mainMod, P, pseudo" + "$mainMod, space, exec, dms ipc call spotlight toggle" # "$mainMod, J, togglesplit" "$mainMod, F, fullscreen" ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%-" + ", XF86AudioMute, exec, dms ipc call audio mute" + ", XF86MonBrightnessUp, exec, dms ipc call brightness increment 5" + ", XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5" "$mainMod, left, movefocus, l" "$mainMod, right, movefocus, r" "$mainMod, up, movefocus, u" @@ -183,8 +193,6 @@ "$mainMod SHIFT, S, movetoworkspace, special:magic" "$mainMod, mouse_down, workspace, e+1" "$mainMod, mouse_up, workspace, e-1" - ", code:76, exec, killall -SIGUSR1 gpu-screen-recorder" - ", code:75, exec, killall -SIGINT gpu-screen-recorder" ]; bindm = [ diff --git a/modules/kitty/default.nix b/modules/kitty/default.nix index 61d8e95..f01d4c4 100644 --- a/modules/kitty/default.nix +++ b/modules/kitty/default.nix @@ -8,6 +8,8 @@ italic_font auto bold_italic_font auto confirm_os_window_close 0 + include dank-theme.conf + include dank-tabs.conf cursor_shape beam cursor_trail 3 ''; diff --git a/modules/noctalia/default.nix b/modules/noctalia/default.nix deleted file mode 100644 index 17bd025..0000000 --- a/modules/noctalia/default.nix +++ /dev/null @@ -1,136 +0,0 @@ -{pkgs, inputs, lib,...}: -{ - imports = [ inputs.noctalia.homeModules.default ]; - programs.noctalia-shell = { - enable = true; - settings = { - general = { - avatarImage = "/home/joshuaelm/NixOS-configs/pfp.jpg"; - shadowOffsetX = 3; - shadowOffsetY = 3; - }; - bar = lib.mkForce { - position = "top"; - monitors = [ ]; - density = "default"; - showOutline = false; - showCapsule = true; - capsuleOpacity = 1; - backgroundOpacity = 1; - useSeparateOpacity = false; - floating = true; - marginVertical = 5; - marginHorizontal = 5; - outerCorners = false; - exclusive = true; - hideOnOverview = false; - widgets = { - left = [ - { - id = "ControlCenter"; - } - { - id = "Workspace"; - } - ]; - center = [ - { - id = "Clock"; - } - { - id = "MediaMini"; - } - ]; - right = [ - { - id = "AudioVisualizer"; - } - { - id = "Tray"; - } - { - id = "plugin:screenshot"; - } - { - id = "plugin:screen-recorder"; - } - { - id = "Volume"; - } - { - id = "Battery"; - } - { - id= "Brightness"; - } - ]; - }; - }; - wallpaper = { - enabled = true; - }; - appLauncher = { - terminalCommand = "kitty -e"; - position = "top-center"; - }; - sessionMenu = { - position = "top_left"; - }; - dock = { - enabled = false; - }; - osd = { - location = "right"; - }; - location = { - monthBeforeDay = true; - name = "Cedar Hill, United States"; - weatherEnabled = true; - weatherShowEffects = true; - useFahrenheit = true; - use12hourFormat = false; - showWeekNumberInCalendar = false; - showCalendarEvents = false; - showCalendarWeather = true; - analogClockInCalendar = false; - firstDayOfWeek = -1; - hideWeatherTimezone = false; - hideWeatherCityName = false; - }; - }; - plugins = { - sources = [ - { - enabled = true; - name = "Official Noctalia Plugins"; - url = "https://github.com/noctalia-dev/noctalia-plugins"; - } - ]; - states = { - screen-recorder = { - enabled = true; - }; - fancy-audiovisualizer = { - enabled = true; - }; - screenshot = { - enabled = true; - }; - kagi-quick-search = { - enabled = true; - }; - }; - version = "1"; - }; - - pluginSettings = { - screen-recorder = { - videoCodec = "av1"; - }; - kagi-quick-search = { - kagiSessionToken = "Ub-qBZk0teotZem9-oDpZsvS8B-6Cof9D0Juqexr_Ow.Oi1cHu5d-9o2UupeBO1ndQ_6CsvoFo2lfEWDnxlnqWc"; - }; - }; - - }; -} diff --git a/modules/nvim/default.nix b/modules/nvim/default.nix index 33b632f..f06cf6d 100644 --- a/modules/nvim/default.nix +++ b/modules/nvim/default.nix @@ -1,30 +1,5 @@ -{config, pkgs, lib, inputs, ...}: - +{pkgs, inputs, config, ...}: { - imports = [ ./config.nix ]; - programs.nixvim = { - enable = true; - defaultEditor = true; - plugins.nvim-tree.enable = true; - plugins.treesitter.enable = true; - plugins.lualine.enable = true; - plugins.lsp.enable = true; - plugins.luasnip.enable = true; - plugins.toggleterm.enable = true; - plugins.cmp.enable = true; - plugins.gitsigns.enable = true; - plugins.web-devicons.enable = true; - plugins.which-key.enable = true; - plugins.cmp-nvim-lsp.enable = true; - plugins.bufferline.enable = true; - plugins.noice.enable = true; - plugins.mini-pairs.enable = true; - plugins.ts-comments.enable = true; - plugins.snacks.enable = true; - plugins.mini-icons.enable = true; - plugins.nui.enable = true; - plugins.telescope.enable = true; - plugins.indent-blankline.enable = true; - - }; + imports = [ inputs.lazyvim.homeManagerModules.default ]; + programs.lazyvim.enable = true; } diff --git a/modules/stylix/default.nix b/modules/stylix/default.nix index 61647b0..80e8116 100644 --- a/modules/stylix/default.nix +++ b/modules/stylix/default.nix @@ -1,10 +1,9 @@ -{ pkgs, ... }: +{ pkgs, config, lib, ... }: { stylix.enable = true; stylix.autoEnable = true; #stylix.targets.plymouth.enable = false; stylix.targets.kitty.enable = true; - stylix.polarity = "dark"; stylix.targets.zen-browser.profileNames = [ "default" ]; stylix.targets.zen-browser.enable = true; # blue aura house diff --git a/modules/zen/default.nix b/modules/zen/default.nix index 34aee20..c889aa6 100644 --- a/modules/zen/default.nix +++ b/modules/zen/default.nix @@ -1,28 +1,36 @@ -{ pkgs, inputs,... }: +{ pkgs, inputs, lib,... }: { imports = [ inputs.zen-browser.homeModules.beta ]; + home.activation.linkZenUserChrome = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + $DRY_RUN_CMD mkdir -p "$HOME/.zen/k7ha0h7z.Default Profile/chrome" + $DRY_RUN_CMD ln -sf $HOME/.config/DankMaterialShell/zen.css \ + "$HOME/.zen/k7ha0h7z.Default Profile/chrome/userChrome.css" + ''; programs.zen-browser = { enable = true; profiles = { default = { # bookmarks, extensions, search engines... - id = 0; - isDefault = true; - name = "default"; - search = { - force = true; - default = "Kagi"; - engines = { - "Kagi" = { - urls = [{ template = "https://kagi.com/search?q={searchTerms}"; }]; - icon = "https://kagi.com/favicon.ico"; - updateInterval = 24 * 60 * 60 * 1000; # every day - definedAliases = [ "@kagi" ]; + id = 0; + isDefault = true; + name = "default"; + search = { + force = true; + default = "Kagi"; + engines = { + "Kagi" = { + urls = [{ template = "https://kagi.com/search?q={searchTerms}"; }]; + icon = "https://kagi.com/favicon.ico"; + updateInterval = 24 * 60 * 60 * 1000; # every day + definedAliases = [ "@kagi" ]; }; - }; - }; + }; + }; + settings = { + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + }; }; }; policies = let @@ -39,6 +47,7 @@ "{7be2ba16-0f1e-4d93-9ebc-5164397477a9}" = "videospeed"; }; DisableTelemetry = true; + }; }; }