diff --git a/README.md b/README.md new file mode 100644 index 0000000..6a3c37e --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ + +I manage my dotfiles together with my system nix configs now on + diff --git a/backgrounds/Dune1.png b/backgrounds/Dune1.png new file mode 100644 index 0000000..6b23da2 Binary files /dev/null and b/backgrounds/Dune1.png differ diff --git a/backgrounds/Dune1.xcf b/backgrounds/Dune1.xcf new file mode 100644 index 0000000..c34a2c0 Binary files /dev/null and b/backgrounds/Dune1.xcf differ diff --git a/backgrounds/Road-saturated.png b/backgrounds/Road-saturated.png new file mode 100644 index 0000000..379bda7 Binary files /dev/null and b/backgrounds/Road-saturated.png differ diff --git a/backgrounds/Road.png b/backgrounds/Road.png new file mode 100644 index 0000000..dae3d35 Binary files /dev/null and b/backgrounds/Road.png differ diff --git a/backgrounds/Road.xcf b/backgrounds/Road.xcf new file mode 100644 index 0000000..2e3c8c0 Binary files /dev/null and b/backgrounds/Road.xcf differ diff --git a/backgrounds/pacific.png b/backgrounds/pacific.png new file mode 100644 index 0000000..6ce6079 Binary files /dev/null and b/backgrounds/pacific.png differ diff --git a/backgrounds/pacific.xcf b/backgrounds/pacific.xcf new file mode 100644 index 0000000..13f6c9e Binary files /dev/null and b/backgrounds/pacific.xcf differ diff --git a/flake.lock b/flake.lock index ba612f8..f74ea19 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,10 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager_3", + "home-manager": [ + "p1n3appl3", + "home-manager" + ], "nixpkgs": [ "p1n3appl3", "ragenix", @@ -12,11 +15,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -67,11 +70,11 @@ ] }, "locked": { - "lastModified": 1748080874, - "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", + "lastModified": 1767967164, + "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=", "owner": "catppuccin", "repo": "nix", - "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", + "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7", "type": "github" }, "original": { @@ -80,21 +83,6 @@ "type": "github" } }, - "cl-nix-lite": { - "locked": { - "lastModified": 1728174978, - "narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=", - "owner": "hraban", - "repo": "cl-nix-lite", - "rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87", - "type": "github" - }, - "original": { - "owner": "hraban", - "repo": "cl-nix-lite", - "type": "github" - } - }, "cosmic-manager": { "inputs": { "flake-parts": "flake-parts", @@ -106,11 +94,11 @@ ] }, "locked": { - "lastModified": 1744387566, - "narHash": "sha256-O39zTv7LdRgr4Hw38d+eQG2LYpP75rw2XKqTGV5qzgs=", + "lastModified": 1765831383, + "narHash": "sha256-P5F/VPjjGw7s0AOTPb3z3gxqtH0YkAnd/c9P6QdWrEU=", "owner": "HeitorAugustoLN", "repo": "cosmic-manager", - "rev": "52d3fdd080a9dd4639948687682a68282fbf0314", + "rev": "819d4d21fb90460dd11416d81d2cff65a53b8a59", "type": "github" }, "original": { @@ -121,11 +109,11 @@ }, "crane": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", "type": "github" }, "original": { @@ -166,11 +154,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -221,23 +209,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1730663653, - "narHash": "sha256-kFCUWettiFHDIqxCWWQ9qY8pVh+Lj+XL0Giyy/kdomg=", - "owner": "hraban", - "repo": "flake-compat", - "rev": "e5b16676185cb7548581c852f51ce7f3a49bba5e", - "type": "github" - }, - "original": { - "owner": "hraban", - "ref": "fixed-output", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -246,11 +217,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -267,11 +238,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -335,12 +306,15 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -351,7 +325,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -369,7 +343,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_10" }, "locked": { "lastModified": 1731533236, @@ -386,24 +360,6 @@ } }, "flake-utils_7": { - "inputs": { - "systems": "systems_10" - }, - "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" - } - }, - "flake-utils_8": { "inputs": { "systems": "systems_11" }, @@ -421,7 +377,7 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { "systems": "systems_12" }, @@ -446,11 +402,11 @@ ] }, "locked": { - "lastModified": 1749526396, - "narHash": "sha256-UL9F76abAk87llXOrcQRjhd5OaOclUd6MIltsqcUZmo=", + "lastModified": 1768770171, + "narHash": "sha256-JPmLGZgdWa8QcQbbtBqyZhpmxIHZ3lUO48laERjw+4k=", "owner": "nix-community", "repo": "home-manager", - "rev": "427c96044f11a5da50faf6adaf38c9fa47e6d044", + "rev": "521d5ea1a229ba315dd1cceaf869946ddcc83d36", "type": "github" }, "original": { @@ -467,11 +423,11 @@ ] }, "locked": { - "lastModified": 1748830238, - "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", + "lastModified": 1768512489, + "narHash": "sha256-jZi945d3e6DYhrw3K5Pew+QaL3qSgq3O6xiVaEVLgXs=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", + "rev": "bba859cd85b90dd9e4e6fd44b2af4aa64ae801a1", "type": "github" }, "original": { @@ -481,29 +437,6 @@ } }, "home-manager_3": { - "inputs": { - "nixpkgs": [ - "p1n3appl3", - "ragenix", - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_4": { "inputs": { "nixpkgs": [ "rahul-config", @@ -541,34 +474,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.8", - "repo": "ixx", - "type": "github" - } - }, "jujutsu": { "inputs": { "flake-utils": "flake-utils_3", @@ -578,11 +483,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1749530384, - "narHash": "sha256-8tyNH+gXWVKuKIvaPxZTB3pfBanZLvdAKr5lhrf7KY0=", + "lastModified": 1768747642, + "narHash": "sha256-Jklp4632S0YlM4Fh/n4nMpe8jN8YYfF3w4WBuNpEETI=", "owner": "martinvonz", "repo": "jj", - "rev": "82705600759deb825b53e4544ed270fcba419cca", + "rev": "8ecd72d5393210c1d83a2f99fb6b9658e86da435", "type": "github" }, "original": { @@ -607,53 +512,86 @@ "type": "github" } }, - "mac-app-util": { + "matugen": { "inputs": { - "cl-nix-lite": "cl-nix-lite", - "flake-compat": "flake-compat", - "flake-utils": [ - "p1n3appl3", - "flake-utils" - ], "nixpkgs": [ - "p1n3appl3", "nixpkgs" ], - "systems": "systems_7" + "systems": "systems_4" }, "locked": { - "lastModified": 1742156590, - "narHash": "sha256-aTM/2CrNN5utdVEQGsOA+kl4UozgH7VPLBQL5OXtBrg=", - "owner": "hraban", - "repo": "mac-app-util", - "rev": "341ede93f290df7957047682482c298e47291b4d", + "lastModified": 1768585282, + "narHash": "sha256-JTH+wQTt8pyS5iPb7+r/70pYfLgi/OFTzimcRmMcs2g=", + "owner": "InioX", + "repo": "matugen", + "rev": "5905cae968e02d3c1d23ee556e9a0719e5231227", "type": "github" }, "original": { - "owner": "hraban", - "repo": "mac-app-util", + "owner": "InioX", + "ref": "main", + "repo": "matugen", "type": "github" } }, - "nix-darwin": { + "niri": { "inputs": { - "nixpkgs": [ - "p1n3appl3", - "nixpkgs" - ] + "niri-stable": "niri-stable", + "niri-unstable": [ + "niri-unstable" + ], + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748352827, - "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90", + "lastModified": 1768767453, + "narHash": "sha256-Omq1UHEJ1oxkTo2j8l6qQtmyPR7Uj+k7HC5Khd3jVVA=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "8eab7c21ef4edc97cc56ddb8e76a842e0818d6d7", "type": "github" }, "original": { - "owner": "LnL7", - "ref": "master", - "repo": "nix-darwin", + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1768678265, + "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "d7184a04b904e07113f4623610775ae78d32394c", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", "type": "github" } }, @@ -665,11 +603,11 @@ ] }, "locked": { - "lastModified": 1748751003, - "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -703,14 +641,14 @@ "nixgl": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1713543440, - "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", + "lastModified": 1762090880, + "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=", "owner": "nix-community", "repo": "nixGL", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", + "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5", "type": "github" }, "original": { @@ -719,38 +657,13 @@ "type": "github" } }, - "nixgl_2": { - "inputs": { - "flake-utils": [ - "p1n3appl3", - "flake-utils" - ], - "nixpkgs": [ - "p1n3appl3", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713543440, - "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", - "owner": "guibou", - "repo": "nixGL", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", - "type": "github" - }, - "original": { - "owner": "guibou", - "repo": "nixGL", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1768499669, + "narHash": "sha256-jJr/zDxu5evfQxlXtMrFFF68/RNj1UrctS/eIsay4k0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "7297dfc69ae9b06e984a6f69900ce25e67c76f46", "type": "github" }, "original": { @@ -793,58 +706,90 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748421225, - "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "lastModified": 1768621446, + "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", + "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1660551188, - "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", - "owner": "nixos", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1757967192, + "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "0d7c15863b251a7a50265e57c1dca1a7add2e291", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1746378225, + "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "93e8cdce7afc64297cfec447c311470788131cd9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -854,7 +799,23 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { + "locked": { + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1767379071, "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", @@ -870,7 +831,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1722062969, "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", @@ -886,7 +847,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1710377395, "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", @@ -906,15 +867,14 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1749496904, - "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", + "lastModified": 1768486009, + "narHash": "sha256-I7ymDe6UQooHy9I9wrafKCCDnRbox/EMWAgJgpm7fGs=", "owner": "nix-community", "repo": "nixvim", - "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", + "rev": "03a638205b5cb04ba9c2ed6c604e137b15f07fa1", "type": "github" }, "original": { @@ -923,26 +883,23 @@ "type": "github" } }, - "nuschtosSearch": { + "noctalia": { "inputs": { - "flake-utils": "flake-utils_5", - "ixx": "ixx", "nixpkgs": [ - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", - "owner": "NuschtOS", - "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "lastModified": 1768775258, + "narHash": "sha256-D38f71fMeMsmCZ8mhhRhffjueXxdnjqHr4xsrGoqBVs=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "bc494b7593d97bfd61e527ca2d4c4a6f0ced59be", "type": "github" }, "original": { - "owner": "NuschtOS", - "repo": "search", + "owner": "noctalia-dev", + "repo": "noctalia-shell", "type": "github" } }, @@ -955,11 +912,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1744483413, - "narHash": "sha256-/Ty3KAon/NlSS3wFPGUSkSBlyt1Ao1dg5LvTFsgK4/U=", + "lastModified": 1760151712, + "narHash": "sha256-Xod+hqFnhok9rrSH42/2ON74S2Kp/EzgHDmffIbY6TQ=", "owner": "p1n3appl3", "repo": "obs-gamepad", - "rev": "6552453336d4c8c83e977268365ed6c2ffde764e", + "rev": "42026f9c1496b7b263086468a3334bc72795ad56", "type": "github" }, "original": { @@ -971,15 +928,12 @@ "p1n3appl3": { "inputs": { "catppuccin": "catppuccin", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "home-manager": "home-manager_2", - "mac-app-util": "mac-app-util", - "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", - "nixgl": "nixgl_2", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable_2", "obs-gamepad": "obs-gamepad", "ragenix": "ragenix", "rahul-config": [ @@ -988,11 +942,11 @@ "slippi": "slippi" }, "locked": { - "lastModified": 1749071656, - "narHash": "sha256-LaOapF5/WHh5QlhrY64j7ZCSe7Sdfx8qFB1d0dLxamY=", + "lastModified": 1768515258, + "narHash": "sha256-MBDxLHOIIminP+BPP74UQ3WBDnkbFguoW6MV6WXaepE=", "owner": "p1n3appl3", "repo": "config", - "rev": "eb7780dfe956775c0ae9ea844fe9a01445283426", + "rev": "e6de5bc3c0a67c2a0ed51231df0cd9e0adcfac60", "type": "github" }, "original": { @@ -1003,8 +957,8 @@ }, "pipethon": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1767634075, @@ -1032,14 +986,14 @@ "p1n3appl3", "nixpkgs-stable" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1744897914, - "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", + "lastModified": 1761832913, + "narHash": "sha256-VCNVjjuRvrKPiYYwqhE3BAKIaReiKXGpxGp27lZ0MFM=", "owner": "yaxitech", "repo": "ragenix", - "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", + "rev": "83bccfdea758241999f32869fb6b36f7ac72f1ac", "type": "github" }, "original": { @@ -1063,7 +1017,7 @@ "rahul-config", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1718869541, @@ -1083,12 +1037,12 @@ "inputs": { "agenix": "agenix_2", "darwin": "darwin_2", - "flake-utils": "flake-utils_8", - "home-manager": "home-manager_4", + "flake-utils": "flake-utils_7", + "home-manager": "home-manager_3", "impermanence": "impermanence", "nix-index-database": "nix-index-database_2", "nixos-hardware": "nixos-hardware_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "ragenix": "ragenix_2" }, "locked": { @@ -1113,9 +1067,13 @@ "home-manager": "home-manager", "jujutsu": "jujutsu", "kitty-search": "kitty-search", + "matugen": "matugen", + "niri": "niri", + "niri-unstable": "niri-unstable", "nixgl": "nixgl", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", + "noctalia": "noctalia", "p1n3appl3": "p1n3appl3", "pipethon": "pipethon", "rahul-config": "rahul-config", @@ -1130,11 +1088,11 @@ ] }, "locked": { - "lastModified": 1747967795, - "narHash": "sha256-76s4jDRbQzxRO+5y8ilMp5V30qVgY9R6n8U7aOap8ig=", + "lastModified": 1762915112, + "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f1d5bfa8c692cacd798a3e1fb93d54c1b9ac701a", + "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "type": "github" }, "original": { @@ -1146,17 +1104,16 @@ "rust-overlay_2": { "inputs": { "nixpkgs": [ - "p1n3appl3", - "ragenix", + "niri-unstable", "nixpkgs" ] }, "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", + "lastModified": 1757989933, + "narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", + "rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3", "type": "github" }, "original": { @@ -1166,6 +1123,28 @@ } }, "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "p1n3appl3", + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "inputs": { "flake-utils": [ "rahul-config", @@ -1207,11 +1186,11 @@ ] }, "locked": { - "lastModified": 1747878710, - "narHash": "sha256-uSRpAVZ7u0/6ixVFrW8MWZaMw58SJCZXUNbVV54OQ0w=", + "lastModified": 1760294822, + "narHash": "sha256-VSzDcCkS/kGrALPv81x5yjqjt5o7n4lVjE/gknlz+1w=", "owner": "lytedev", "repo": "slippi-nix", - "rev": "700c62cc18acbe3a4accdd73e11a3752e234fd6e", + "rev": "abee78f6ad931c2a2f18dae102f51abcaf1a26c6", "type": "github" }, "original": { @@ -1312,16 +1291,16 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1357,16 +1336,16 @@ }, "systems_7": { "locked": { - "lastModified": 1689347925, - "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-darwin", - "rev": "2235d7e6cc29ae99878133c95e9fe5e157661ffb", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-darwin", + "repo": "default", "type": "github" } }, @@ -1402,8 +1381,8 @@ }, "t": { "inputs": { - "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1710410762, @@ -1436,6 +1415,39 @@ "repo": "flake-utils", "type": "github" } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.7", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1768765571, + "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 35d671f..0b796e7 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,20 @@ }; }; + niri-unstable.url = "github:YaLTeR/niri"; + niri = { + url = "github:sodiboo/niri-flake"; + inputs.niri-unstable.follows = "niri-unstable"; + }; + matugen = { + url = "github:/InioX/matugen/main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + noctalia = { + url = "github:noctalia-dev/noctalia-shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixgl.url = "github:nix-community/nixGL"; pipethon.url = "git+ssh://forgejo@git.donsz.nl/jana/pipethon.git"; }; @@ -57,10 +71,18 @@ nixgl, cosmic-manager, pipethon, + niri, + matugen, + noctalia, ... }@inputs: let - homeManagerModules = [ nixvim.homeManagerModules.nixvim ]; + homeManagerModules = [ + nixvim.homeManagerModules.nixvim + niri.homeModules.niri + matugen.nixosModules.default + noctalia.homeModules.default + ]; pkgsForSystem = system: diff --git a/hosts/kili/home.nix b/hosts/kili/home.nix index 988026e..85bc1e7 100644 --- a/hosts/kili/home.nix +++ b/hosts/kili/home.nix @@ -22,6 +22,7 @@ ../../programs/tmux ../../programs/git ../../programs/jj + ../../programs/niri ]; # use the system-installed version of kitty on arch diff --git a/programs/jj/default.nix b/programs/jj/default.nix index daf252b..5e32287 100644 --- a/programs/jj/default.nix +++ b/programs/jj/default.nix @@ -42,9 +42,9 @@ fsmonitor.backend = "watchman"; fsmonitor.watchman.register-snapshot-trigger = true; - revsets.log = "@ | ancestors(trunk()..(visible_heads() & mine()), 2) | trunk()"; + # revsets.log = "@ | ancestors(trunk()..(visible_heads() & mine()), 2) | trunk()"; # revsets.log = "trunk()..@ | @..trunk() | trunk() | @:: | fork_point(trunk() | @)"; - # revsets.log = "trunk() | ancestors(trunk()..heads(((trunk()..visible_heads()) & my() | @)::), 2)"; + revsets.log = "trunk() | ancestors(trunk()..heads(((trunk()..visible_heads()) & my() | @)::), 2)"; revset-aliases = { "my()" = "user(\"${config.programs.jujutsu.settings.user.email}\")"; @@ -61,7 +61,7 @@ label(if(current_working_copy, "working_copy"), concat( separate(" ", - format_short_change_id_with_hidden_and_divergent_info(self), + format_short_change_id_with_change_offset(self), if(empty, label("empty", "(empty)")), if(description, description.first_line(), @@ -70,7 +70,6 @@ bookmarks, tags, working_copies, - if(git_head, label("git_head", "HEAD")), if(conflict, label("conflict", "conflict")), if(config("ui.show-cryptographic-signatures").as_boolean(), format_short_cryptographic_signature(signature)), @@ -79,6 +78,7 @@ ) ) ''; + # if(.contained_in('first_parent(@)'), label("git_head", "HEAD")), status_summary = "'\n' ++ self.diff().summary() ++ '\n'"; log_oneline_with_status_summary = "log_oneline ++ if(self.current_working_copy() && self.diff().files().len() > 0, status_summary)"; }; @@ -162,6 +162,9 @@ key = "~/.ssh/id_ed25519.pub"; }; + # remotes.origin.auto-track-bookmarks = true; + # remotes.upstream.auto-track-bookmarks = true; + git = { private-commits = "description(glob:'wip:*') | description(glob:'trial:*')"; write-change-id-header = true; @@ -171,7 +174,6 @@ "origin" ]; push = "origin"; - auto-local-bookmark = true; }; }; }; diff --git a/programs/niri/default.nix b/programs/niri/default.nix new file mode 100644 index 0000000..6525132 --- /dev/null +++ b/programs/niri/default.nix @@ -0,0 +1,524 @@ +{ config, pkgs, inputs, lib, ... }: +let + noctalia = + cmd: + [ + "${pkgs.lib.getExe' inputs.noctalia.packages.${pkgs.system}.default "noctalia-shell"}" + "ipc" + "call" + ] + ++ (pkgs.lib.splitString " " cmd); + + wallpaper = (inputs.self + /backgrounds/pacific.png); + matugenSchemeType = "scheme-tonal-spot"; +in +{ + home.packages = with pkgs; [ + matugen + # gsettings + glib + dconf + gsettings-desktop-schemas + # gtk + nwg-look + # qt config tool + kdePackages.qt6ct + ]; + + home.sessionVariables = { + QT_QPA_PLATFORMTHEME = "qt6ct"; + }; + + programs.niri.settings = { + input = { + keyboard = { + xkb = { + layout = "us"; + options = "grp:win_space_toggle"; + }; + numlock = true; + }; + + mouse = { + accel-speed = -0.5; + }; + + touchpad = { + dwt = true; + tap = true; + tap-button-map = "left-right-middle"; + click-method = "clickfinger"; + natural-scroll = false; + }; + }; + + gestures.hot-corners.enable = false; + + layout = { + gaps = 5; + center-focused-column = "never"; + + preset-column-widths = [ + { proportion = 0.33333; } + { proportion = 0.5; } + { proportion = 0.66667; } + ]; + + default-column-width = { + proportion = 0.5; + }; + + shadow = { + softness = 20; + spread = 5; + offset = { + x = 0; + y = 5; + }; + }; + + focus-ring = { + width = 1; + active.color = "#${config.programs.matugen.theme.colors.primary.default}"; + inactive.color = "#${config.programs.matugen.theme.colors.surface.default}"; + urgent.color = "#${config.programs.matugen.theme.colors.error.default}"; + }; + + border = { + active.color = "#${config.programs.matugen.theme.colors.primary.default}"; + inactive.color = "#${config.programs.matugen.theme.colors.surface.default}"; + urgent.color = "#${config.programs.matugen.theme.colors.error.default}"; + }; + + shadow = { + color = "#${config.programs.matugen.theme.colors.shadow.default}70"; + }; + + tab-indicator = { + active.color = "#${config.programs.matugen.theme.colors.primary.default}"; + inactive.color = "#${config.programs.matugen.theme.colors.primary_container.default}"; + urgent.color = "#${config.programs.matugen.theme.colors.error.default}"; + }; + + insert-hint = { + display.color = "#${config.programs.matugen.theme.colors.primary.default}80"; + }; + }; + + hotkey-overlay.skip-at-startup = true; + + screenshot-path = "~/Documents/personal/pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"; + + workspaces."browser" = { }; + workspaces."chat" = { }; + + window-rules = [ + { + matches = [ { app-id = "^1Password$"; } ]; + open-floating = true; + open-focused = true; + block-out-from = "screen-capture"; + } + + { + matches = [ { app-id = "firefox"; } ]; + open-on-workspace = "browser"; + } + + { + matches = [ + { + app-id = "org.gnome.Nautilus"; + title = "Open Files"; + } + { + app-id = "steam"; + title = "Steam Settings"; + } + ]; + open-floating = true; + } + + { + matches = [ + { app-id = "discord"; } + { app-id = "org.element.desktop"; } # TODO + { app-id = "org.signal.desktop"; } # TODO + ]; + open-on-workspace = "chat"; + } + + { + geometry-corner-radius = { + top-left = 8.0; + top-right = 8.0; + bottom-right = 8.0; + bottom-left = 8.0; + }; + clip-to-geometry = true; + } + ]; + + spawn-at-startup = [ + { argv = [ "firefox" ]; } + { argv = [ "discord" ]; } + { argv = [ "${pkgs.lib.getExe' inputs.noctalia.packages.${pkgs.system}.default "noctalia-shell"}" ]; } + ]; + + animations = {}; + + binds = { + "Ctrl+Alt+Delete" = { + hotkey-overlay.title = "Power menu"; + action.spawn = noctalia "sessionMenu toggle"; + }; + + "Mod+D" = { + hotkey-overlay.title = "Run an Application"; + action.spawn = noctalia "launcher toggle"; + }; + + "Mod+L" = { + hotkey-overlay.title = "Lock the Screen"; + action.spawn = noctalia "lockScreen lock"; + }; + + "Mod+Shift+Slash".action.show-hotkey-overlay = { }; + + "Mod+Return" = { + hotkey-overlay.title = "Open a Terminal"; + action.spawn = "kitty"; + }; + + "XF86AudioRaiseVolume" = { + allow-when-locked = true; + action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+"; + }; + "XF86AudioLowerVolume" = { + allow-when-locked = true; + action.spawn-sh = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; + }; + "XF86AudioMute" = { + allow-when-locked = true; + action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; + }; + "XF86AudioMicMute" = { + allow-when-locked = true; + action.spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; + }; + "XF86AudioPlay" = { + allow-when-locked = true; + action.spawn-sh = "playerctl play-pause"; + }; + "XF86AudioStop" = { + allow-when-locked = true; + action.spawn-sh = "playerctl stop"; + }; + "XF86AudioPrev" = { + allow-when-locked = true; + action.spawn-sh = "playerctl previous"; + }; + "XF86AudioNext" = { + allow-when-locked = true; + action.spawn-sh = "playerctl next"; + }; + "Mod+Period" = { + allow-when-locked = true; + action.spawn-sh = "playerctl previous"; + }; + "Mod+Comma" = { + allow-when-locked = true; + action.spawn-sh = "playerctl next"; + }; + "Mod+Slash" = { + allow-when-locked = true; + action.spawn-sh = "playerctl next"; + }; + + # TODO + "XF86MonBrightnessUp" = { + allow-when-locked = true; + action.spawn = [ + "brightnessctl" + "--device=amdgpu_bl1" + "--class=backlight" + "set" + "+10%" + ]; + }; + "XF86MonBrightnessDown" = { + allow-when-locked = true; + action.spawn = [ + "brightnessctl" + "--device=amdgpu_bl1" + "--class=backlight" + "set" + "10%-" + ]; + }; + + "Mod+O" = { + repeat = false; + action.toggle-overview = { }; + }; + "Mod+Q" = { + repeat = false; + action.close-window = { }; + }; + + "Mod+Left".action.focus-column-left = { }; + "Mod+Down".action.focus-window-down = { }; + "Mod+Up".action.focus-window-up = { }; + "Mod+Right".action.focus-column-right = { }; + + "Mod+Shift+Left".action.move-column-left = { }; + "Mod+Shift+Down".action.move-window-down-or-to-workspace-down = { }; + "Mod+Shift+Up".action.move-window-up-or-to-workspace-up = { }; + "Mod+Shift+Right".action.move-column-right = { }; + + "Mod+Home".action.focus-column-first = { }; + "Mod+End".action.focus-column-last = { }; + "Mod+Shift+Home".action.move-column-to-first = { }; + "Mod+Shift+End".action.move-column-to-last = { }; + + "Mod+Ctrl+Left".action.focus-monitor-left = { }; + "Mod+Ctrl+Down".action.focus-monitor-down = { }; + "Mod+Ctrl+Up".action.focus-monitor-up = { }; + "Mod+Ctrl+Right".action.focus-monitor-right = { }; + + "Mod+Shift+Ctrl+Left".action.move-column-to-monitor-left = { }; + "Mod+Shift+Ctrl+Down".action.move-column-to-monitor-down = { }; + "Mod+Shift+Ctrl+Up".action.move-column-to-monitor-up = { }; + "Mod+Shift+Ctrl+Right".action.move-column-to-monitor-right = { }; + + "Mod+1".action.focus-workspace = 1; + "Mod+2".action.focus-workspace = 2; + "Mod+3".action.focus-workspace = 3; + "Mod+4".action.focus-workspace = 4; + "Mod+5".action.focus-workspace = 5; + "Mod+6".action.focus-workspace = 6; + "Mod+7".action.focus-workspace = 7; + "Mod+8".action.focus-workspace = 8; + "Mod+9".action.focus-workspace = 9; + "Mod+Shift+1".action.move-column-to-workspace = 1; + "Mod+Shift+2".action.move-column-to-workspace = 2; + "Mod+Shift+3".action.move-column-to-workspace = 3; + "Mod+Shift+4".action.move-column-to-workspace = 4; + "Mod+Shift+5".action.move-column-to-workspace = 5; + "Mod+Shift+6".action.move-column-to-workspace = 6; + "Mod+Shift+7".action.move-column-to-workspace = 7; + "Mod+Shift+8".action.move-column-to-workspace = 8; + "Mod+Shift+9".action.move-column-to-workspace = 9; + + "Mod+Page_Down".action.focus-workspace-down = { }; + "Mod+Page_Up".action.focus-workspace-up = { }; + # TODO + "Mod+Shift+Ctrl+Page_Down".action.move-column-to-workspace-down = { }; + "Mod+Shift+Ctrl+Page_Up".action.move-column-to-workspace-up = { }; + + "Mod+Shift+Page_Down".action.move-workspace-down = { }; + "Mod+Shift+Page_Up".action.move-workspace-up = { }; + + "Mod+WheelScrollDown" = { + cooldown-ms = 150; + action.focus-workspace-down = { }; + }; + "Mod+WheelScrollUp" = { + cooldown-ms = 150; + action.focus-workspace-up = { }; + }; + "Mod+Shift+WheelScrollDown" = { + cooldown-ms = 150; + action.move-column-to-workspace-down = { }; + }; + "Mod+Shift+WheelScrollUp" = { + cooldown-ms = 150; + action.move-column-to-workspace-up = { }; + }; + + "Mod+WheelScrollRight".action.focus-column-right = { }; + "Mod+WheelScrollLeft".action.focus-column-left = { }; + "Mod+Shift+WheelScrollRight".action.move-column-right = { }; + "Mod+Shift+WheelScrollLeft".action.move-column-left = { }; + + "Mod+BracketLeft".action.consume-or-expel-window-left = { }; + "Mod+BracketRight".action.consume-or-expel-window-right = { }; + + "Mod+Shift+BracketLeft".action.consume-window-into-column = { }; + "Mod+Shift+BracketRight".action.expel-window-from-column = { }; + + "Mod+R".action.switch-preset-column-width = { }; + "Mod+Shift+R".action.switch-preset-window-height = { }; + "Mod+Ctrl+R".action.reset-window-height = { }; + + "Mod+F".action.maximize-column = { }; + "Mod+Shift+F".action.fullscreen-window = { }; + "Mod+S".action.expand-column-to-available-width = { }; + "Mod+C".action.center-column = { }; + "Mod+Shift+C".action.center-visible-columns = { }; + + "Mod+Minus".action.set-column-width = "-10%"; + "Mod+Equal".action.set-column-width = "+10%"; + "Mod+Shift+Minus".action.set-window-height = "-10%"; + "Mod+Shift+Equal".action.set-window-height = "+10%"; + + "Mod+E".action.toggle-window-floating = { }; + "Mod+Shift+E".action.switch-focus-between-floating-and-tiling = { }; + + "Mod+W".action.toggle-column-tabbed-display = { }; + + "Mod+Shift+S".action.screenshot = { }; + + "Mod+Escape" = { + allow-inhibiting = false; + action.toggle-keyboard-shortcuts-inhibit = { }; + }; + + "Mod+Shift+P".action.power-off-monitors = { }; + }; + }; + + programs.noctalia-shell = { + enable = true; + systemd.enable = false; + settings = { + general = { + # avatarImage = cfg.pfp; + }; + colorSchemes = { + darkMode = true; + generateTemplatesForPredefined = true; + inherit matugenSchemeType; + predefinedScheme = "Noctalia (default)"; + useWallpaperColors = true; + }; + location = { + monthBeforeDay = false; + name = "Amsterdam"; + }; + wallpaper = { + enabled = true; + setWallpaperOnAllMonitors = true; + fillMode = "crop"; + }; + appLauncher = { + enableClipboardHistory = true; + terminalCommand = "kitty -e"; + }; + sessionMenu = { + enableCountdown = true; + countdownDuration = 5000; + }; + controlCenter = { + position = "close_to_bar_button"; + shortcuts = { + left = [ + { + id = "WiFi"; + } + { + id = "Bluetooth"; + } + { + id = "PowerProfile"; + } + { + id = "KeepAwake"; + } + ]; + right = [ ]; + }; + }; + bar = { + density = "compact"; + position = "right"; + backgroundOpacity = 0.5; + widgets = { + left = [ + { + id = "ControlCenter"; + useDistroLogo = true; + } + { + id = "NotificationHistory"; + } + { + id = "plugin:catwalk"; + } + ]; + center = [ + { + hideUnoccupied = false; + id = "Workspace"; + labelMode = "none"; + } + ]; + right = [ + { + id = "Tray"; + drawerEnabled = false; + } + { + id = "WiFi"; + } + { + id = "Bluetooth"; + } + ] + ++ [{id = "Battery";}] + ++ [ + { + id = "KeyboardLayout"; + displayMode = "forceOpen"; + } + { + formatHorizontal = "HH:mm"; + formatVertical = "HH mm"; + id = "Clock"; + useMonospacedFont = true; + usePrimaryColor = true; + } + ]; + }; + }; + templates = { + gtk = true; + qt = true; + niri = true; + }; + }; + }; + + home.file.".cache/noctalia/wallpapers.json" = { + text = builtins.toJSON { + defaultWallpaper = wallpaper; + }; + }; + + home.activation.themeFiles = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + mkdir -p ${config.xdg.configHome}/gtk-4.0 + mkdir -p ${config.xdg.configHome}/gtk-3.0 + mkdir -p ${config.xdg.configHome}/qt5ct/colors + mkdir -p ${config.xdg.configHome}/qt6ct/colors + + touch ${config.xdg.configHome}/gtk-4.0/gtk.css + touch ${config.xdg.configHome}/gtk-3.0/gtk.css + touch ${config.xdg.configHome}/qt5ct/colors/noctalia.conf + touch ${config.xdg.configHome}/qt6ct/colors/noctalia.conf + ''; + + programs.matugen = { + enable = true; + wallpaper = wallpaper; + type = matugenSchemeType; + }; + + dconf.settings = { + # appearance + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + enable-hot-corners = false; + gtk-enable-primary-paste = false; + }; + }; +} diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix index 40fa618..e0b2058 100644 --- a/programs/nvim/plugins.nix +++ b/programs/nvim/plugins.nix @@ -23,7 +23,7 @@ in programs.nixvim = { plugins = { treesitter-textobjects = { - enable = true; + enable = false; lspInterop.enable = true; select = { @@ -292,13 +292,13 @@ in window = { position = "right"; width = 30; - mappings = { - "" = "navigate_up"; - "." = "set_root"; - "/" = "fuzzy_finder"; - "f" = "filter_on_submit"; - "h" = "show_help"; - }; + # mappings = { + # "" = "navigate_up"; + # "." = "set_root"; + # "/" = "fuzzy_finder"; + # "f" = "filter_on_submit"; + # "h" = "show_help"; + # }; }; filesystem = { followCurrentFile.enabled = true; @@ -597,7 +597,7 @@ in wilder.history(), }, wilder.python_file_finder_pipeline({ - file_command = {'${pkgs.ripgrep}/bin/rg', '--files'}, + file_command = {'${pkgs.ripgrep}/bin/rg', '--files'}, dir_command = {'${pkgs.fd}/bin/fd', '-td'}, filters = {'cpsm_filter'}, })