niri: Use caelestia quickshell

Also other stuff

manager/Cargo.lock

@@ -2,6 +2,21 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.15"
@@ -34,7 +49,7 @@ checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -43,16 +58,31 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
  "libc",
  "winapi",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "backtrace"
+version = "0.3.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
 
 [[package]]
 name = "bitflags"
@@ -60,6 +90,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
 [[package]]
 name = "bitvec"
 version = "0.19.6"
@@ -74,8 +110,8 @@ dependencies = [
 
 [[package]]
 name = "blueprint"
-version = "0.4.0"
+version = "0.5.0"
-source = "git+https://git.nubo.sh/hulthe/blueprint.git#974a6e89b2b62cfe97e82d2b128f3f2321995606"
+source = "git+https://git.nubo.sh/hulthe/blueprint.git#92df5833161321f0548ae4849548b615e35a9772"
 dependencies = [
  "nom",
  "structopt",
@@ -84,9 +120,18 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.1.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+
+[[package]]
+name = "cc"
+version = "1.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -102,39 +147,20 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "ansi_term",
  "atty",
- "bitflags",
+ "bitflags 1.3.2",
  "strsim",
  "textwrap",
  "unicode-width",
  "vec_map",
 ]
 
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
 [[package]]
 name = "dotfiles"
 version = "0.1.0"
 dependencies = [
  "async-recursion",
  "blueprint",
+ "eyre",
  "futures",
  "log",
  "pretty_env_logger",
@@ -159,6 +185,16 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
 [[package]]
 name = "funty"
 version = "1.1.0"
@@ -167,9 +203,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
 
 [[package]]
 name = "futures"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -182,9 +218,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -192,15 +228,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -209,38 +245,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.21"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -255,15 +291,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "getrandom"
+name = "gimli"
-version = "0.2.6"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
-]
 
 [[package]]
 name = "heck"
@@ -283,6 +314,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
 [[package]]
 name = "humantime"
 version = "1.3.0"
@@ -293,10 +330,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "lazy_static"
+name = "indenter"
-version = "1.4.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lexical-core"
@@ -305,7 +348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
 dependencies = [
  "arrayvec",
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "ryu",
  "static_assertions",
@@ -313,15 +356,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -329,12 +372,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-dependencies = [
- "cfg-if",
-]
 
 [[package]]
 name = "memchr"
@@ -343,22 +383,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
-name = "mio"
+name = "miniz_oxide"
-version = "0.8.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
+ "adler",
+ "autocfg",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi 0.3.9",
  "libc",
- "log",
+ "wasi",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
- "windows-sys",
 ]
 
 [[package]]
 name = "nom"
-version = "6.2.1"
+version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
+checksum = "c6a7a9657c84d5814c6196b68bb4429df09c18b1573806259fba397ea4ad0d44"
 dependencies = [
  "bitvec",
  "funty",
@@ -368,26 +418,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "num_cpus"
+name = "object"
-version = "1.13.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
-dependencies = [
- "hermit-abi",
- "libc",
-]
 
 [[package]]
 name = "once_cell"
-version = "1.12.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -395,22 +441,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-sys",
+ "windows-targets",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -437,7 +483,7 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "version_check",
 ]
 
@@ -454,9 +500,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.39"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -469,9 +515,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -484,22 +530,11 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "thiserror",
 ]
 
 [[package]]
@@ -515,71 +550,86 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.26"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "ryu"
-version = "1.0.10"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.214"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.87",
 ]
 
 [[package]]
-name = "signal-hook-registry"
+name = "shlex"
-version = "1.4.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "smallvec"
-version = "1.8.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -615,14 +665,25 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.96"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -637,9 +698,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -655,81 +716,79 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.19.2"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
 dependencies = [
+ "backtrace",
  "bytes",
  "libc",
- "memchr",
  "mio",
- "num_cpus",
- "once_cell",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.8.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.0"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.9.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "vec_map"
@@ -739,15 +798,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasi"
@@ -773,11 +826,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -788,46 +841,85 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
+ "windows_i686_gnullvm",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
  "windows_x86_64_msvc",
 ]
 
 [[package]]
-name = "windows_aarch64_msvc"
+name = "windows_aarch64_gnullvm"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "wyz"
@@ -837,9 +929,6 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
 
 [[package]]
 name = "xdg"
-version = "2.4.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6"
+checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
-dependencies = [
- "dirs",
-]

manager/Cargo.toml

@@ -13,6 +13,7 @@ async-recursion = "0.3.2"
 xdg = "2.2.0"
 thiserror = "1.0.24"
 toml = "0.5.8"
+eyre = "0.6.12"
 
 [dependencies.blueprint]
 git = "https://git.nubo.sh/hulthe/blueprint.git"

manager/src/builder.rs

@@ -3,16 +3,17 @@ use crate::Config;
 use async_recursion::async_recursion;
 use blueprint::{parse_template, Env, Value};
 use futures::future::join_all;
+use futures::TryFutureExt;
 use std::collections::HashMap;
 use std::env;
 use std::ffi::OsStr;
 use std::io::ErrorKind;
 use std::path::PathBuf;
-use std::process::Command;
 use std::str::from_utf8;
 use tokio::fs::{copy, create_dir, read_dir, read_to_string, File};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::join;
+use tokio::process::Command;
 
 pub const TEMPLATE_EXTENSION: &str = "tpl";
 
@@ -20,6 +21,7 @@ pub async fn build_tree(cfg: &Config) -> Result<(), Errors> {
     let mut env = Env::new();
     env.insert("hostname".into(), Value::Str(get_hostname().await));
     env.insert("username".into(), Value::Str(get_username()));
+    env.insert("os".into(), Value::Str(get_operating_system().await));
 
     debug!("trying to read {:?}", cfg.variables_path);
     if let Ok(s) = read_to_string(&cfg.variables_path).await {
@@ -31,11 +33,7 @@ pub async fn build_tree(cfg: &Config) -> Result<(), Errors> {
             let value = match toml_value {
                 toml::Value::String(s) => Value::Str(s),
                 toml::Value::Boolean(b) => Value::Bool(b),
-                _ => {
+                _ => return Err(InnerError::Type.with_location(&cfg.variables_path).into()),
-                    return Err(InnerError::TypeErr
-                        .with_location(&cfg.variables_path)
-                        .into())
-                }
             };
 
             env.insert(key, value);
@@ -170,26 +168,38 @@ fn get_username() -> String {
     env::var("USER")
         .ok()
         .or_else(|| env::var("USERNAME").ok())
-        .unwrap_or_else(String::new)
+        .unwrap_or_default()
 }
 
 async fn get_hostname() -> String {
-    async fn read_hostname_file() -> Option<String> {
+    async fn read_hostname_file() -> eyre::Result<String> {
-        read_to_string("/etc/hostname").await.ok()
+        Ok(read_to_string("/etc/hostname").await?)
     }
 
-    // TODO: should be async
+    async fn run_hostname_cmd() -> eyre::Result<String> {
-    fn run_hostname_cmd() -> Option<String> {
         Command::new("hostname")
             .output()
-            .ok()
+            .await
-            .and_then(|out| from_utf8(&out.stdout).ok().map(str::to_string))
+            .map_err(Into::into)
+            .and_then(|out| Ok(from_utf8(&out.stdout).map(str::to_string)?))
     }
 
     read_hostname_file()
+        .or_else(|_| run_hostname_cmd())
         .await
-        .or_else(run_hostname_cmd)
+        .unwrap_or(String::new())
-        .unwrap_or_else(String::new)
         .trim()
         .to_string()
 }
+
+async fn get_operating_system() -> String {
+    Command::new("uname")
+        .output()
+        .await
+        .ok()
+        .as_ref()
+        .and_then(|out| from_utf8(&out.stdout).ok())
+        .unwrap_or("unknown")
+        .trim()
+        .to_lowercase()
+}

manager/src/error.rs

@@ -15,16 +15,16 @@ pub struct Error {
 #[derive(Debug, Error)]
 pub enum InnerError {
     #[error("IO Error: {0}")]
-    IoErr(#[from] io::Error),
+    Io(#[from] io::Error),
 
     #[error("Failed to parse template file")]
-    TemplateErr(#[from] blueprint::Error),
+    Template(#[from] blueprint::Error),
 
     #[error("Failed to parse toml file")]
-    TomlErr(#[from] toml::de::Error),
+    Toml(#[from] toml::de::Error),
 
     #[error("Unsupported variable type")]
-    TypeErr,
+    Type,
 }
 
 impl From<Vec<Error>> for Errors {

manager/src/main.rs

@@ -10,7 +10,7 @@ use builder::build_tree;
 use error::Errors;
 use linker::link_tree;
 use log::LevelFilter;
-use peeker::peek_tree;
+use peeker::print_variables;
 use std::env;
 use std::path::PathBuf;
 use structopt::StructOpt;
@@ -88,8 +88,8 @@ async fn run() -> Result<(), Errors> {
     };
 
     if opt.print_variables {
-        info!("peeking tree");
+        info!("scanning tree");
-        peek_tree(&cfg).await?;
+        print_variables(&cfg).await?;
     } else {
         info!("building tree");
         build_tree(&cfg).await?;

manager/src/peeker.rs

@@ -9,7 +9,8 @@ use std::path::PathBuf;
 use tokio::fs::{read_dir, read_to_string};
 use tokio::join;
 
-pub async fn peek_tree(cfg: &Config) -> Result<(), Errors> {
+/// Iterate over the directory tree and print all variables used in all template files.
+pub async fn print_variables(cfg: &Config) -> Result<(), Errors> {
     for var in dir(cfg, PathBuf::new()).await? {
         println!("{}", var);
     }

tree/.config/alacritty/alacritty.toml.tpl

@@ -83,6 +83,7 @@ style = "Bold"
 family = "SauceCodePro Nerd Font"
 {% elif hostname == "vostok" %}
 family = "Source Code Pro for Powerline"
+{% elif os == "darwin" %}
 {% else %}
 family = "monospace"
 {% end %}
@@ -93,6 +94,7 @@ style = "Italic"
 family = "SauceCodePro Nerd Font"
 {% elif hostname == "vostok" %}
 family = "Source Code Pro for Powerline"
+{% elif os == "darwin" %}
 {% else %}
 family = "monospace"
 {% end %}
@@ -103,6 +105,7 @@ style = "Regular"
 family = "SauceCodePro Nerd Font"
 {% elif hostname == "vostok" %}
 family = "Source Code Pro for Powerline"
+{% elif os == "darwin" %}
 {% else %}
 family = "monospace"
 {% end %}
@@ -360,14 +363,16 @@ mouse = "Middle"
 [selection]
 semantic_escape_chars = ",│`|:\"' ()[]{}<>"
 
-[shell]
+[terminal.shell]
 program = "nu"
 
 [window]
 {% if demo %}
 opacity = 1.0
+{% elif os == "darwin" %}
+opacity = 0.95
 {% else %}
-opacity = 0.85
+opacity = 0.90
 {% end %}
 
 [window.dimensions]

tree/.config/bat/config.tpl

@@ -0,0 +1,6 @@
+{% if light %}
+--theme=gruvbox-light
+{% else %}
+--theme=gruvbox-dark
+{% end %}
+

tree/.config/caelestia/shell.json

@@ -0,0 +1,220 @@
+{
+    "appearance": {
+        "anim": {
+            "durations": {
+                "scale": 1
+            }
+        },
+        "font": {
+            "family": {
+                "material": "Material Symbols Rounded",
+                "mono": "CaskaydiaCove NF",
+                "sans": "Rubik"
+            },
+            "size": {
+                "scale": 1
+            }
+        },
+        "padding": {
+            "scale": 1
+        },
+        "rounding": {
+            "scale": 1
+        },
+        "spacing": {
+            "scale": 1
+        },
+        "transparency": {
+            "enabled": false,
+            "base": 0.85,
+            "layers": 0.4
+        }
+    },
+    "general": {
+        "apps": {
+            "terminal": [
+                "foot"
+            ],
+            "audio": [
+                "pavucontrol"
+            ]
+        }
+    },
+    "background": {
+        "desktopClock": {
+            "enabled": false
+        },
+        "enabled": true,
+        "visualiser": {
+            "enabled": true,
+            "autoHide": true,
+            "rounding": 1,
+            "spacing": 1
+        }
+    },
+    "bar": {
+        "clock": {
+            "showIcon": false
+        },
+        "dragThreshold": 20,
+        "entries": [
+            {
+                "id": "logo",
+                "enabled": true
+            },
+            {
+                "id": "workspaces",
+                "enabled": true
+            },
+            {
+                "id": "spacer",
+                "enabled": true
+            },
+            {
+                "id": "activeWindow",
+                "enabled": true
+            },
+            {
+                "id": "spacer",
+                "enabled": true
+            },
+            {
+                "id": "tray",
+                "enabled": true
+            },
+            {
+                "id": "clock",
+                "enabled": true
+            },
+            {
+                "id": "statusIcons",
+                "enabled": true
+            },
+            {
+                "id": "idleInhibitor",
+                "enabled": true
+            },
+            {
+                "id": "power",
+                "enabled": true
+            }
+        ],
+        "persistent": false,
+        "showOnHover": true,
+        "status": {
+            "showAudio": false,
+            "showBattery": true,
+            "showBluetooth": true,
+            "showMicrophone": false,
+            "showKbLayout": false,
+            "showNetwork": true
+        },
+        "tray": {
+            "background": true,
+            "recolour": true
+        },
+        "workspaces": {
+            "activeIndicator": true,
+            "activeLabel": "󰮯",
+            "activeTrail": false,
+            "groupIconsByApp": true,
+            "groupingRespectsLayout": true,
+            "windowRighClickContext": true,
+            "label": "◦",
+            "occupiedBg": true,
+            "occupiedLabel": "⊙",
+            "showWindows": true,
+            "shown": 4,
+            "windowIconImage": false,
+            "focusedWindowBlob": true,
+            "windowIconGap": 0,
+            "windowIconSize": 30
+        }
+    },
+    "border": {
+        "rounding": 25,
+        "thickness": 10
+    },
+    "dashboard": {
+        "mediaUpdateInterval": 500,
+        "showOnHover": true
+    },
+    "launcher": {
+        "actionPrefix": ">",
+        "dragThreshold": 50,
+        "vimKeybinds": false,
+        "enableDangerousActions": false,
+        "maxShown": 8,
+        "maxWallpapers": 9,
+        "specialPrefix": "@",
+        "useFuzzy": {
+            "apps": false,
+            "actions": false,
+            "schemes": false,
+            "variants": false,
+            "wallpapers": false
+        },
+        "showOnHover": false
+    },
+    "lock": {
+        "recolourLogo": false
+    },
+    "notifs": {
+        "actionOnClick": false,
+        "clearThreshold": 0.3,
+        "defaultExpireTimeout": 5000,
+        "expandThreshold": 20,
+        "expire": false
+    },
+    "osd": {
+        "enabled": true,
+        "enableBrightness": true,
+        "enableMicrophone": true,
+        "hideDelay": 2000
+    },
+    "paths": {
+        "mediaGif": "root:/assets/bongocat.gif",
+        "sessionGif": "root:/assets/kurukuru.gif",
+        "wallpaperDir": "~/.config/wallpapers/"
+    },
+    "services": {
+        "audioIncrement": 0.1,
+        "defaultPlayer": "Spotify",
+        "gpuType": "",
+        "playerAliases": [
+            {
+                "from": "com.github.th_ch.youtube_music",
+                "to": "YT Music"
+            }
+        ],
+        "weatherLocation": "",
+        "useFahrenheit": false,
+        "useTwelveHourClock": false,
+        "smartScheme": true,
+        "visualiserBars": 45
+    },
+    "session": {
+        "dragThreshold": 30,
+        "vimKeybinds": true,
+        "commands": {
+            "logout": [
+                "loginctl",
+                "terminate-user",
+                ""
+            ],
+            "shutdown": [
+                "systemctl",
+                "poweroff"
+            ],
+            "hibernate": [
+                "systemctl",
+                "hibernate"
+            ],
+            "reboot": [
+                "systemctl",
+                "reboot"
+            ]
+        }
+    }
+}
+

tree/.config/dunst/dunstrc

@@ -1,434 +0,0 @@
-# See dunst(5) for all configuration options
-
-[global]
-    ### Display ###
-
-    # Which monitor should the notifications be displayed on.
-    monitor = 0
-
-    # Display notification on focused monitor.  Possible modes are:
-    #   mouse: follow mouse pointer
-    #   keyboard: follow window with keyboard focus
-    #   none: don't follow anything
-    #
-    # "keyboard" needs a window manager that exports the
-    # _NET_ACTIVE_WINDOW property.
-    # This should be the case for almost all modern window managers.
-    #
-    # If this option is set to mouse or keyboard, the monitor option
-    # will be ignored.
-    follow = none
-
-    ### Geometry ###
-
-    # dynamic width from 0 to 300
-    # width = (0, 300)
-    # constant width of 300
-    width = 300
-
-    # The maximum height of a single notification, excluding the frame.
-    height = 300
-
-    # Position the notification in the top right corner
-    origin = top-right
-
-    # Offset from the origin
-    offset = 10x50
-
-    # Scale factor. It is auto-detected if value is 0.
-    scale = 0
-
-    # Maximum number of notification (0 means no limit)
-    notification_limit = 0
-
-    ### Progress bar ###
-
-    # Turn on the progess bar. It appears when a progress hint is passed with
-    # for example dunstify -h int:value:12
-    progress_bar = true
-
-    # Set the progress bar height. This includes the frame, so make sure
-    # it's at least twice as big as the frame width.
-    progress_bar_height = 10
-
-    # Set the frame width of the progress bar
-    progress_bar_frame_width = 1
-
-    # Set the minimum width for the progress bar
-    progress_bar_min_width = 150
-
-    # Set the maximum width for the progress bar
-    progress_bar_max_width = 300
-
-
-    # Show how many messages are currently hidden (because of
-    # notification_limit).
-    indicate_hidden = yes
-
-    # The transparency of the window.  Range: [0; 100].
-    # This option will only work if a compositing window manager is
-    # present (e.g. xcompmgr, compiz, etc.). (X11 only)
-    transparency = 0
-
-    # Draw a line of "separator_height" pixel height between two
-    # notifications.
-    # Set to 0 to disable.
-    separator_height = 2
-
-    # Padding between text and separator.
-    padding = 8
-
-    # Horizontal padding.
-    horizontal_padding = 8
-
-    # Padding between text and icon.
-    text_icon_padding = 0
-
-    # Defines width in pixels of frame around the notification window.
-    # Set to 0 to disable.
-    frame_width = 3
-
-    # Defines color of the frame around the notification window.
-    frame_color = "#aaaaaa"
-
-    # Define a color for the separator.
-    # possible values are:
-    #  * auto: dunst tries to find a color fitting to the background;
-    #  * foreground: use the same color as the foreground;
-    #  * frame: use the same color as the frame;
-    #  * anything else will be interpreted as a X color.
-    separator_color = frame
-
-    # Sort messages by urgency.
-    sort = yes
-
-    # Don't remove messages, if the user is idle (no mouse or keyboard input)
-    # for longer than idle_threshold seconds.
-    # Set to 0 to disable.
-    # A client can set the 'transient' hint to bypass this. See the rules
-    # section for how to disable this if necessary
-    # idle_threshold = 120
-
-    ### Text ###
-
-    font = Monospace 8
-
-    # The spacing between lines.  If the height is smaller than the
-    # font height, it will get raised to the font height.
-    line_height = 0
-
-    # Possible values are:
-    # full: Allow a small subset of html markup in notifications:
-    #        <b>bold</b>
-    #        <i>italic</i>
-    #        <s>strikethrough</s>
-    #        <u>underline</u>
-    #
-    #        For a complete reference see
-    #        <https://docs.gtk.org/Pango/pango_markup.html>.
-    #
-    # strip: This setting is provided for compatibility with some broken
-    #        clients that send markup even though it's not enabled on the
-    #        server. Dunst will try to strip the markup but the parsing is
-    #        simplistic so using this option outside of matching rules for
-    #        specific applications *IS GREATLY DISCOURAGED*.
-    #
-    # no:    Disable markup parsing, incoming notifications will be treated as
-    #        plain text. Dunst will not advertise that it has the body-markup
-    #        capability if this is set as a global setting.
-    #
-    # It's important to note that markup inside the format option will be parsed
-    # regardless of what this is set to.
-    markup = full
-
-    # The format of the message.  Possible variables are:
-    #   %a  appname
-    #   %s  summary
-    #   %b  body
-    #   %i  iconname (including its path)
-    #   %I  iconname (without its path)
-    #   %p  progress value if set ([  0%] to [100%]) or nothing
-    #   %n  progress value if set without any extra characters
-    #   %%  Literal %
-    # Markup is allowed
-    format = "<b>%s</b>\n%b"
-
-    # Alignment of message text.
-    # Possible values are "left", "center" and "right".
-    alignment = left
-
-    # Vertical alignment of message text and icon.
-    # Possible values are "top", "center" and "bottom".
-    vertical_alignment = center
-
-    # Show age of message if message is older than show_age_threshold
-    # seconds.
-    # Set to -1 to disable.
-    show_age_threshold = 60
-
-    # Specify where to make an ellipsis in long lines.
-    # Possible values are "start", "middle" and "end".
-    ellipsize = middle
-
-    # Ignore newlines '\n' in notifications.
-    ignore_newline = no
-
-    # Stack together notifications with the same content
-    stack_duplicates = true
-
-    # Hide the count of stacked notifications with the same content
-    hide_duplicate_count = false
-
-    # Display indicators for URLs (U) and actions (A).
-    show_indicators = yes
-
-    ### Icons ###
-
-    # Align icons left/right/top/off
-    icon_position = left
-
-    # Scale small icons up to this size, set to 0 to disable. Helpful
-    # for e.g. small files or high-dpi screens. In case of conflict,
-    # max_icon_size takes precedence over this.
-    min_icon_size = 0
-
-    # Scale larger icons down to this size, set to 0 to disable
-    max_icon_size = 32
-
-    # Paths to default icons.
-    icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-
-    ### History ###
-
-    # Should a notification popped up from history be sticky or timeout
-    # as if it would normally do.
-    sticky_history = yes
-
-    # Maximum amount of notifications kept in history
-    history_length = 20
-
-    ### Misc/Advanced ###
-
-    # dmenu path.
-    dmenu = /usr/bin/dmenu -p dunst:
-
-    # Browser for opening urls in context menu.
-    browser = /usr/bin/xdg-open
-
-    # Always run rule-defined scripts, even if the notification is suppressed
-    always_run_script = true
-
-    # Define the title of the windows spawned by dunst
-    title = Dunst
-
-    # Define the class of the windows spawned by dunst
-    class = Dunst
-
-    # Define the corner radius of the notification window
-    # in pixel size. If the radius is 0, you have no rounded
-    # corners.
-    # The radius will be automatically lowered if it exceeds half of the
-    # notification height to avoid clipping text and/or icons.
-    corner_radius = 0
-
-    # Ignore the dbus closeNotification message.
-    # Useful to enforce the timeout set by dunst configuration. Without this
-    # parameter, an application may close the notification sent before the
-    # user defined timeout.
-    ignore_dbusclose = false
-
-    ### Wayland ###
-    # These settings are Wayland-specific. They have no effect when using X11
-
-    # Uncomment this if you want to let notications appear under fullscreen
-    # applications (default: overlay)
-    # layer = top
-
-    # Set this to true to use X11 output on Wayland.
-    force_xwayland = false
-
-    ### Legacy
-
-    # Use the Xinerama extension instead of RandR for multi-monitor support.
-    # This setting is provided for compatibility with older nVidia drivers that
-    # do not support RandR and using it on systems that support RandR is highly
-    # discouraged.
-    #
-    # By enabling this setting dunst will not be able to detect when a monitor
-    # is connected or disconnected which might break follow mode if the screen
-    # layout changes.
-    force_xinerama = false
-
-    ### mouse
-
-    # Defines list of actions for each mouse event
-    # Possible values are:
-    # * none: Don't do anything.
-    # * do_action: Invoke the action determined by the action_name rule. If there is no
-    #              such action, open the context menu.
-    # * open_url: If the notification has exactly one url, open it. If there are multiple
-    #             ones, open the context menu.
-    # * close_current: Close current notification.
-    # * close_all: Close all notifications.
-    # * context: Open context menu for the notification.
-    # * context_all: Open context menu for all notifications.
-    # These values can be strung together for each mouse event, and
-    # will be executed in sequence.
-    mouse_left_click = close_current
-    mouse_middle_click = do_action, close_current
-    mouse_right_click = close_all
-
-# Experimental features that may or may not work correctly. Do not expect them
-# to have a consistent behaviour across releases.
-[experimental]
-    # Calculate the dpi to use on a per-monitor basis.
-    # If this setting is enabled the Xft.dpi value will be ignored and instead
-    # dunst will attempt to calculate an appropriate dpi value for each monitor
-    # using the resolution and physical size. This might be useful in setups
-    # where there are multiple screens with very different dpi values.
-    per_monitor_dpi = false
-
-
-[urgency_low]
-    # IMPORTANT: colors have to be defined in quotation marks.
-    # Otherwise the "#" and following would be interpreted as a comment.
-    frame_color = "#1D918B"
-    foreground = "#FFEE79"
-    background = "#18191E"
-    timeout = 5
-
-[urgency_normal]
-    frame_color = "#D16BB7"
-    foreground = "#FFEE79"
-    background = "#18191E"
-    timeout = 10
-
-[urgency_critical]
-    frame_color = "#FC2929"
-    foreground = "#FFFF00"
-    background = "#18191E"
-    timeout = 10
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-#
-# Messages can be matched by
-#    appname (discouraged, see desktop_entry)
-#    body
-#    category
-#    desktop_entry
-#    icon
-#    match_transient
-#    msg_urgency
-#    stack_tag
-#    summary
-#
-# and you can override the
-#    background
-#    foreground
-#    format
-#    frame_color
-#    fullscreen
-#    new_icon
-#    set_stack_tag
-#    set_transient
-#    set_category
-#    timeout
-#    urgency
-#    icon_position
-#    skip_display
-#    history_ignore
-#    action_name
-#    word_wrap
-#    ellipsize
-#    alignment
-#    hide_text
-#
-# Shell-like globbing will get expanded.
-#
-# Instead of the appname filter, it's recommended to use the desktop_entry filter.
-# GLib based applications export their desktop-entry name. In comparison to the appname,
-# the desktop-entry won't get localized.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-#   script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-# Disable the transient hint so that idle_threshold cannot be bypassed from the
-# client
-#[transient_disable]
-#    match_transient = yes
-#    set_transient = no
-#
-# Make the handling of transient notifications more strict by making them not
-# be placed in history.
-#[transient_history_ignore]
-#    match_transient = yes
-#    history_ignore = yes
-
-# fullscreen values
-# show: show the notifications, regardless if there is a fullscreen window opened
-# delay: displays the new notification, if there is no fullscreen window active
-#        If the notification is already drawn, it won't get undrawn.
-# pushback: same as delay, but when switching into fullscreen, the notification will get
-#           withdrawn from screen again and will get delayed like a new notification
-#[fullscreen_delay_everything]
-#    fullscreen = delay
-#[fullscreen_show_critical]
-#    msg_urgency = critical
-#    fullscreen = show
-
-#[espeak]
-#    summary = "*"
-#    script = dunst_espeak.sh
-
-#[script-test]
-#    summary = "*script*"
-#    script = dunst_test.sh
-
-#[ignore]
-#    # This notification will not be displayed
-#    summary = "foobar"
-#    skip_display = true
-
-#[history-ignore]
-#    # This notification will not be saved in history
-#    summary = "foobar"
-#    history_ignore = yes
-
-#[skip-display]
-#    # This notification will not be displayed, but will be included in the history
-#    summary = "foobar"
-#    skip_display = yes
-
-#[signed_on]
-#    appname = Pidgin
-#    summary = "*signed on*"
-#    urgency = low
-#
-#[signed_off]
-#    appname = Pidgin
-#    summary = *signed off*
-#    urgency = low
-#
-#[says]
-#    appname = Pidgin
-#    summary = *says*
-#    urgency = critical
-#
-#[twitter]
-#    appname = Pidgin
-#    summary = *twitter.com*
-#    urgency = normal
-#
-#[stack-volumes]
-#    appname = "some_volume_notifiers"
-#    set_stack_tag = "volume"
-#
-# vim: ft=cfg

tree/.config/eww/eww.scss

@@ -1,7 +1,8 @@
 $text: #e0c1c1;
-$highlight1: #fdab70;
+//$highlight1: #fdab70; // orange
+$highlight1: #f65d76;   // akira pink
 $highlight2: white;
-$background: #0f0f0f;
+$background: #151515;
 $lowlight2: #272727;
 $lowlight1: black;
 $transparent: rgba(#000000, 0.0);
@@ -57,19 +58,20 @@ window {
 }
 
 .thingy {
-	//border: solid $highlight1 2px;
+	padding-top: 8px;
-	//border-top: solid $highlight1 1px;
+	padding-bottom: 8px;
-	//border-bottom: solid $highlight2 3px;
-	//border-bottom: dotted $highlight1 6px;
-	//color: $highlight1;
-	//background: $lowlight1;
-	//border-radius: 30px;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
 	min-height: 20px;
 	border-top: solid $highlight1 2px;
 }
 
+.bigthingy {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	min-height: 20px;
+	border-top: solid $highlight1 2px;
+	font-size: 35px;
+}
+
 scale trough {
 	all: unset;
 	background-color: #22242b;
@@ -140,16 +142,36 @@ scale trough {
 
 .battery-gauge.low {
 	color: red;
+	animation: 1s ease-in 1s infinite alternate battery-gauge-low;
 }
 
 .battery-gauge.charging {
 	color: purple;
 }
 
+@keyframes battery-gauge-low {
+	from {
+		background-color: $background;
+	}
+
+	to {
+		background-color: red;
+	}
+}
+
 .calendar {
 	background: $lowlight2;
 }
 
+.toggleable {
+  transition: border 0.5s;
+}
+
+.toggleable.on {
+  border-left: solid 2px green;
+  border-right: solid 2px green;
+}
+
 .clickable {
 	transition: background-color 0.2s;
 }
@@ -176,6 +198,9 @@ scale trough {
 	margin-top: -8px;
 }
 
+.color_scheme {
+}
+
 .pwrbtn {
 	font-size: 35px;
 	font-weight: 400;

tree/.config/eww/eww.yuck

@@ -14,7 +14,7 @@
 (defwindow bar1
 	:monitor 1
 	:geometry (geometry :height "100%"
-	                    :width "50px"
+	                    :width "40px"
 	                    :anchor "center left")
 	:stacking "fg"
 	:exclusive true
@@ -40,10 +40,15 @@
 		(speaker)
 		(temperature)
 		(battery)
+		(ram)
 		(box :class "thingy" (systray :orientation "v"))
+		(color_scheme)
+		(xwayland)
+		(kb_layout)
 		(date)
 		(clock)
-		(pwr)
+		(notifications)
+		(lock)
 ))
 
 (defwidget workspaces [monitor]
@@ -68,7 +73,8 @@
 
 (defwidget workspace [monitor n]
 	(button :visible {jq(workspaces, '.["${n}"] != null')}
-	        :class 'workspace ${workspaces[n].active && monitor == workspaces[n].monitor ? "active" : ""}'
+	        :class 'workspace ${workspaces?.[n]?.active == true && monitor == workspaces?.[n]?.monitor ? "active" : ""}'
+	        :onclick 'wmutils switch-workspace ${n}'
 		(label :text n))
 )
 
@@ -94,7 +100,7 @@
 					(button :class "clickable" :onclick "ba bluetoothctl disconnect" (label :text "---"))
 				)
 			)
-			(label :text "BLT")
+			(label :text "BLU")
 			(revealer :transition "slideup"
 			          :reveal {!show_bluetooth}
 				(label :text "---")
@@ -120,7 +126,7 @@
 			(label :text "VOL")
 			(revealer :transition "slideup"
 			          :reveal {!show_volume}
-				(label :text volume_out)
+				(label :text {is_muted ? "MM" : volume_out})
 			)
 )))
 
@@ -129,26 +135,72 @@
 	     :valign "end"
 	     :class "battery thingy"
 	     :visible {current_temp != ""}
-		(label :text "TMP")
+		(label :text "TEM")
 		(label :text "${current_temp / 1000}°")
 ))
 
+(defwidget ram []
+	(box :orientation "v"
+	     :valign "end"
+	     :class "thingy"
+		(label :text "RAM")
+		(circular-progress
+			:thickness 4.0
+			:value {EWW_RAM.used_mem_perc}
+			:class {
+				EWW_RAM?.used_mem_perc > 80  ? "battery-gauge low" :
+				                               "battery-gauge"
+			}
+		)
+))
+
 (defwidget battery []
 	(box :orientation "v"
 	     :valign "end"
 	     :class "thingy"
-	     :visible {bat_charge != ""}
+	     :visible {EWW_BATTERY != "" && EWW_BATTERY?.BAT0?.capacity != ""}
 		(label :text "BAT")
 		(circular-progress
 			:thickness 4.0
-			:value bat_charge
+			:value {EWW_BATTERY != "" ? EWW_BATTERY?.BAT0?.capacity : 100.0}
 			:class {
-				bat_status == "Charging" ? "battery-gauge charging" :
+				EWW_BATTERY == ""                       ? "" :
-				bat_charge < 15          ? "battery-gauge low" :
+				EWW_BATTERY?.BAT0?.status == "Charging" ? "battery-gauge charging" :
-				                           "battery-gauge"
+				EWW_BATTERY?.BAT0?.capacity < 15        ? "battery-gauge low" :
+				                                          "battery-gauge"
 			}
 		)
-		;(label :text "${bat_charge}%")
+))
+
+(defwidget color_scheme []
+	(button
+		:onclick {
+			color_scheme == "light" ? "set-color-scheme dark && ${EWW_CMD} update color_scheme=dark"
+			                        : "set-color-scheme light && ${EWW_CMD} update color_scheme=light"
+		}
+		:hexpand true
+		:class "bigthingy clickable"
+		(label :text {
+			color_scheme == "light" ? "" : ""
+		})
+))
+
+(defwidget xwayland []
+	(button
+		:onclick {
+			xwayland_on ? "wmutils xwayland stop  && ${EWW_CMD} update xwayland_on=false"
+			            : "wmutils xwayland start && ${EWW_CMD} update xwayland_on=true"
+		}
+		:hexpand true
+		:class {"thingy clickable toggleable" + (xwayland_on ? " on" : "")}
+		(label :text "XWL")
+))
+
+(defwidget kb_layout []
+	(button :onclick "wmutils next-keyboard-layout"
+			:hexpand true
+			:class "thingy clickable"
+		(label :text keyboard_layout)
 ))
 
 (defwidget date []
@@ -170,10 +222,26 @@
 		(label :text current_minute)
 ))
 
+(defwidget notifications []
+	(button :orientation "v"
+	        :valign "end"
+	        :onclick "swaync-client -t -sw"
+	        :class "bigthingy clickable"
+		(label :text "🕭")
+))
+
+(defwidget lock []
+	(button :orientation "v"
+		    :valign "end"
+		    :class "bigthingy clickable"
+		    :onclick "loginctl lock-session"
+		(label :text "󰩈")
+))
+
 (defwidget pwr []
 	(button :orientation "v"
 		    :valign "end"
-		    :class "thingy pwrbtn clickable"
+		    :class "bigthingy clickable"
 		    :onclick "${EWW_CMD} open --toggle pwrctl"
 		(label :text "⏻")
 ))
@@ -197,13 +265,20 @@
 (defvar show_volume false)
 (defvar show_bluetooth false)
 
-(defpoll workspaces      :interval "1s" "eww-workspaces")
+(defpoll workspaces      :interval "1s" "wmutils workspaces")
 (defpoll volume_out      :interval "1s" "pamixer --get-volume")
-(defpoll vpn_status      :interval "1s" "mullvad-status")
+(defpoll color_scheme    :interval "5s"  "get-color-scheme")
+
+(defpoll is_muted        :interval "1s" :initial false "pamixer --get-mute")
+
 (defpoll current_minute  :interval "1s" "date +%M")
 (defpoll current_hour    :interval "1s" "date +%H")
 (defpoll current_day     :interval "60s" "date +%d")
 (defpoll current_month   :interval "60s" "date +%b")
-(defpoll bat_charge      :interval "15s" "cat /sys/class/power_supply/BAT0/capacity")
-(defpoll bat_status      :interval "15s" "cat /sys/class/power_supply/BAT0/status")
 (defpoll current_temp    :interval "5s"  "cat /sys/class/thermal/thermal_zone*/temp")
+
+(defpoll keyboard_layout :interval "5s"  "wmutils keyboard-layout --short")
+
+(defpoll xwayland_on     :interval "5s"  "wmutils xwayland is-running")
+
+(defvar vpn_status "{'icon': '-', 'class': 'disconnected'}" )

tree/.config/fuzzel/fuzzel.ini

@@ -0,0 +1,23 @@
+icon-theme=hicolor
+lines=10
+prompt="▶    "
+width=32
+font=FiraSans,Sans:size=18
+line-height=27
+
+[colors]
+# akira pink
+text=e0c1c1ff 
+
+background=151515aa
+selection=282a36ff
+
+match=ebebebff 
+selection-match=ffffffff
+
+selection-text=d4d4d4ff
+border=f65d76ff
+
+[border]
+width=3
+radius=24

tree/.config/gtk-3.0/settings.ini.tpl

@@ -1,4 +1,4 @@
-{% if hostname == "buran" %}
+{% if hostname != "pinenote" %} 
 [Settings]
 gtk-application-prefer-dark-theme = true
 {% end %}

tree/.config/gtk-4.0/settings.ini.tpl

@@ -0,0 +1,5 @@
+{% if hostname != "pinenote" %} 
+[Settings]
+gtk-application-prefer-dark-theme = true
+{% end %} 
+

tree/.config/helix/config.toml.tpl

@@ -0,0 +1,21 @@
+{% if light %}
+theme = "gruvbox_light"
+{% else %}
+theme = "gruvbox"
+{% end %}
+
+[editor]
+auto-format = true
+#line-number = "relative"
+
+[editor.cursor-shape]
+insert = "bar"
+normal = "block"
+select = "underline"
+
+[keys.select]
+X = "extend_line_above" # Extend the selection with the line above the selection
+
+[keys.normal]
+X = "extend_line_above" # Extend the selection with the line above the selection
+C-n = "extend_search_next" # Add next search result to selection

tree/.config/helix/languages.toml

@@ -0,0 +1,6 @@
+[[language]]
+name = "rust"
+diagnostic-severity = "info" # don't show hints
+
+[language-server.qmlls]
+command = "qmlls6"

tree/.config/hypr/hyprland.conf.tpl

@@ -17,7 +17,7 @@ env = XCURSOR_SIZE,24
 env = PATH,$HOME/.local/bin:$HOME/.cargo/bin:$PATH
 env = QT_QPA_PLATFORM,wayland;xcb
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_QPA_PLATFORMTHEME,qt5ct
+env = QT_QPA_PLATFORMTHEME,qt5ct:qt6ct
 env = GTK_USE_PORTAL,1
 env = BROWSER,firefox
 env = MOZ_ENABLE_WAYLAND,1
@@ -28,7 +28,7 @@ input {
     kb_layout = se
     kb_variant =
     kb_model =
-    kb_options = caps:escape
+    kb_options = caps:escape,altwin:swap_lalt_lwin
     kb_rules =
 
     follow_mouse = 1
@@ -61,7 +61,8 @@ general {
     gaps_in = 5
     gaps_out = 5
     border_size = 2
-    col.active_border = rgba(f5deb3ff) rgba(f5deb3ee) 45deg
+    #col.active_border = rgba(f5deb3ff) rgba(f5deb3ee) 45deg orange
+    col.active_border = rgba(f65d76ff) rgba(f65d76ee) 45deg akira pink
     col.inactive_border = rgba(595959aa)
 
     layout = dwindle
@@ -105,27 +106,73 @@ dwindle {
     preserve_split = yes # you probably want this
 }
 
-master {
-    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
-}
-
 gestures {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
     workspace_swipe = on
 }
 
 # See https://wiki.hyprland.org/Configuring/Window-Rules/
-windowrule=float,title:Volume
+windowrule=float,title:Volume Indicator
-windowrule=size 300 100,title:Volume
+windowrule=size 300 100,title:Volume Indicator
-windowrule=move 100%-375 75,title:Volume
+windowrule=move 100%-375 75,title:Volume Indicator
-windowrule=rounding 35,title:Volume
+windowrule=rounding 35,title:Volume Indicator
-windowrule=nofocus,title:Volume
+windowrule=nofocus,title:Volume Indicator
+
 windowrule=float,title:Jitsi Meet
 windowrule=move 100%-375 75,title:Jitsi Meet
 
+windowrule=workspace 1,title:WORKSPACE 1
+windowrule=workspace 2,title:WORKSPACE 2
+windowrule=workspace 3,title:WORKSPACE 3
+windowrule=workspace 4,title:WORKSPACE 4
+windowrule=workspace 5,title:WORKSPACE 5
+windowrule=workspace 6,title:WORKSPACE 6
+windowrule=workspace 7,title:WORKSPACE 7
+windowrule=workspace 8,title:WORKSPACE 8
+windowrule=workspace 9,title:WORKSPACE 9
+windowrule=workspace 10,title:WORKSPACE 10
+windowrule=workspace 11,title:WORKSPACE 11
+windowrule=workspace 12,title:WORKSPACE 12
+windowrule=workspace 13,title:WORKSPACE 13
+windowrule=workspace 14,title:WORKSPACE 14
+windowrule=workspace 15,title:WORKSPACE 15
+windowrule=workspace 16,title:WORKSPACE 16
+windowrule=float,title:WORKSPACE 1
+windowrule=float,title:WORKSPACE 2
+windowrule=float,title:WORKSPACE 3
+windowrule=float,title:WORKSPACE 4
+windowrule=float,title:WORKSPACE 5
+windowrule=float,title:WORKSPACE 6
+windowrule=float,title:WORKSPACE 7
+windowrule=float,title:WORKSPACE 8
+windowrule=float,title:WORKSPACE 9
+windowrule=float,title:WORKSPACE 10
+windowrule=float,title:WORKSPACE 11
+windowrule=float,title:WORKSPACE 12
+windowrule=float,title:WORKSPACE 13
+windowrule=float,title:WORKSPACE 14
+windowrule=float,title:WORKSPACE 15
+windowrule=float,title:WORKSPACE 16
+windowrule=animation slide,title:WORKSPACE 1
+windowrule=animation slide,title:WORKSPACE 2
+windowrule=animation slide,title:WORKSPACE 3
+windowrule=animation slide,title:WORKSPACE 4
+windowrule=animation slide,title:WORKSPACE 5
+windowrule=animation slide,title:WORKSPACE 6
+windowrule=animation slide,title:WORKSPACE 7
+windowrule=animation slide,title:WORKSPACE 8
+windowrule=animation slide,title:WORKSPACE 9
+windowrule=animation slide,title:WORKSPACE 10
+windowrule=animation slide,title:WORKSPACE 11
+windowrule=animation slide,title:WORKSPACE 12
+windowrule=animation slide,title:WORKSPACE 13
+windowrule=animation slide,title:WORKSPACE 14
+windowrule=animation slide,title:WORKSPACE 15
+windowrule=animation slide,title:WORKSPACE 16
+
+
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-$mainMod = ALT
+$mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, Return, exec, alacritty
@@ -162,16 +209,18 @@ bind = $mainMod, K, movefocus, u
 bind = $mainMod, J, movefocus, d
 
 # Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
+# using wmutils instead of builtin workspace ensures eww-bar gets updated
-bind = $mainMod, 2, workspace, 2
+# bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 1, exec, wmutils switch-workspace 1
-bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 2, exec, wmutils switch-workspace 2
-bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 3, exec, wmutils switch-workspace 3
-bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 4, exec, wmutils switch-workspace 4
-bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 5, exec, wmutils switch-workspace 5
-bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 6, exec, wmutils switch-workspace 6
-bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 7, exec, wmutils switch-workspace 7
-bind = $mainMod, 0, workspace, 10
+bind = $mainMod, 8, exec, wmutils switch-workspace 8
+bind = $mainMod, 9, exec, wmutils switch-workspace 9
+bind = $mainMod, 0, exec, wmutils switch-workspace 10
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
 bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
@@ -194,14 +243,14 @@ bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,auto
+monitor =, preferred, auto, auto
 {% if hostname == "sputnik" %}
-monitor=DP-2,3440x1440@144.00000,auto,auto
+monitor = desc:Microstep MSI MAG342CQR DB6H262101804, 3440x1440@100.00000, auto, auto
 {% end %}
 {% if hostname == "buran" %}
-monitor=eDP-1,preferred,3072x380,1.8
+monitor = eDP-1, preferred, 3072x380, 1.8
-monitor=eDP-2,preferred,3072x380,1.8
+monitor = eDP-2, preferred, 3072x380, 1.8
-monitor=DP-2,3840x1600@59.99400,0x0,1.25
+monitor = DP-2, 3840x1600@59.99400, 0x0, 1.25
 # transform list
 # normal (no transforms) -> 0
 # 90 degrees -> 1
@@ -214,6 +263,7 @@ monitor=DP-2,3840x1600@59.99400,0x0,1.25
 {% end %}
 
 exec-once=hyprpaper
+exec-once=swayidle
 exec-once=dunst
 
 exec-once=eww daemon

tree/.config/hypr/hyprlock.conf.tpl

@@ -0,0 +1,160 @@
+general {
+	grace = 0
+	immediate_render = true
+}
+
+background {
+	monitor =
+
+	# make background transparent, used in combination with screenlock-video
+	#color = rgba(00000000)
+
+	path = ~/.config/wallpapers/6000x3376/akira.jpg
+}
+
+input-field {
+	monitor =
+	size = 300, 75
+	outline_thickness = 3
+	dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
+	dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+	dots_center = false
+	dots_rounding = -2 # -1 default circle, -2 follow input-field rounding
+	outer_color = rgb(f65d76) # akira pink
+	inner_color = rgb(151515)
+	font_color = rgb(e0c1c1)
+	fade_on_empty = false
+	fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
+	placeholder_text = <b>PASS_</b> # Text rendered in the input box when it's empty.
+	hide_input = false
+	rounding = -1 # -1 means complete rounding (circle/oval)
+	check_color = rgb(204, 136, 34)
+	fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color
+	fail_text = <i>ERR__</i> # can be set to empty
+	fail_timeout = 2000 # milliseconds before fail_text and fail_color disappears
+	fail_transition = 300 # transition time in ms between normal outer_color and fail_color
+	capslock_color = -1
+	numlock_color = -1
+	bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
+	invert_numlock = false # change color if numlock is off
+	swap_font_color = false
+
+	position = 0, -210
+	halign = center
+	valign = center
+
+	shadow_passes = 3
+	shadow_size = 10
+	shadow_boost = 1.2
+}
+
+# ferris image in the center
+image {
+	monitor =
+	path = ~/.config/hypr/ferris-stamp.png
+	rounding = 0
+	size = 300
+	position = 0, 0
+	halign = center
+	valign = center
+	border_size = 0
+
+	shadow_passes = 3
+	shadow_size = 10
+	shadow_boost = 1.2
+}
+
+# clock
+label {
+	monitor =
+	text = <b>$TIME</b>
+	text_align = left
+	color = rgba(ffffff69)
+	font_size = 160
+	font_family = Noto Sans
+	rotate = 0 # degrees, counter-clockwise
+
+	position = 0, -160
+	halign = center
+	valign = top
+
+	shadow_passes = 4
+	shadow_size = 1
+	shadow_boost = 1.3
+}
+
+# battery
+label {
+	monitor =
+	text = cmd[update:5000] wmutils battery
+	text_align = left
+	color = rgba(200, 200, 200, 1.0)
+	font_size = 20
+	font_family = Noto Sans
+	rotate = 0 # degrees, counter-clockwise
+
+	position = 24, -20
+	halign = left
+	valign = top
+
+	shadow_passes = 2
+	shadow_size = 1
+	shadow_boost = 1.1
+}
+
+# keyboard layout
+label {
+	monitor =
+	text = $LAYOUT
+	text_align = right
+	color = rgba(200, 200, 200, 1.0)
+	font_size = 20
+	font_family = Noto Sans
+	rotate = 0 # degrees, counter-clockwise
+
+	position = -24, -20
+	halign = right
+	valign = top
+
+	shadow_passes = 2
+	shadow_size = 1
+	shadow_boost = 1.1
+}
+
+# greeting text
+label {
+	monitor =
+	text = GREET_ $user
+	text_align = center
+	color = rgba(200, 200, 200, 1.0)
+	font_size = 25
+	font_family = Noto Sans
+	rotate = 0 # degrees, counter-clockwise
+
+	position = 0, 210
+	halign = center
+	valign = center
+
+	shadow_passes = 2
+	shadow_size = 1
+	shadow_boost = 1.3
+}
+
+# number of login attempts
+label {
+	monitor =
+	text = $ATTEMPTS[0]x $FAIL
+	text_align = center
+	color = rgba(200, 200, 200, 1.0)
+	font_size = 28
+	font_family = Noto Sans
+	rotate = 0 # degrees, counter-clockwise
+
+	position = 0, 160	
+	halign = center
+	valign = bottom
+
+	shadow_passes = 2
+	shadow_size = 2
+	shadow_boost = 1.3
+}

tree/.config/hypr/hyprpaper.conf

@@ -1,2 +1,2 @@
-preload = ~/.config/wallpapers/3840x2160/bladerunner.jpg
+preload = ~/.config/wallpapers/6000x3376/akira.jpg
-wallpaper = ,~/.config/wallpapers/3840x2160/bladerunner.jpg
+wallpaper = ,~/.config/wallpapers/6000x3376/akira.jpg

tree/.config/niri/config.kdl.tpl

@@ -0,0 +1,541 @@
+// This config is in the KDL format: https://kdl.dev
+// "/-" comments out the following node.
+// Check the wiki for a full description of the configuration:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Overview
+
+environment {
+    DISPLAY ":0"
+    ELECTRON_OZONE_PLATFORM_HINT "auto"
+    QT_QPA_PLATFORMTHEME "qt5ct"
+}
+
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
+input {
+    keyboard {
+        xkb {
+            // You can set rules, model, layout, variant and options.
+            // For more information, see xkeyboard-config(7).
+            layout "se,us"
+            options "caps:escape,compose:menu"
+        }
+    }
+
+    // Focus windows and outputs automatically when moving the mouse into them.
+    focus-follows-mouse max-scroll-amount="0%"
+
+{% if hostname == "sputnik" %}
+    tablet {
+        map-to-output "Microstep MSI MAG342CQR DB6H262101804"
+    }
+{% end %}
+}
+
+clipboard {
+    disable-primary // disable middle-click paste
+}
+
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
+// `niri msg outputs`
+output "Microstep MSI MAG342CQR DB6H262101804" {
+    mode "3440x1440@144.000"
+    position x=1152 y=387
+    scale 1.25
+}
+
+output "Dell Inc. DELL U2724DE 1MV5L04" {
+    mode "2560x1440@120.000"
+    position x=0 y=0
+    transform "270"
+    scale 1.25
+
+    // layout {
+    //     gaps 0
+    // }
+}
+
+output "eDP-1" {
+    scale 1.8
+    // position x=0 y=0
+}
+
+output "DP-2" {
+    scale 1.25
+}
+
+// Settings that influence how windows are positioned and sized.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
+layout {
+    // Set gaps around windows in logical pixels.
+{% if hostname == "sputnik" %}
+    gaps 2 // TODO: fix output-specific layout
+{% else %}
+    gaps 12
+{% end %}
+
+    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
+    // You can think of them as a kind of outer gaps. They are set in logical pixls.
+    // Left and right struts will cause the next window to the side to always be visible.
+    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
+    // layer-shell panels and regular gaps.
+    struts {
+        left -12
+        right -12
+        top -12
+        bottom -12
+    }
+
+    // When to center a column when changing focus, options are:
+    // - "never", default behavior, focusing an off-screen column will keep at the left
+    //   or right edge of the screen.
+    // - "always", the focused column will always be centered.
+    // - "on-overflow", focusing a column will center it if it doesn't fit
+    //   together with the previously focused column.
+    center-focused-column "never"
+
+    // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
+    preset-column-widths {
+        fixed 948 // roughly fits a single vim buffer
+        //proportion 0.33333
+        proportion 0.5
+        proportion 0.66667
+    }
+
+    // You can change the default width of the new windows.
+    default-column-width { proportion 0.5; }
+    // If you leave the brackets empty, the windows themselves will decide their initial width.
+    // default-column-width {}
+
+    focus-ring {
+        off
+    }
+
+    shadow {
+        on
+    }
+
+    // You can also add a border. It's similar to the focus ring, but always visible.
+    border {
+        // The settings are the same as for the focus ring.
+        // If you enable the border, you probably want to disable the focus ring.
+        width 2
+        active-color "#f65d76" // akira pink
+        inactive-color "#505050"
+
+        // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+}
+
+spawn-at-startup "hyprpaper"
+spawn-at-startup "swayidle" "-w" // ~/.config/swayidle/config
+spawn-at-startup "qs" "-p" "/etc/quickshell/niri-caelestia-shell" 
+
+// Uncomment this line to ask the clients to omit their client-side decorations if possible.
+// If the client will specifically ask for CSD, the request will be honored.
+// Additionally, clients will be informed that they are tiled, removing some rounded corners.
+prefer-no-csd
+
+// You can change the path where screenshots are saved.
+// A ~ at the front will be expanded to the home directory.
+// The path is formatted with strftime(3) to give you the screenshot date and time.
+screenshot-path "~/screenshots/%Y-%m-%d_%H-%M-%S.png"
+
+// You can also set this to null to disable saving screenshots to disk.
+// screenshot-path null
+
+// Animation settings.
+// The wiki explains how to configure individual animations:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Animations
+animations {
+    // Slow down all animations by this factor. Values below 1 speed them up instead.
+    // slowdown 3.0
+
+    workspace-switch {
+        spring damping-ratio=0.8 stiffness=500 epsilon=0.0001
+    }
+
+    window-movement {
+        spring damping-ratio=0.8 stiffness=500 epsilon=0.0001
+    }
+
+    window-resize {
+        spring damping-ratio=0.5 stiffness=500 epsilon=0.0001
+    }
+
+    window-open {
+        duration-ms 600
+        custom-shader r#"
+// make the window fall into place with a slight rotation
+vec4 slide_in_from_right(vec3 coords_geo, vec3 size_geo) {
+    // For this shader, set animation curve to linear for best results.
+
+    // Simulate decelleration: square the (linear) progress.
+    float progress = 1.0 - niri_clamped_progress * niri_clamped_progress;
+
+    // Get our rotation pivot point coordinates at the bottom center of the window.
+    vec2 coords = (coords_geo.xy - vec2(0.5, 1.0)) * size_geo.xy;
+
+    // Move the window in from the right
+    coords.x -= progress * 200.0;
+
+    // Randomize rotation direction and maximum angle.
+    float random = (niri_random_seed - 0.5) / 2.0;
+    random = sign(random) - random;
+    float max_angle = 0.05 * random;
+
+    // Rotate the window around our pivot point.
+    float angle = progress * max_angle;
+    mat2 rotate = mat2(cos(angle), -sin(angle), sin(angle), cos(angle));
+    coords = rotate * coords;
+
+    // Transform the coordinates back.
+    coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 1.0), 1.0);
+
+    // Sample the window texture.
+    vec3 coords_tex = niri_geo_to_tex * coords_geo;
+    vec4 color = texture2D(niri_tex, coords_tex.st);
+
+    // Multiply by alpha to fade out.
+    return color * niri_clamped_progress;
+}
+
+// this is the main function
+vec4 open_color(vec3 coords_geo, vec3 size_geo) {
+    return slide_in_from_right(coords_geo, size_geo);
+}
+        "#
+    }
+
+    window-close {
+        duration-ms 600
+        custom-shader r#"
+// make the window "fall down" with slight rotation.
+vec4 fall_and_rotate(vec3 coords_geo, vec3 size_geo) {
+    // For this shader, set animation curve to linear for best results.
+
+    // Simulate an accelerated fall: square the (linear) progress.
+    float progress = niri_clamped_progress * niri_clamped_progress;
+
+    // Get our rotation pivot point coordinates at the bottom center of the window.
+    vec2 coords = (coords_geo.xy - vec2(0.5, 1.0)) * size_geo.xy;
+
+    // Move the window down to simulate a fall.
+    coords.y -= progress * 200.0;
+
+    // Randomize rotation direction and maximum angle.
+    float random = (niri_random_seed - 0.5) / 2.0;
+    random = sign(random) - random;
+    float max_angle = 0.05 * random;
+
+    // Rotate the window around our pivot point.
+    float angle = progress * max_angle;
+    mat2 rotate = mat2(cos(angle), -sin(angle), sin(angle), cos(angle));
+    coords = rotate * coords;
+
+    // Transform the coordinates back.
+    coords_geo = vec3(coords / size_geo.xy + vec2(0.5, 1.0), 1.0);
+
+    // Sample the window texture.
+    vec3 coords_tex = niri_geo_to_tex * coords_geo;
+    vec4 color = texture2D(niri_tex, coords_tex.st);
+
+    // Multiply by alpha to fade out.
+    return color * (1.0 - niri_clamped_progress);
+}
+
+vec4 close_color(vec3 coords_geo, vec3 size_geo) {
+    return fall_and_rotate(coords_geo, size_geo);
+}
+        "#
+    }
+}
+
+// Window rules let you adjust behavior for individual windows.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
+
+window-rule {
+    geometry-corner-radius 22
+    clip-to-geometry true
+}
+
+// Indicate screencasted windows with red colors.
+window-rule {
+    match is-window-cast-target=true
+
+    focus-ring {
+        active-color "#f38ba8"
+        inactive-color "#7d0d2d"
+    }
+
+    border {
+        inactive-color "#7d0d2d"
+    }
+
+    shadow {
+        color "#7d0d2d70"
+    }
+
+    tab-indicator {
+        active-color "#f38ba8"
+        inactive-color "#7d0d2d"
+    }
+}
+
+window-rule {
+    match title="Volume Indicator"
+    geometry-corner-radius 35
+    min-width 300
+    max-width 300
+    min-height 100
+    max-height 100
+    open-floating true
+    default-floating-position x=35 y=35 relative-to="top-right"
+}
+
+window-rule {
+    match app-id="Mullvad VPN"
+    default-floating-position x=5 y=10 relative-to="bottom-left"
+}
+
+// block out password managers from screen capture.
+window-rule {
+    match app-id=r#"^org\.keepassxc\.KeePassXC$"#
+    match app-id=r#"^org\.gnome\.World\.Secrets$"#
+
+    block-out-from "screen-capture"
+}
+
+window-rule {
+    match title="Virtual Machine Manager"
+    match app-id="virt-manager"
+    //max-width 400
+}
+
+window-rule {
+    match app-id="com.nextcloud.desktopclient.nextcloud"
+    open-floating true
+    default-floating-position x=5 y=10 relative-to="bottom-left"
+}
+
+binds {
+    // Keys consist of modifiers separated by + signs, followed by an XKB key name
+    // in the end. To find an XKB name for a particular key, you may use a program
+    // like wev.
+    //
+    // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
+    // when running as a winit window.
+    //
+    // Most actions that you can bind here can also be invoked programmatically with
+    // `niri msg action do-something`.
+
+    // Mod-Shift-/, which is usually the same as Mod-?,
+    // shows a list of important hotkeys.
+    Mod+Shift+Plus { show-hotkey-overlay; }
+
+    Mod+Return { spawn "ghostty"; }
+    Mod+Plus { spawn "loginctl" "lock-session"; }
+
+    // TODO: why do i have to use spawn-sh?
+    Mod+D { spawn "qs" "-p" "/etc/quickshell/niri-caelestia-shell" "ipc" "call" "drawers" "toggle" "launcher"; }
+
+    // You can also use a shell:
+    // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
+
+    // Example volume keys mappings for PipeWire & WirePlumber.
+    // The allow-when-locked=true property makes them work even when the session is locked.
+    XF86AudioRaiseVolume  allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; }
+    XF86AudioLowerVolume  allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; }
+    XF86AudioMute         allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
+    XF86AudioMicMute      allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--min-value=10" "set" "10%-"; }
+    XF86MonBrightnessUp   allow-when-locked=true { spawn "brightnessctl" "--min-value=10" "set" "+10%"; }
+
+    Mod+Q { close-window; }
+
+    Mod+Space { switch-focus-between-floating-and-tiling; }
+    Mod+Ctrl+Space { toggle-window-floating; }
+
+    Mod+Left  { focus-column-left; }
+    Mod+Down  { focus-window-down; }
+    Mod+Up    { focus-window-up; }
+    Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-or-workspace-down; }
+    Mod+K     { focus-window-or-workspace-up; }
+    Mod+L     { focus-column-right; }
+
+    Mod+Ctrl+Left  { move-column-left; }
+    Mod+Ctrl+Down  { move-window-down; }
+    Mod+Ctrl+Up    { move-window-up; }
+    Mod+Ctrl+Right { move-column-right; }
+    Mod+Ctrl+H     { move-column-left; }
+    Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
+    Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
+    Mod+Ctrl+L     { move-column-right; }
+
+    Mod+Home { focus-column-first; }
+    Mod+End  { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+
+    Mod+Shift+Left  { focus-monitor-left; }
+    Mod+Shift+Down  { focus-monitor-down; }
+    Mod+Shift+Up    { focus-monitor-up; }
+    Mod+Shift+Right { focus-monitor-right; }
+    Mod+Shift+H     { focus-monitor-left; }
+    Mod+Shift+J     { focus-monitor-down; }
+    Mod+Shift+K     { focus-monitor-up; }
+    Mod+Shift+L     { focus-monitor-right; }
+
+    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+
+    Mod+Page_Down      { focus-workspace-down; }
+    Mod+Page_Up        { focus-workspace-up; }
+    Mod+U              { focus-workspace-down; }
+    Mod+I              { focus-workspace-up; }
+    Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    Mod+Ctrl+U         { move-column-to-workspace-down; }
+    Mod+Ctrl+I         { move-column-to-workspace-up; }
+
+    Mod+Shift+Page_Down { move-workspace-down; }
+    Mod+Shift+Page_Up   { move-workspace-up; }
+    Mod+Shift+U         { move-workspace-down; }
+    Mod+Shift+I         { move-workspace-up; }
+
+    Mod+Backspace       { toggle-overview; }
+
+    // You can bind mouse wheel scroll ticks using the following syntax.
+    // These binds will change direction based on the natural-scroll setting.
+    //
+    // To avoid scrolling through workspaces really fast, you can use
+    // the cooldown-ms property. The bind will be rate-limited to this value.
+    // You can set a cooldown on any bind, but it's most useful for the wheel.
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+
+    // Usually scrolling up and down with Shift in applications results in
+    // horizontal scrolling; these binds replicate that.
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+
+    // Similarly, you can bind touchpad scroll "ticks".
+    // Touchpad scrolling is continuous, so for these binds it is split into
+    // discrete intervals.
+    // These binds are also affected by touchpad's natural-scroll, so these
+    // example binds are "inverted", since we have natural-scroll enabled for
+    // touchpads by default.
+    // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }
+    // Mod+TouchpadScrollUp   { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; }
+
+    // You can refer to workspaces by index. However, keep in mind that
+    // niri is a dynamic workspace system, so these commands are kind of
+    // "best effort". Trying to refer to a workspace index bigger than
+    // the current workspace count will instead refer to the bottommost
+    // (empty) workspace.
+    //
+    // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
+    // will all refer to the 3rd workspace.
+    Mod+1 { spawn "wmutils" "switch-workspace" "1"; }
+    Mod+2 { spawn "wmutils" "switch-workspace" "2"; }
+    Mod+3 { spawn "wmutils" "switch-workspace" "3"; }
+    Mod+4 { spawn "wmutils" "switch-workspace" "4"; }
+    Mod+5 { spawn "wmutils" "switch-workspace" "5"; }
+    Mod+6 { spawn "wmutils" "switch-workspace" "6"; }
+    Mod+7 { spawn "wmutils" "switch-workspace" "7"; }
+    Mod+8 { spawn "wmutils" "switch-workspace" "8"; }
+    Mod+9 { spawn "wmutils" "switch-workspace" "9"; }
+    Mod+Ctrl+1 { move-column-to-workspace 1; }
+    Mod+Ctrl+2 { move-column-to-workspace 2; }
+    Mod+Ctrl+3 { move-column-to-workspace 3; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+9 { move-column-to-workspace 9; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+1 { move-window-to-workspace 1; }
+
+    // Switches focus between the current and the previous workspace.
+    // Mod+Tab { focus-workspace-previous; }
+
+    Mod+Comma  { consume-window-into-column; }
+    Mod+Period { expel-window-from-column; }
+    Mod+W      { toggle-column-tabbed-display; }
+
+    // There are also commands that consume or expel a single window to the side.
+    // Mod+BracketLeft  { consume-or-expel-window-left; }
+    // Mod+BracketRight { consume-or-expel-window-right; }
+
+    Mod+R { switch-preset-column-width; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+    Mod+C { center-column; }
+
+    // Finer width adjustments.
+    // This command can also:
+    // * set width in pixels: "1000"
+    // * adjust width in pixels: "-5" or "+5"
+    // * set width as a percentage of screen width: "25%"
+    // * adjust width as a percentage of screen width: "-10%" or "+10%"
+    // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
+    // set-column-width "100" will make the column occupy 200 physical screen pixels.
+    Mod+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+
+    // Finer height adjustments when in column with other windows.
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+
+    // Actions to switch layouts.
+    // Note: if you uncomment these, make sure you do NOT have
+    // a matching layout switch hotkey configured in xkb options above.
+    // Having both at once on the same hotkey will break the switching,
+    // since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
+    // Mod+Space       { switch-layout "next"; }
+    // Mod+Shift+Space { switch-layout "prev"; }
+
+    Print { screenshot; }
+    Ctrl+Print { screenshot-screen; }
+    Alt+Print { screenshot-window; }
+
+    // Switch to the next keyboard layout
+    Mod+Tab { spawn "wmutils" "next-keyboard-layout"; }
+
+    // The quit action will show a confirmation dialog to avoid accidental exits.
+    Mod+Shift+E { quit; }
+
+    // Powers off the monitors. To turn them back on, do any input like
+    // moving the mouse or pressing any other key.
+    // Mod+Shift+P { power-off-monitors; }
+
+    // Dynamic screencasting target
+    Mod+Slash { clear-dynamic-cast-target; }
+    Mod+Ctrl+Slash { set-dynamic-cast-window; }
+    Mod+Shift+Slash { set-dynamic-cast-monitor; }
+
+    // Debugging
+    Mod+Shift+Ctrl+T { toggle-debug-tint; }
+    Mod+Shift+Ctrl+O { debug-toggle-opaque-regions; }
+    Mod+Shift+Ctrl+D { debug-toggle-damage; }
+}

tree/.config/nushell/config.nu.tpl

@@ -6,194 +6,33 @@
 # https://www.nushell.sh/book/coloring_and_theming.html
 # And here is the theme collection
 # https://github.com/nushell/nu_scripts/tree/main/themes
-let dark_theme = {
-    # color for nushell primitives
-    separator: white
-    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
-    header: green_bold
-    empty: blue
-    # Closures can be used to choose colors for specific values.
-    # The value (in this case, a bool) is piped into the closure.
-    bool: {|| if $in { 'light_cyan' } else { 'light_gray' } }
-    int: white
-    filesize: {|e|
-        if $e == 0b {
-            'white'
-        } else if $e < 1mb {
-            'cyan'
-        } else { 'blue' }
-    }
-    duration: white
-    date: {|| (date now) - $in |
-        if $in < 1hr {
-            'purple'
-        } else if $in < 6hr {
-            'red'
-        } else if $in < 1day {
-            'yellow'
-        } else if $in < 3day {
-            'green'
-        } else if $in < 1wk {
-            'light_green'
-        } else if $in < 6wk {
-            'cyan'
-        } else if $in < 52wk {
-            'blue'
-        } else { 'dark_gray' }
-    }
-    range: white
-    float: white
-    string: white
-    nothing: white
-    binary: white
-    cellpath: white
-    row_index: green_bold
-    record: white
-    list: white
-    block: white
-    hints: dark_gray
-    search_result: {bg: red fg: white}
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b}
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-}
 
-let light_theme = {
-    # color for nushell primitives
-    separator: dark_gray
-    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
-    header: green_bold
-    empty: blue
-    # Closures can be used to choose colors for specific values.
-    # The value (in this case, a bool) is piped into the closure.
-    bool: {|| if $in { 'dark_cyan' } else { 'dark_gray' } }
-    int: dark_gray
-    filesize: {|e|
-        if $e == 0b {
-            'dark_gray'
-        } else if $e < 1mb {
-            'cyan_bold'
-        } else { 'blue_bold' }
-    }
-    duration: dark_gray
-    date: {|| (date now) - $in |
-        if $in < 1hr {
-            'purple'
-        } else if $in < 6hr {
-            'red'
-        } else if $in < 1day {
-            'yellow'
-        } else if $in < 3day {
-            'green'
-        } else if $in < 1wk {
-            'light_green'
-        } else if $in < 6wk {
-            'cyan'
-        } else if $in < 52wk {
-            'blue'
-        } else { 'dark_gray' }
-    }
-    range: dark_gray
-    float: dark_gray
-    string: dark_gray
-    nothing: dark_gray
-    binary: dark_gray
-    cellpath: dark_gray
-    row_index: green_bold
-    record: white
-    list: white
-    block: white
-    hints: dark_gray
-    search_result: {fg: white bg: red}
-    shape_and: purple_bold
-    shape_binary: purple_bold
-    shape_block: blue_bold
-    shape_bool: light_cyan
-    shape_closure: green_bold
-    shape_custom: green
-    shape_datetime: cyan_bold
-    shape_directory: cyan
-    shape_external: cyan
-    shape_externalarg: green_bold
-    shape_filepath: cyan
-    shape_flag: blue_bold
-    shape_float: purple_bold
-    # shapes are used to change the cli syntax highlighting
-    shape_garbage: { fg: white bg: red attr: b}
-    shape_globpattern: cyan_bold
-    shape_int: purple_bold
-    shape_internalcall: cyan_bold
-    shape_list: cyan_bold
-    shape_literal: blue
-    shape_match_pattern: green
-    shape_matching_brackets: { attr: u }
-    shape_nothing: light_cyan
-    shape_operator: yellow
-    shape_or: purple_bold
-    shape_pipe: purple_bold
-    shape_range: yellow_bold
-    shape_record: cyan_bold
-    shape_redirection: purple_bold
-    shape_signature: green_bold
-    shape_string: green
-    shape_string_interpolation: cyan_bold
-    shape_table: blue_bold
-    shape_variable: purple
-    shape_vardecl: purple
-}
-
-# Use fish for external completion
 let fish_completer = {|spans|
-    # if the current command is an alias, get it's expansion
+    fish --command $"complete '--do-complete=($spans | str replace --all "'" "\\'" | str join ' ')'"
-    let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion)
+    | from tsv --flexible --noheaders --no-infer
-
+    | rename value description
-    # overwrite
+    | update value {|row|
-    let spans = (if $expanded_alias != null  {
+      let value = $row.value
-        # put the first word of the expanded alias first in the span
+      let need_quote = ['\' ',' '[' ']' '(' ')' ' ' '\t' "'" '"' "`"] | any {$in in $value}
-        $spans | skip 1 | prepend ($expanded_alias | split row " " | take 1)
+      if ($need_quote and ($value | path exists)) {
-    } else { $spans })
+        let expanded_path = if ($value starts-with ~) {$value | path expand --no-symlink} else {$value}
-
+        $'"($expanded_path | str replace --all "\"" "\\\"")"'
-
+      } else {$value}
-    fish --command $'complete "--do-complete=($spans | str join " ")"'
+    }
-    | $"value(char tab)description(char newline)" + $in
-    | from tsv --flexible --no-infer
 }
 
+source theme.nu
+
 $env.config = {
     show_banner: false
 
+    display_errors: {
+        exit_code: false # assume the external command prints an error message
+        # Core dump errors are always printed, and SIGPIPE never triggers an error.
+        # The setting below controls message printing for termination by all other signals.
+        termination_signal: true
+    }
+
     ls: {
         use_ls_colors: true # use the LS_COLORS environment variable to colorize output
         clickable_links: true # enable or disable clickable links. Your terminal has to support links.
@@ -275,8 +114,7 @@ $env.config = {
     }
 
     filesize: {
-        metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
+        unit: "binary" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
-        format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
     }
 
     cursor_shape: {
@@ -285,15 +123,14 @@ $env.config = {
         vi_normal: underscore # block, underscore, line, blink_block, blink_underscore, blink_line (underscore is the default)
     }
 
-    color_config: {} # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
+    # sourced from theme.nu
-    use_grid_icons: true
+    color_config: $color_config
-    footer_mode: "25" # always, never, number_of_rows, auto
+    footer_mode: 25 # always, never, number_of_rows, auto
     float_precision: 2 # the precision for displaying floats in tables
     buffer_editor: "" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
     use_ansi_coloring: true
     bracketed_paste: true # enable bracketed paste, currently useless on windows
     edit_mode: vi # emacs, vi
-    shell_integration: false # enables terminal shell integration. Off by default, as some terminals have issues with this.
     render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt.
 
     hooks: {
@@ -832,6 +669,7 @@ alias gpu = git push -u origin
 alias gsta = git stash push
 alias gstp = git stash pop
 alias gw = git switch
+alias lg = lazygit
 alias bt = bluetoothctl
 alias d = cd ~/.config/dotfiles/tree
 alias xo = xdg-open
@@ -839,6 +677,11 @@ alias xo = xdg-open
 # random scripts
 source ~/.local/nu/readelf.nu
 source ~/.local/nu/mullvad.nu
+source ~/.local/nu/git.nu
+source ~/.local/nu/tailscale.nu
+{% if os == "darwin" %}
+source ~/.local/nu/macos.nu
+{% end %}
 
 # init zoxide
 source ~/.cache/zoxide.nu

tree/.config/nushell/env.nu

@@ -3,43 +3,43 @@
 # version = 0.83.1
 
 def create_left_prompt [] {
-    mut home = ""
+	mut home = ""
-    try {
+	try {
-        if $nu.os-info.name == "windows" {
+		if $nu.os-info.name == "windows" {
-            $home = $env.USERPROFILE
+			$home = $env.USERPROFILE
-        } else {
+		} else {
-            $home = $env.HOME
+			$home = $env.HOME
-        }
+		}
-    }
+	}
 
-    let dir = ([
+	let dir = ([
-        ($env.PWD | str substring 0..($home | str length) | str replace $home "~"),
+		($env.PWD | str substring 0..($home | str length) | str replace $home "~"),
-        ($env.PWD | str substring ($home | str length)..)
+		($env.PWD | str substring ($home | str length)..)
-    ] | str join)
+	] | str join)
 
-    let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
+	let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
-    let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
+	let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
-    let path_segment = $"($path_color)($dir)"
+	let path_segment = $"($path_color)($dir)"
 
-    $path_segment | str replace --all (char path_sep) $"($separator_color)/($path_color)"
+	$path_segment | str replace --all (char path_sep) $"($separator_color)/($path_color)"
 }
 
 def create_right_prompt [] {
-    # create a right prompt in magenta with green separators and am/pm underlined
+	# create a right prompt in magenta with green separators and am/pm underlined
-    let time_segment = ([
+	let time_segment = ([
-        (ansi reset)
+		(ansi reset)
-        (ansi magenta)
+		(ansi magenta)
-        (date now | date format '%Y/%m/%d %r')
+		(date now | date format '%Y/%m/%d %r')
-    ] | str join | str replace --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
+	] | str join | str replace --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
-        str replace --all "([AP]M)" $"(ansi magenta_underline)${1}")
+		str replace --all "([AP]M)" $"(ansi magenta_underline)${1}")
 
-    let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
+	let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
-        (ansi rb)
+		(ansi rb)
-        ($env.LAST_EXIT_CODE)
+		($env.LAST_EXIT_CODE)
-    ] | str join)
+	] | str join)
-    } else { "" }
+	} else { "" }
 
-    ([$last_exit_code, (char space), $time_segment] | str join)
+	([$last_exit_code, (char space), $time_segment] | str join)
 }
 
 # Use nushell functions to define your right and left prompt
@@ -58,47 +58,55 @@ $env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
 # - converted from a value back to a string when running external commands (to_string)
 # Note: The conversions happen *after* config.nu is loaded
 $env.ENV_CONVERSIONS = {
-    "PATH": {
+	"PATH": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+		from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+		to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
+	}
-    "Path": {
+	"Path": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+		from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+		to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
+	}
 }
 
 # Directories to search for scripts when calling source or use
 $env.NU_LIB_DIRS = [
-    # ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+	# ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
 ]
 
 # Directories to search for plugin binaries when calling register
 $env.NU_PLUGIN_DIRS = [
-    # ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
+	# ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
 ]
 
+if XDG_CONFIG_HOME not-in $env {
+	$env.XDG_CONFIG_HOME = $"($env.HOME)/.config"
+}
+
 $env.PATH = ($env.PATH | split row (char esep) | prepend [
-    ($env.HOME + "/.local/bin"),
+	($env.HOME + "/.local/bin"),
-    ($env.HOME + "/.cargo/bin"),
+	($env.HOME + "/.cargo/bin"),
-    ($env.HOME + "/.radicle/bin"),
+	($env.HOME + "/.radicle/bin"),
-    ($env.HOME + "/.volta/bin"),
+	($env.HOME + "/.volta/bin"),
+	($env.HOME + "/.orbstack/bin"), # docker on macos
 ])
 
 # auto-detect which ssh-agent to use
-if (which tkey-ssh-agent | is-empty) {
+if ("XDG_RUNTIME_DIR" in $env) {
-    $env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/ssh-agent.socket"
+	if (which tkey-ssh-agent | is-empty) {
-} else {
+		$env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/ssh-agent.socket"
-    $env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/tkey-ssh-agent/sock"
+	} else {
+		$env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/tkey-ssh-agent/sock"
+	}
 }
 
 $env.GPG_TTY = (tty)
 $env.BROWSER = "firefox"
-$env.EDITOR = "nvim"
+$env.EDITOR = "helix"
 $env.DEFMT_LOG = "info"
 $env.MOZ_ENABLE_WAYLAND = "1"
-$env.VOLTA_HOME = ($env.HOME + "/.volta")
+$env.VOLTA_HOME = $"($env.HOME)/.volta"
+$env.CARGO_TARGET_DIR = $"($env.HOME)/.cargo/target"
 
 mkdir ~/.cache/starship
 starship init nu | save -f ~/.cache/starship/init.nu
-#zoxide init nushell | save -f ~/.cache/zoxide.nu
+zoxide init nushell | save -f ~/.cache/zoxide.nu

tree/.config/nushell/theme.nu.tpl

@@ -0,0 +1,175 @@
+# gruvbox-dark
+let dark_theme = {
+    separator: "#a89984"
+    leading_trailing_space_bg: { attr: "n" }
+    header: { fg: "#98971a" attr: "b" }
+    empty: "#458588"
+    bool: {|| if $in { "#8ec07c" } else { "light_gray" } }
+    int: "#a89984"
+    filesize: {|e|
+        if $e == 0b {
+            "#a89984"
+        } else if $e < 1mb {
+            "#689d6a"
+        } else {{ fg: "#458588" }}
+    }
+    duration: "#a89984"
+    date: {|| (date now) - $in |
+        if $in < 1hr {
+            { fg: "#cc241d" attr: "b" }
+        } else if $in < 6hr {
+            "#cc241d"
+        } else if $in < 1day {
+            "#d79921"
+        } else if $in < 3day {
+            "#98971a"
+        } else if $in < 1wk {
+            { fg: "#98971a" attr: "b" }
+        } else if $in < 6wk {
+            "#689d6a"
+        } else if $in < 52wk {
+            "#458588"
+        } else { "dark_gray" }
+    }
+    range: "#a89984"
+    float: "#a89984"
+    string: "#a89984"
+    nothing: "#a89984"
+    binary: "#a89984"
+    cellpath: "#a89984"
+    row_index: { fg: "#98971a" attr: "b" }
+    record: "#a89984"
+    list: "#a89984"
+    block: "#a89984"
+    hints: "dark_gray"
+    search_result: { fg: "#cc241d" bg: "#a89984" }
+
+    shape_and: { fg: "#b16286" attr: "b" }
+    shape_binary: { fg: "#b16286" attr: "b" }
+    shape_block: { fg: "#458588" attr: "b" }
+    shape_bool: "#8ec07c"
+    shape_custom: "#98971a"
+    shape_datetime: { fg: "#689d6a" attr: "b" }
+    shape_directory: "#689d6a"
+    shape_external: "#689d6a"
+    shape_externalarg: { fg: "#98971a" attr: "b" }
+    shape_filepath: "#689d6a"
+    shape_flag: { fg: "#458588" attr: "b" }
+    shape_float: { fg: "#b16286" attr: "b" }
+    shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: "b" }
+    shape_globpattern: { fg: "#689d6a" attr: "b" }
+    shape_int: { fg: "#b16286" attr: "b" }
+    shape_internalcall: { fg: "#689d6a" attr: "b" }
+    shape_list: { fg: "#689d6a" attr: "b" }
+    shape_literal: "#458588"
+    shape_match_pattern: "#98971a"
+    shape_matching_brackets: { attr: "u" }
+    shape_nothing: "#8ec07c"
+    shape_operator: "#d79921"
+    shape_or: { fg: "#b16286" attr: "b" }
+    shape_pipe: { fg: "#b16286" attr: "b" }
+    shape_range: { fg: "#d79921" attr: "b" }
+    shape_record: { fg: "#689d6a" attr: "b" }
+    shape_redirection: { fg: "#b16286" attr: "b" }
+    shape_signature: { fg: "#98971a" attr: "b" }
+    shape_string: "#98971a"
+    shape_string_interpolation: { fg: "#689d6a" attr: "b" }
+    shape_table: { fg: "#458588" attr: "b" }
+    shape_variable: "#b16286"
+
+    background: "#282828"
+    foreground: "#ebdbb2"
+    cursor: "#ebdbb2"
+}
+
+# gruvbox-light-hard
+let light_theme = {
+    separator: "#504945"
+    leading_trailing_space_bg: { attr: "n" }
+    header: { fg: "#79740e" attr: "b" }
+    empty: "#076678"
+    bool: {|| if $in { "#427b58" } else { "light_gray" } }
+    int: "#504945"
+    filesize: {|e|
+        if $e == 0b {
+            "#504945"
+        } else if $e < 1mb {
+            "#427b58"
+        } else {{ fg: "#076678" }}
+    }
+    duration: "#504945"
+    date: {|| (date now) - $in |
+        if $in < 1hr {
+            { fg: "#9d0006" attr: "b" }
+        } else if $in < 6hr {
+            "#9d0006"
+        } else if $in < 1day {
+            "#b57614"
+        } else if $in < 3day {
+            "#79740e"
+        } else if $in < 1wk {
+            { fg: "#79740e" attr: "b" }
+        } else if $in < 6wk {
+            "#427b58"
+        } else if $in < 52wk {
+            "#076678"
+        } else { "dark_gray" }
+    }
+    range: "#504945"
+    float: "#504945"
+    string: "#504945"
+    nothing: "#504945"
+    binary: "#504945"
+    cellpath: "#504945"
+    row_index: { fg: "#79740e" attr: "b" }
+    record: "#504945"
+    list: "#504945"
+    block: "#504945"
+    hints: "dark_gray"
+    search_result: { fg: "#9d0006" bg: "#504945" }
+
+    shape_and: { fg: "#8f3f71" attr: "b" }
+    shape_binary: { fg: "#8f3f71" attr: "b" }
+    shape_block: { fg: "#076678" attr: "b" }
+    shape_bool: "#427b58"
+    shape_custom: "#79740e"
+    shape_datetime: { fg: "#427b58" attr: "b" }
+    shape_directory: "#427b58"
+    shape_external: "#427b58"
+    shape_externalarg: { fg: "#79740e" attr: "b" }
+    shape_filepath: "#427b58"
+    shape_flag: { fg: "#076678" attr: "b" }
+    shape_float: { fg: "#8f3f71" attr: "b" }
+    shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: "b" }
+    shape_globpattern: { fg: "#427b58" attr: "b" }
+    shape_int: { fg: "#8f3f71" attr: "b" }
+    shape_internalcall: { fg: "#427b58" attr: "b" }
+    shape_list: { fg: "#427b58" attr: "b" }
+    shape_literal: "#076678"
+    shape_match_pattern: "#79740e"
+    shape_matching_brackets: { attr: "u" }
+    shape_nothing: "#427b58"
+    shape_operator: "#b57614"
+    shape_or: { fg: "#8f3f71" attr: "b" }
+    shape_pipe: { fg: "#8f3f71" attr: "b" }
+    shape_range: { fg: "#b57614" attr: "b" }
+    shape_record: { fg: "#427b58" attr: "b" }
+    shape_redirection: { fg: "#8f3f71" attr: "b" }
+    shape_signature: { fg: "#79740e" attr: "b" }
+    shape_string: "#79740e"
+    shape_string_interpolation: { fg: "#427b58" attr: "b" }
+    shape_table: { fg: "#076678" attr: "b" }
+    shape_variable: "#8f3f71"
+
+    background: "#f9f5d7"
+    foreground: "#504945"
+    cursor: "#504945"
+}
+
+{% if light %}
+let color_config = $light_theme
+$env.LS_COLORS = (vivid generate gruvbox-light-hard | str trim)
+{% else %}
+let color_config = $dark_theme
+$env.LS_COLORS = (vivid generate gruvbox-dark | str trim)
+{% end %}

tree/.config/nvim/init.lua

@@ -1,6 +1,74 @@
 vim.g.mapleader = " "
 vim.g.localleader = "\\"
 
+
+-- Install Lazy
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+	if vim.v.shell_error ~= 0 then
+		vim.api.nvim_echo({
+			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+			{ out,                            "WarningMsg" },
+			{ "\nPress any key to exit..." },
+		}, true, {})
+		vim.fn.getchar()
+		os.exit(1)
+	end
+end
+vim.opt.rtp:prepend(lazypath)
+
+-- TODO: get colored renders working
+vim.g.rustaceanvim = {
+	-- Plugin configuration
+	tools = {
+		float_win_config = { border = 'rounded' },
+	},
+
+	-- LSP configuration
+	server = {
+		on_attach = function(client, bufnr)
+			vim.keymap.set('n', '<leader>lg', pick_rust_target,
+				{ desc = "Pick Target (Rust)", buffer = bufnr })
+			vim.keymap.set('n', "<leader>a", function() vim.cmd.RustLsp('codeAction') end,
+				{ desc = "Code Action (Rust)", buffer = bufnr })
+			vim.keymap.set('n', "<leader>e", function() vim.cmd.RustLsp('renderDiagnostic', 'current') end,
+				{ desc = "Render Diagnostic", buffer = bufnr })
+		end,
+		default_settings = {
+			['rust-analyzer'] = {
+				checkOnSave = true,
+				check = {
+					overrideCommand = {
+						"cargo", "check", "--message-format=json-diagnostic-rendered-ansi",
+					}
+				},
+			},
+		},
+		settings = function(project_root)
+			local ra = require('rustaceanvim.config.server')
+			local settings = ra.load_rust_analyzer_settings(project_root, {
+				settings_file_pattern = 'rust-analyzer.json'
+			})
+
+			-- override default target (if `set_rust_target` has been called)
+			local rust_target = vim.g["rust-analyzer-target"]
+			if rust_target then
+				settings["rust-analyzer"]["cargo"] = { target = rust_target }
+			end
+
+			vim.g["rust-analyzer-target-test"] = settings
+
+			return settings
+		end,
+	},
+
+	-- DAP configuration
+	dap = {},
+}
+
+
 require('plugins')
 require('vars')
 require('opts')
@@ -8,118 +76,138 @@ require('fns')
 require('keys')
 require('theme')
 require('statusline')
-
+--require('debugger') -- TODO:
-local lspconfig = require("lspconfig")
-local rust_tools = require("rust-tools")
 
 -- Mason Setup
+local language_servers = {
+	"pylsp",
+	"eslint",
+	"cssls",
+	"jsonls",
+	"ts_ls",
+	"gopls",
+	"wgsl_analyzer",
+}
 require("mason").setup({
-    ui = {
+	ui = {
-        icons = {
+		icons = {
-            package_installed = "",
+			package_installed = "",
-            package_pending = "",
+			package_pending = "",
-            package_uninstalled = "",
+			package_uninstalled = "",
-        },
+		},
-    },
+	},
-    ensure_installed = { "pylsp", "rust_analyzer", "eslint", "gopls", "wgsl_analyzer" },
+	ensure_installed = language_servers,
 })
-require("mason-lspconfig").setup()
+require("mason-lspconfig").setup {
-lspconfig.pylsp.setup {}
+	automatic_enable = {
-lspconfig.rust_analyzer.setup {}
+		exclude = {
-lspconfig.eslint.setup {}
+			-- rust_analyzer is managed by rustaceanvim
-lspconfig.gopls.setup {}
+			"rust_analyzer",
-lspconfig.wgsl_analyzer.setup {}
+		}
+	}
+}
 
-require("auto-save").setup({
+local lspconfig = require("lspconfig")
-  enabled = false
+for _, l in pairs(language_servers) do
-})
+	lspconfig[l].setup {}
+end
 
-require("todo-comments").setup()
+require('dapui').setup();
 
-
+local compare = require "cmp.config.compare"
-rust_tools.setup({
+require('cmp').setup.filetype({ "rust" }, {
-  server = {
+	sorting = {
-    on_attach = function(_, bufnr)
+		priority_weight = 2,
-      -- Hover actions
+		comparators = {
-      vim.keymap.set("n", "<C-space>", rust_tools.hover_actions.hover_actions, { buffer = bufnr })
+			-- deprioritize `.box`, `.mut`, etc.
-      -- Code action groups
+			require("cmp-rust").deprioritize_postfix,
-      vim.keymap.set("n", "<Leader>a", rust_tools.code_action_group.code_action_group, { buffer = bufnr })
+			-- deprioritize `Borrow::borrow` and `BorrowMut::borrow_mut`
-    end,
+			require("cmp-rust").deprioritize_borrow,
-    settings = {
+			-- deprioritize `Deref::deref` and `DerefMut::deref_mut`
-      ["rust-analyzer"] = {},
+			require("cmp-rust").deprioritize_deref,
-    }
+			-- deprioritize `Into::into`, `Clone::clone`, etc.
-  },
+			require("cmp-rust").deprioritize_common_traits,
+			compare.offset,
+			compare.exact,
+			compare.score,
+			--compare.recently_used,
+			compare.locality,
+			compare.sort_text,
+			compare.length,
+			compare.order,
+		},
+	},
 })
 
 -- Format file on save
 vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
 
 -- Completion Plugin Setup
-local cmp = require'cmp'
+local cmp = require 'cmp'
 cmp.setup({
-  -- Enable LSP snippets
+	-- Enable LSP snippets
-  snippet = {
+	snippet = {
-    expand = function(args)
+		expand = function(args)
-        vim.fn["vsnip#anonymous"](args.body)
+			vim.fn["vsnip#anonymous"](args.body)
-    end,
+		end,
-  },
+	},
-  mapping = {
+	mapping = {
-    ['<C-p>'] = cmp.mapping.select_prev_item(),
+		['<C-p>'] = cmp.mapping.select_prev_item(),
-    ['<C-n>'] = cmp.mapping.select_next_item(),
+		['<C-n>'] = cmp.mapping.select_next_item(),
-    -- Add tab support
+		-- Add tab support
-    ['<S-Tab>'] = cmp.mapping.select_prev_item(),
+		['<S-Tab>'] = cmp.mapping.select_prev_item(),
-    ['<Tab>'] = cmp.mapping.select_next_item(),
+		['<Tab>'] = cmp.mapping.select_next_item(),
-    ['<C-S-f>'] = cmp.mapping.scroll_docs(-4),
+		['<C-S-f>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+		['<C-f>'] = cmp.mapping.scroll_docs(4),
-    ['<C-Space>'] = cmp.mapping.complete(),
+		['<C-Space>'] = cmp.mapping.complete(),
-    ['<C-e>'] = cmp.mapping.close(),
+		['<C-e>'] = cmp.mapping.close(),
-    ['<CR>'] = cmp.mapping.confirm({
+		['<CR>'] = cmp.mapping.confirm({
-      behavior = cmp.ConfirmBehavior.Insert,
+			behavior = cmp.ConfirmBehavior.Insert,
-      select = true,
+			select = true,
-    })
+		})
-  },
+	},
-  -- Installed sources:
+	-- Installed sources:
-  sources = {
+	sources = {
-    { name = 'path' },                              -- file paths
+		{ name = 'path' },                                 -- file paths
-    { name = 'nvim_lsp', keyword_length = 3 },      -- from language server
+		{ name = 'nvim_lsp',               keyword_length = 3 }, -- from language server
-    { name = 'nvim_lsp_signature_help'},            -- display function signatures with current parameter emphasized
+		{ name = 'nvim_lsp_signature_help' },              -- display function signatures with current parameter emphasized
-    { name = 'nvim_lua', keyword_length = 2 },       -- complete neovim's Lua runtime API such vim.lsp.*
+		{ name = 'nvim_lua',               keyword_length = 2 }, -- complete neovim's Lua runtime API such vim.lsp.*
-    { name = 'buffer', keyword_length = 2 },        -- source current buffer
+		{ name = 'buffer',                 keyword_length = 2 }, -- source current buffer
-    { name = 'vsnip', keyword_length = 2 },         -- nvim-cmp source for vim-vsnip 
+		{ name = 'vsnip',                  keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
-    { name = 'calc'},                               -- source for math calculation
+		{ name = 'calc' },                                 -- source for math calculation
-  },
+	},
-  window = {
+	window = {
-      completion = cmp.config.window.bordered(),
+		completion = cmp.config.window.bordered(),
-      documentation = cmp.config.window.bordered(),
+		documentation = cmp.config.window.bordered(),
-  },
+	},
-  formatting = {
+	formatting = {
-      fields = {'menu', 'abbr', 'kind'},
+		fields = { 'menu', 'abbr', 'kind' },
-      format = function(entry, item)
+		format = function(entry, item)
-          local menu_icon ={
+			local menu_icon = {
-              nvim_lsp = 'λ',
+				nvim_lsp = 'λ',
-              vsnip = '⋗',
+				vsnip = '⋗',
-              buffer = 'Ω',
+				buffer = 'Ω',
-              path = '🖫',
+				path = '🖫',
-          }
+			}
-          item.menu = menu_icon[entry.source.name]
+			item.menu = menu_icon[entry.source.name]
-          return item
+			return item
-      end,
+		end,
-  },
+	},
 })
 
 
--- Treesitter Plugin Setup 
+-- Treesitter Plugin Setup
 require('nvim-treesitter.configs').setup {
-  ensure_installed = { "lua", "rust", "toml" },
+	ensure_installed = { "lua", "rust", "toml" },
-  auto_install = true,
+	auto_install = true,
-  highlight = {
+	highlight = {
-    enable = true,
+		enable = true,
-    additional_vim_regex_highlighting=false,
+		additional_vim_regex_highlighting = false,
-  },
+	},
-  ident = { enable = true }, 
+	ident = { enable = true },
-  rainbow = {
+	rainbow = {
-    enable = true,
+		enable = true,
-    extended_mode = true,
+		extended_mode = true,
-    max_file_lines = nil,
+		max_file_lines = nil,
-  }
+	}
 }

tree/.config/nvim/lua/color-scheme.lua.tpl

@@ -0,0 +1,5 @@
+{% if light %}
+vim.o.background = "light"
+{% else %}
+vim.o.background = "dark"
+{% end %}

tree/.config/nvim/lua/debugger.lua

@@ -0,0 +1,176 @@
+local dap = require('dap')
+
+local codelldb_bin = "/usr/bin/codelldb"
+
+-- Rust, C++, C
+dap.adapters.codelldb = {
+	type = 'server',
+	port = "${port}",
+	executable = {
+		command = codelldb_bin,
+		args = { "--port", "${port}" },
+	}
+}
+
+local function get_default_rust_program_path()
+	local workspace = vim.fn.getcwd()
+	local program_name = vim.fn.fnamemodify(workspace, ":t")
+	return workspace .. '/target/debug/' .. program_name
+end
+
+dap.configurations.cpp = {
+	{
+		port = 1234,
+		host = '127.0.0.1',
+		name = "Attach to name",
+		type = "codelldb",
+		request = "attach",
+		pid = function()
+			-- Lets user enter the name of a running process instead of looking up the pid themselves
+			local name = vim.fn.input('Enter pidof name: ')
+			local handle = io.popen("pidof " .. name)
+			local pid = handle:read("*a")
+			handle:close()
+
+			-- Trim the result
+			pid = pid:match("^%s*(.-)%s*$")
+			return pid
+		end,
+		stopOnEntry = true,
+	},
+	{
+		port = 1234,
+		host = '127.0.0.1',
+		name = "Attach to PID",
+		type = "codelldb",
+		request = "attach",
+		pid = function()
+			return tonumber(vim.fn.input('Enter PID: '))
+		end,
+		stopOnEntry = true,
+	},
+	{
+		port = 1234,
+		host = '127.0.0.1',
+		name = "Manually launch file",
+		type = "codelldb",
+		request = "launch",
+		program = function()
+			return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+		end,
+		cwd = '${workspaceFolder}',
+		stopOnEntry = true,
+	},
+	{
+		-- To debug programs that need to run as root you can run a remote lldb-server as root
+		-- sudo lldb-server platform --server --listen '*:1234'
+		name = "Remote attach to name",
+		type = "codelldb",
+		request = "attach",
+		pid = function()
+			-- Lets user enter the name of a running process instead of looking up the pid themselves
+			local name = vim.fn.input('Enter pidof name: ')
+			local handle = io.popen("pidof " .. name)
+			local pid = handle:read("*a")
+			handle:close()
+
+			-- Trim the result
+			pid = pid:match("^%s*(.-)%s*$")
+			return pid
+		end,
+		initCommands = {
+			"platform select remote-linux",
+			"platform connect connect://127.0.0.1:1234",
+			"settings set target.inherit-env false",
+		},
+	},
+	{
+		-- To debug programs that need to run as root you can run a remote lldb-server as root
+		-- sudo lldb-server platform --server --listen '*:1234'
+		name = "Remote launch",
+		type = "codelldb",
+		request = "launch",
+		program = function()
+			return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+		end,
+		initCommands = {
+			"platform select remote-linux",
+			"platform connect connect://127.0.0.1:1234",
+			"settings set target.inherit-env false",
+		},
+	},
+}
+dap.configurations.c = dap.configurations.cpp
+dap.configurations.rust = dap.configurations.cpp
+
+-- Insert this config as a rust specific one before the C++ configs
+table.insert(dap.configurations.rust, 1, {
+	port = 1234,
+	host = '127.0.0.1',
+	name = "Launch Default Rust Program",
+	type = "codelldb",
+	request = "launch",
+	program = get_default_rust_program_path,
+	cwd = '${workspaceFolder}',
+	stopOnEntry = true,
+})
+
+-- Python
+--dap.adapters.python = function(cb, config)
+--  if config.request == 'attach' then
+--    ---@diagnostic disable-next-line: undefined-field
+--    local port = (config.connect or config).port
+--    ---@diagnostic disable-next-line: undefined-field
+--    local host = (config.connect or config).host or '127.0.0.1'
+--    cb({
+--      type = 'server',
+--      port = assert(port, '`connect.port` is required for a python `attach` configuration'),
+--      host = host,
+--      options = {
+--        source_filetype = 'python',
+--      },
+--    })
+--  else
+--    local home = os.getenv("HOME")
+--    cb({
+--      type = 'executable',
+--      -- You need to install debugpy in $HOME/.virtualenvs/
+--      -- Like this:
+--      -- $ mkdir .virtualenvs
+--      -- $ cd .virtualenvs
+--      -- $ python -m venv debugpy
+--      -- $ debugpy/bin/python -m pip install debugpy
+--      command = home .. '/.virtualenvs/debugpy/bin/python',
+--      args = { '-m', 'debugpy.adapter' },
+--      options = {
+--        source_filetype = 'python',
+--      },
+--    })
+--  end
+--end
+
+--dap.configurations.python = {
+--  {
+--    -- The first three options are required by nvim-dap
+--    type = 'python'; -- the type here established the link to the adapter definition: `dap.adapters.python`
+--    request = 'launch';
+--    name = "Launch file";
+--
+--    -- Options below are for debugpy, see https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings for supported options
+--
+--    program = "${file}"; -- This configuration will launch the current file if used.
+--    pythonPath = function()
+--      -- debugpy supports launching an application with a different interpreter then the one used to launch debugpy itself.
+--      -- The code below looks for a `venv` or `.venv` folder in the current directly and uses the python within.
+--      -- You could adapt this - to for example use the `VIRTUAL_ENV` environment variable.
+--      local cwd = vim.fn.getcwd()
+--      if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
+--        return cwd .. '/venv/bin/python'
+--      elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
+--        return cwd .. '/.venv/bin/python'
+--      else
+--        return '/usr/bin/python'
+--      end
+--    end;
+--  },
+--}

tree/.config/nvim/lua/fns.lua

@@ -1,12 +1,10 @@
--- change rust-analyzer target
+-- change rust-analyzer target and restart
 set_rust_target = function(target)
+    vim.g["rust-analyzer-target"] = target
+    vim.cmd("RustAnalyzer restart")
     print("rust-analyzer.cargo.target = " .. target)
-    require("rust-tools").setup({
-      server = { settings = { ["rust-analyzer"] = { cargo = { target = target } } } },
-    })
 end
 
--- a custom telescope picker for changing rust-analyzer target
 pick_rust_target = function(opts)
   opts = opts or {}
   require("telescope.pickers").new(opts, {
@@ -24,3 +22,5 @@ pick_rust_target = function(opts)
     end,
   }):find()
 end
+
+

tree/.config/nvim/lua/keys.lua

@@ -1,45 +1,146 @@
--- todo: whichkey
 local telescope = require('telescope.builtin')
-vim.keymap.set('n', '<leader>ff', telescope.find_files, {})
+local wk = require('which-key')
-vim.keymap.set('n', '<leader>fg', telescope.live_grep, {})
+local harpoon = require("harpoon")
-vim.keymap.set('n', '<leader>fb', telescope.buffers, {})
+local telescope_conf = require("telescope.config").values
-vim.keymap.set('n', '<leader>fh', telescope.help_tags, {})
+harpoon:setup()
-vim.keymap.set('n', '<leader>fs', telescope.treesitter, {}) -- find symbols
+
-vim.keymap.set('n', '<leader>fu', ":TodoTelescope<Enter>", {}) -- find todos
+vim.keymap.set('n', '<leader>f', telescope.find_files, { desc = "File picker" })
-vim.keymap.set('n', '<leader>ft', pick_rust_target, {}) -- find rust targets
+vim.keymap.set('n', '<leader>g', telescope.live_grep, { desc = "Grep recursively" })
-vim.keymap.set('n', 'U', ":redo<Enter>", {})
+vim.keymap.set('n', '<leader>b', telescope.buffers, { desc = "Buffer picker" })
-vim.keymap.set('n', '<leader>p', ":b#<Enter>", {}) -- goto previous buffer
+vim.keymap.set('n', '<leader>?', telescope.help_tags, { desc = "Help tags picker" })
+vim.keymap.set('n', '<leader>s', telescope.treesitter, { desc = "Treesitter symbol picker" })
+vim.keymap.set('n', '<leader>j', telescope.jumplist, { desc = "Jumplist" })
+vim.keymap.set('n', '<leader>u', ":TodoTelescope<Enter>", { desc = "Grep for TODOs" })
+vim.keymap.set('n', 'U', ":redo<Enter>", {})
+vim.keymap.set('n', '<leader>p', ":b#<Enter>", { desc = "Go to last buffer" })
+
+
+
+local function toggle_telescope(harpoon_files)
+	local displayer = require("telescope.pickers.entry_display").create({
+		separator = " | ",
+		items = {
+			--{ width = 0.1 },
+			{ width = 0.9 },
+		}
+	})
+
+	local harpoons = {}
+	for _, item in ipairs(harpoon_files.items) do
+		table.insert(harpoons, {
+			filepath = item.value,
+			col = item.context.col,
+			row = item.context.row,
+		})
+	end
+
+	require("telescope.pickers").new({}, {
+		prompt_title = "Harpoon",
+		finder = require("telescope.finders").new_table({
+			results = harpoons,
+			entry_maker = function(entry)
+				--vim.print("mapping entry")
+				--vim.print(entry)
+				local filepath_with_row = string.format("%s:%d", entry.filepath, entry.row)
+				return {
+					-- Value to display. Required. type=any
+					--value = { "foo", entry.filepath, },
+					value = entry,
+
+					-- Whether to display the entry. Optional. type=bool
+					valid = true,
+
+					-- Optional. type=string|function
+					--display = entry.filepath,
+					display = function(entry)
+						return displayer({
+							-- NOTE: the number of elements must match the
+							-- configuration passed to `displayer` above
+							--{ "foobar" },
+							{ filepath_with_row }
+						})
+					end,
+
+					-- Used for filtering. Optional. type=string
+					ordinal = filepath_with_row,
+
+					-- File to open when pressing enter. Optional. type=string
+					filename = entry.filepath,
+
+					-- Buffer to open when pressing enter. Optional. type=number
+					-- bufnr = 0,
+
+					-- Line number of file/buffer to open. Optional. type=number
+					lnum = entry.row,
+
+					-- Line number of file/buffer to open. Optional. type=number
+					col = entry.row,
+				}
+			end
+		}),
+		previewer = telescope_conf.grep_previewer({}),
+		sorter = telescope_conf.generic_sorter({}),
+	}):find()
+end
+vim.keymap.set("n", "<leader>h", function() toggle_telescope(harpoon:list()) end,
+	{ desc = "Open harpoon window" })
+vim.keymap.set("n", "<leader>H", function() harpoon:list():add() end,
+	{ desc = "Launch harpoon" })
+-- Toggle previous & next buffers stored within Harpoon list
+--vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end)
+--vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
 
---vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
---vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
---vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
 
 -- Use LspAttach autocommand to only map the following keys
 -- after the language server attaches to the current buffer
 vim.api.nvim_create_autocmd('LspAttach', {
-  group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+	group = vim.api.nvim_create_augroup('UserLspConfig', {}),
-  callback = function(ev)
+	callback = function(ev)
-    -- Enable completion triggered by <c-x><c-o>
+		-- Enable completion triggered by <c-x><c-o>
-    vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+		vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
 
-    -- Buffer local mappings.
+		-- Buffer local mappings.
-    -- See `:help vim.lsp.*` for documentation on any of the below functions
+		-- See `:help vim.lsp.*` for documentation on any of the below functions
-    local opts = { buffer = ev.buf }
+		vim.keymap.set('n', '<leader>ld', telescope.lsp_definitions, { desc = "Show definitons", buffer = ev.buf })
-    vim.keymap.set('n', '<leader>ld', telescope.lsp_definitions, opts)
+		vim.keymap.set('n', '<leader>lr', telescope.lsp_references, { desc = "Show references", buffer = ev.buf })
-    vim.keymap.set('n', '<leader>lr', telescope.lsp_references, opts)
+		vim.keymap.set('n', '<leader>li', telescope.lsp_implementations,
-    vim.keymap.set('n', '<leader>li', telescope.lsp_implementations, opts)
+			{ desc = "Show implementations", buffer = ev.buf })
-    vim.keymap.set('n', '<leader>lt', telescope.lsp_type_definitions, opts)
+		vim.keymap.set('n', '<leader>lt', telescope.lsp_type_definitions,
-    vim.keymap.set('n', '<leader>le', telescope.diagnostics, opts)
+			{ desc = "Show type definitions", buffer = ev.buf })
-    vim.keymap.set('n', '<leader>ls', telescope.lsp_workspace_symbols, opts)
+		vim.keymap.set('n', '<leader>le', telescope.diagnostics, { desc = "Show diagnostics", buffer = ev.buf })
-    vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+		vim.keymap.set('n', '<leader>ls', telescope.lsp_workspace_symbols,
-    vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+			{ desc = "Show workspace symbols", buffer = ev.buf })
-    vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
+		vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = ev.buf })
-    vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
+		vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, { buffer = ev.buf })
-    vim.keymap.set('n', '<leader>wl', function()
+		vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder,
-      print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+			{ desc = "Add workspace folder", buffer = ev.buf })
-    end, opts)
+		vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder,
-    vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, opts)
+			{ desc = "Remove workspace folder", buffer = ev.buf })
-    vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
+		vim.keymap.set('n', '<leader>wl', function()
-  end,
+			print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+		end, { desc = "List workspace folders", buffer = ev.buf })
+		vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, { desc = "Rename symbol", buffer = ev.buf })
+		vim.keymap.set('n', "<leader>a", vim.lsp.buf.code_action, { desc = "Code Action", buffer = ev.buf })
+
+		wk.add({
+			{ "<leader>l", desc = "Language server stuff" },
+			{ "<leader>w", desc = "Workspace stuff" },
+		})
+	end,
 })
+
+--local rust_tools = require("rust-tools")
+
+--rust_tools.setup({
+--  server = {
+--    on_attach = function(_, bufnr)
+--      -- Hover actions
+--      vim.keymap.set("n", "<C-space>", rust_tools.hover_actions.hover_actions, { buffer = bufnr })
+--      -- Code action groups
+--      vim.keymap.set("n", "<leader>a", rust_tools.code_action_group.code_action_group, { desc = "Code actions", buffer = bufnr })
+--    end,
+--    settings = {
+--      ["rust-analyzer"] = {},
+--    }
+--  },
+--})

tree/.config/nvim/lua/lazy.lua

@@ -0,0 +1,16 @@
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+	if vim.v.shell_error ~= 0 then
+		vim.api.nvim_echo({
+			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+			{ out,                            "WarningMsg" },
+			{ "\nPress any key to exit..." },
+		}, true, {})
+		vim.fn.getchar()
+		os.exit(1)
+	end
+end
+vim.opt.rtp:prepend(lazypath)

tree/.config/nvim/lua/opts.lua

@@ -1,40 +1,40 @@
 local opt = vim.opt
 
 -- Use system clipboard
-vim.opt.clipboard="unnamedplus"
+vim.opt.clipboard = "unnamedplus"
 
 -- [[ Context ]]
-opt.colorcolumn = '100'          -- str:  Show col for max line length
+opt.colorcolumn = '100'   -- str:  Show col for max line length
-opt.number = true                -- bool: Show line numbers
+opt.number = true         -- bool: Show line numbers
-opt.relativenumber = true        -- bool: Show relative line numbers
+opt.relativenumber = true -- bool: Show relative line numbers
-opt.scrolloff = 10               -- int:  Min num lines of context
+opt.scrolloff = 10        -- int:  Min num lines of context
-opt.signcolumn = "yes"           -- str:  Show the sign column
+opt.signcolumn = "yes"    -- str:  Show the sign column
 
 -- [[ Filetypes ]]
-opt.encoding = 'utf8'            -- str:  String encoding to use
+opt.encoding = 'utf8' -- str:  String encoding to use
-opt.fileencoding = 'utf8'        -- str:  File encoding to use
+-- opt.fileencoding = 'utf8'        -- str:  File encoding to use
-vim.filetype.add({extension = {wgsl = "wgsl"}})
+vim.filetype.add({ extension = { wgsl = "wgsl" } })
 
 -- [[ Theme ]]
-opt.syntax = "ON"                -- str:  Allow syntax highlighting
+opt.syntax = "ON"        -- str:  Allow syntax highlighting
-opt.termguicolors = true         -- bool: If term supports ui color then enable
+opt.termguicolors = true -- bool: If term supports ui color then enable
 
 -- [[ Search ]]
-opt.ignorecase = true            -- bool: Ignore case in search patterns
+opt.ignorecase = true -- bool: Ignore case in search patterns
-opt.smartcase = true             -- bool: Override ignorecase if search contains capitals
+opt.smartcase = true  -- bool: Override ignorecase if search contains capitals
-opt.incsearch = true             -- bool: Use incremental search
+opt.incsearch = true  -- bool: Use incremental search
-opt.hlsearch = false             -- bool: Highlight search matches
+opt.hlsearch = false  -- bool: Highlight search matches
 
 -- [[ Whitespace ]]
 -- opt.expandtab = true             -- bool: Use spaces instead of tabs
-opt.shiftwidth = 4               -- num:  Size of an indent
+opt.shiftwidth = 4  -- num:  Size of an indent
-opt.softtabstop = 4              -- num:  Number of spaces tabs count for in insert mode
+opt.softtabstop = 4 -- num:  Number of spaces tabs count for in insert mode
-opt.tabstop = 4                  -- num:  Number of spaces tabs count for
+opt.tabstop = 4     -- num:  Number of spaces tabs count for
-opt.list = true                  -- show some whitespace
+opt.list = true     -- show some whitespace
 
 -- [[ Splits ]]
-opt.splitright = true            -- bool: Place new window to right of current one
+opt.splitright = true -- bool: Place new window to right of current one
-opt.splitbelow = true            -- bool: Place new window below the current one
+opt.splitbelow = true -- bool: Place new window below the current one
 
 --Set completeopt to have a better completion experience
 -- :help completeopt
@@ -43,11 +43,10 @@ opt.splitbelow = true            -- bool: Place new window below the current one
 -- noselect: Do not select, force to select one from the menu
 -- shortness: avoid showing extra messages when using completion
 -- updatetime: set updatetime for CursorHold
-vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
+vim.opt.completeopt = { 'menuone', 'noselect', 'noinsert' }
-vim.opt.shortmess = vim.opt.shortmess + { c = true}
+vim.opt.shortmess = vim.opt.shortmess + { c = true }
 vim.api.nvim_set_option('updatetime', 300)
 
 -- Uncomment to enable treesitter folding by default
 --vim.wo.foldmethod = 'expr'
 --vim.wo.foldexpr = 'nvim_treesitter#foldexpr()'
-

tree/.config/nvim/lua/plugins.lua

@@ -1,127 +1,122 @@
--- vim.cmd([[
+require("lazy").setup({
---   augroup packer_user_config
+	spec = {
---     autocmd!
+		-- install plugins
---     autocmd BufWritePost plugins.lua source <afile> | PackerCompile
+		{ 'nvim-treesitter/nvim-treesitter' },
---   augroup end
+		{ 'ellisonleao/gruvbox.nvim' },
--- ]])
+		{ 'danilamihailov/beacon.nvim' },
+		{ 'nvim-lua/plenary.nvim' },
+		{
+			'folke/todo-comments.nvim',
+			dependencies = { "nvim-lua/plenary.nvim" },
+			opts = {
+				keywords = {
+					SAFETY = {
+						icon = "☢",
+						color = "warning",
+						alt = { "SOUNDNESS", "UNSAFE", "UNSOUND" },
+					},
+					INVARIANT = {
+						icon = "🦑",
+						color = "hint",
+					},
+				},
+			},
+		},
+		{
+			"folke/which-key.nvim",
+			event = "VeryLazy",
+			init = function()
+				vim.o.timeout = true
+				vim.o.timeoutlen = 300
+			end,
+			opts = {
+				-- your configuration comes here
+				-- or leave it empty to use the default settings
+				-- refer to the configuration section below
+			},
+		},
+		{ 'rktjmp/fwatch.nvim' },
+		{
+			"folke/snacks.nvim",
+			priority = 1000,
+			lazy = false,
+			opts = {
+				bigfile = { enabled = true },
+				notifier = { enabled = true },
+				quickfile = { enabled = true },
+				statuscolumn = { enabled = true },
+				words = { enabled = true },
+			},
+		},
+		{
+			"folke/flash.nvim",
+			event = "VeryLazy",
+			---@type Flash.Config
+			opts = {},
+			-- stylua: ignore
+			keys = {
+				{ "s",     mode = { "n", "x", "o" }, function() require("flash").jump() end,              desc = "Flash" },
+				{ "S",     mode = { "n", "x", "o" }, function() require("flash").treesitter() end,        desc = "Flash Treesitter" },
+				{ "r",     mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
+				{ "R",     mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+				{ "<c-s>", mode = { "c" },           function() require("flash").toggle() end,            desc = "Toggle Flash Search" },
+			},
+		},
 
-return require('packer').startup(function(use)
+		-- -- language server stuff
-  -- Packer can manage itself
+		{ 'williamboman/mason.nvim' },
-  use 'wbthomason/packer.nvim'
+		{ 'williamboman/mason-lspconfig.nvim' },
+		{ 'neovim/nvim-lspconfig' },
+		{
+			'mrcjkb/rustaceanvim',
+			version = '^6',
+			lazy = false, -- This plugin is already lazy
+		},
+		{ 'mfussenegger/nvim-dap' },
+		{ 'rcarriga/nvim-dap-ui',               dependencies = { 'mfussenegger/nvim-dap', 'nvim-neotest/nvim-nio' } },
+		{ 'theHamsta/nvim-dap-virtual-text' },
+		{ 'jay-babu/mason-nvim-dap.nvim' },
 
-  -- Simple plugins can be specified as strings
+		-- -- nushell support
-  use 'rstacruz/vim-closer'
+		-- --use { 'LhKipp/nvim-nu', run = function() vim.fn[':TSInstall nu'] end} }
+		{ 'LhKipp/nvim-nu' },
 
-  -- Lazy loading:
+		-- -- Completion framework:
-  -- Load on specific commands
+		{ 'hrsh7th/nvim-cmp' },
-  use {'tpope/vim-dispatch', opt = true, cmd = {'Dispatch', 'Make', 'Focus', 'Start'}}
 
-  -- Load on an autocommand event
+		-- -- LSP completion source:
-  use {'andymass/vim-matchup', event = 'VimEnter'}
+		{ 'hrsh7th/cmp-nvim-lsp' },
 
-  -- Load on a combination of conditions: specific filetypes or commands
+		-- -- Useful completion sources:
-  -- Also run code after load (see the "config" key)
+		{ 'hrsh7th/cmp-nvim-lua' },
-  use {
+		{ 'hrsh7th/cmp-nvim-lsp-signature-help' },
-    'w0rp/ale',
+		{ 'hrsh7th/cmp-vsnip' },
-    ft = {'sh', 'zsh', 'bash', 'c', 'cpp', 'cmake', 'html', 'markdown', 'racket', 'vim', 'tex'},
+		{ 'hrsh7th/cmp-path' },
-    cmd = 'ALEEnable',
+		{ 'hrsh7th/cmp-buffer' },
-    config = 'vim.cmd[[ALEEnable]]'
+		{ 'hrsh7th/vim-vsnip' },
-  }
+		{ 'ryo33/nvim-cmp-rust' },
 
-  -- Plugins can have dependencies on other plugins
+		{
-  use {
+			'nvim-telescope/telescope.nvim',
-    'haorenW1025/completion-nvim',
+			branch = '0.1.x',
-    opt = true,
+			dependencies = { 'nvim-lua/plenary.nvim' }
-    requires = {{'hrsh7th/vim-vsnip', opt = true}, {'hrsh7th/vim-vsnip-integ', opt = true}}
+		},
-  }
+		{
+			"ThePrimeagen/harpoon",
+			branch = "harpoon2",
+			dependencies = { "nvim-lua/plenary.nvim" }
+		},
 
-  -- Plugins can also depend on rocks from luarocks.org:
+		-- -- status line
-  --use {
+		{ 'linrongbin16/lsp-progress.nvim' },
-  --  'my/supercoolplugin',
+		{ 'nvim-lualine/lualine.nvim' },
-  --  rocks = {'lpeg', {'lua-cjson', version = '2.1.0'}}
+	},
-  --}
+	-- Configure any other settings here. See the documentation for more details.
-
+	-- colorscheme that will be used when installing plugins.
-  -- You can specify rocks in isolation
+	install = { colorscheme = { "habamax" } },
-  use_rocks 'penlight'
+	-- automatically check for plugin updates
-  use_rocks {'lua-resty-http', 'lpeg'}
+	checker = {
-
+		enabled = true,
-  -- Local plugins can be included
+		notify = false,
-  --use '~/projects/personal/hover.nvim'
+	},
-
+})
-  -- Plugins can have post-install/update hooks
-  use {'iamcco/markdown-preview.nvim', run = 'cd app && yarn install', cmd = 'MarkdownPreview'}
-
-  -- Post-install/update hook with neovim command
-  use 'nvim-treesitter/nvim-treesitter'
-
-  -- Post-install/update hook with call of vimscript function with argument
-  use { 'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end }
-
-  -- Use specific branch, dependency and run lua file after load
-  --use {
-  --  'glepnir/galaxyline.nvim', branch = 'main', config = function() require'statusline' end,
-  --  requires = {'kyazdani42/nvim-web-devicons'}
-  --}
-
-  -- Use dependency and run lua function after load
-  --use {
-  --  'lewis6991/gitsigns.nvim', requires = { 'nvim-lua/plenary.nvim' },
-  --  config = function() require('gitsigns').setup() end
-  --}
-
-  -- You can specify multiple plugins in a single call
-  use 'tjdevries/colorbuddy.vim'
-
-  -- You can alias plugin names
-  use {'dracula/vim', as = 'dracula'}
-
-  -- example plugins above
-  -- my stuff below
-  use 'ellisonleao/gruvbox.nvim'
-  use 'danilamihailov/beacon.nvim'
-  use "nvim-lua/plenary.nvim"
-  use {
-      'folke/todo-comments.nvim',
-	  event = 'VimEnter',
-      requires = { 'nvim-lua/plenary.nvim' }
-  }
-
-  -- language server stuff
-  use 'williamboman/mason.nvim'    
-  use 'williamboman/mason-lspconfig.nvim'
-  use 'neovim/nvim-lspconfig' 
-  use 'simrat39/rust-tools.nvim'
-  use 'WhoIsSethDaniel/lualine-lsp-progress.nvim'
-
-  -- nushell support
-  --use { 'LhKipp/nvim-nu', run = function() vim.fn[':TSInstall nu'] end} }
-  use 'LhKipp/nvim-nu'
-
-  -- Completion framework:
-  use 'hrsh7th/nvim-cmp' 
-
-  -- LSP completion source:
-  use 'hrsh7th/cmp-nvim-lsp'
-
-  -- Useful completion sources:
-  use 'hrsh7th/cmp-nvim-lua'
-  use 'hrsh7th/cmp-nvim-lsp-signature-help'
-  use 'hrsh7th/cmp-vsnip'                             
-  use 'hrsh7th/cmp-path'                              
-  use 'hrsh7th/cmp-buffer'                            
-  use 'hrsh7th/vim-vsnip'
-
-  -- telescope
-  use {
-    'nvim-telescope/telescope.nvim', branch = '0.1.x',
-    requires = { {'nvim-lua/plenary.nvim'} }
-  }
-
-  -- status line
-  use {
-    'nvim-lualine/lualine.nvim',
-    requires = { 'nvim-tree/nvim-web-devicons', opt = true }
-  }
-
-  use "Pocco81/auto-save.nvim"
-end)

tree/.config/nvim/lua/spinners.lua

@@ -0,0 +1,139 @@
+return {
+	braille = { "⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷" },
+	triangles = { "◢", "◣", "◤", "◥" },
+	dwarf_fortress = {
+		" ██████£££  ",
+		"☺██████£££  ",
+		"☺██████£££  ",
+		"☺▓█████£££  ",
+		"☺▓█████£££  ",
+		"☺▒█████£££  ",
+		"☺▒█████£££  ",
+		"☺░█████£££  ",
+		"☺░█████£££  ",
+		"☺ █████£££  ",
+		" ☺█████£££  ",
+		" ☺█████£££  ",
+		" ☺▓████£££  ",
+		" ☺▓████£££  ",
+		" ☺▒████£££  ",
+		" ☺▒████£££  ",
+		" ☺░████£££  ",
+		" ☺░████£££  ",
+		" ☺ ████£££  ",
+		"  ☺████£££  ",
+		"  ☺████£££  ",
+		"  ☺▓███£££  ",
+		"  ☺▓███£££  ",
+		"  ☺▒███£££  ",
+		"  ☺▒███£££  ",
+		"  ☺░███£££  ",
+		"  ☺░███£££  ",
+		"  ☺ ███£££  ",
+		"   ☺███£££  ",
+		"   ☺███£££  ",
+		"   ☺▓██£££  ",
+		"   ☺▓██£££  ",
+		"   ☺▒██£££  ",
+		"   ☺▒██£££  ",
+		"   ☺░██£££  ",
+		"   ☺░██£££  ",
+		"   ☺ ██£££  ",
+		"    ☺██£££  ",
+		"    ☺██£££  ",
+		"    ☺▓█£££  ",
+		"    ☺▓█£££  ",
+		"    ☺▒█£££  ",
+		"    ☺▒█£££  ",
+		"    ☺░█£££  ",
+		"    ☺░█£££  ",
+		"    ☺ █£££  ",
+		"     ☺█£££  ",
+		"     ☺█£££  ",
+		"     ☺▓£££  ",
+		"     ☺▓£££  ",
+		"     ☺▒£££  ",
+		"     ☺▒£££  ",
+		"     ☺░£££  ",
+		"     ☺░£££  ",
+		"     ☺ £££  ",
+		"      ☺£££  ",
+		"      ☺£££  ",
+		"      ☺▓££  ",
+		"      ☺▓££  ",
+		"      ☺▒££  ",
+		"      ☺▒££  ",
+		"      ☺░££  ",
+		"      ☺░££  ",
+		"      ☺ ££  ",
+		"       ☺££  ",
+		"       ☺££  ",
+		"       ☺▓£  ",
+		"       ☺▓£  ",
+		"       ☺▒£  ",
+		"       ☺▒£  ",
+		"       ☺░£  ",
+		"       ☺░£  ",
+		"       ☺ £  ",
+		"        ☺£  ",
+		"        ☺£  ",
+		"        ☺▓  ",
+		"        ☺▓  ",
+		"        ☺▒  ",
+		"        ☺▒  ",
+		"        ☺░  ",
+		"        ☺░  ",
+		"        ☺   ",
+		"        ☺  &",
+		"        ☺ ☼&",
+		"       ☺ ☼ &",
+		"       ☺☼  &",
+		"      ☺☼  & ",
+		"      ‼   & ",
+		"     ☺   &  ",
+		"    ‼    &  ",
+		"   ☺    &   ",
+		"  ‼     &   ",
+		" ☺     &    ",
+		"‼      &    ",
+		"      &     ",
+		"      &     ",
+		"     &   ░  ",
+		"     &   ▒  ",
+		"    &    ▓  ",
+		"    &    £  ",
+		"   &    ░£  ",
+		"   &    ▒£  ",
+		"  &     ▓£  ",
+		"  &     ££  ",
+		" &     ░££  ",
+		" &     ▒££  ",
+		"&      ▓££  ",
+		"&      £££  ",
+		"      ░£££  ",
+		"      ▒£££  ",
+		"      ▓£££  ",
+		"      █£££  ",
+		"     ░█£££  ",
+		"     ▒█£££  ",
+		"     ▓█£££  ",
+		"     ██£££  ",
+		"    ░██£££  ",
+		"    ▒██£££  ",
+		"    ▓██£££  ",
+		"    ███£££  ",
+		"   ░███£££  ",
+		"   ▒███£££  ",
+		"   ▓███£££  ",
+		"   ████£££  ",
+		"  ░████£££  ",
+		"  ▒████£££  ",
+		"  ▓████£££  ",
+		"  █████£££  ",
+		" ░█████£££  ",
+		" ▒█████£££  ",
+		" ▓█████£££  ",
+		" ██████£££  ",
+		" ██████£££  ",
+	},
+}

tree/.config/nvim/lua/statusline.lua

@@ -1,43 +1,58 @@
+require('lsp-progress').setup({
+	spinner = require('spinners').dwarf_fortress,
+	spin_update_time = 200,
+	client_format = function(client_name, spinner, series_messages)
+		return #series_messages > 0
+			and (
+				table.concat(series_messages, ", ")
+				.. " " .. spinner
+				.. " [" .. client_name .. "]"
+			)
+			or nil
+	end,
+})
+
 require('lualine').setup {
-  options = {
+	options = {
-    icons_enabled = true,
+		icons_enabled = true,
-    theme = 'auto',
+		theme = 'auto',
-    component_separators = { left = '', right = ''},
+		component_separators = { left = '', right = '' },
-    section_separators = { left = '', right = ''},
+		section_separators = { left = '', right = '' },
-    disabled_filetypes = {
+		disabled_filetypes = {
-      statusline = {},
+			statusline = {},
-      winbar = {},
+			winbar = {},
-    },
+		},
-    ignore_focus = {},
+		ignore_focus = {},
-    always_divide_middle = true,
+		always_divide_middle = true,
-    globalstatus = false,
+		globalstatus = false,
-    refresh = {
+		refresh = {
-      statusline = 1000,
+			statusline = 200,
-      tabline = 1000,
+			tabline = 1000,
-      winbar = 1000,
+			winbar = 1000,
-    }
+		}
-  },
+	},
-  sections = {
+	sections = {
-    lualine_a = {'mode'},
+		lualine_a = { 'mode' },
-    lualine_b = {'branch', 'diff', 'diagnostics'},
+		lualine_b = { 'branch', 'diff', 'diagnostics' },
-    lualine_c = {'filename'},
+		lualine_c = { 'filename' },
-    lualine_x = {{
+		lualine_x = {
-		'lsp_progress',
+			function()
-	 	timer = { progress_enddelay = 20, spinner = 20, lsp_client_name_enddelay = 20 },
+				return require('lsp-progress').progress()
-		}},
+			end
-    lualine_y = {'encoding', 'fileformat', 'filetype'},
+		},
-    lualine_z = {'location'}
+		lualine_y = { 'encoding', 'fileformat', 'filetype' },
-  },
+		lualine_z = { 'location' }
-  inactive_sections = {
+	},
-    lualine_a = {},
+	inactive_sections = {
-    lualine_b = {},
+		lualine_a = {},
-    lualine_c = {'filename'},
+		lualine_b = {},
-    lualine_x = {'location'},
+		lualine_c = { 'filename' },
-    lualine_y = {},
+		lualine_x = { 'location' },
-    lualine_z = {}
+		lualine_y = {},
-  },
+		lualine_z = {}
-  tabline = {},
+	},
-  winbar = {},
+	tabline = {},
-  inactive_winbar = {},
+	winbar = {},
-  extensions = {}
+	inactive_winbar = {},
+	extensions = {}
 }

tree/.config/nvim/lua/theme.lua

@@ -1,30 +1,33 @@
 -- setup must be called before loading the colorscheme
 -- Default options:
 require("gruvbox").setup({
-  terminal_colors = true, -- add neovim terminal colors
+	terminal_colors = true, -- add neovim terminal colors
-  undercurl = true,
+	undercurl = true,
-  underline = true,
+	underline = true,
-  bold = true,
+	bold = true,
-  italic = {
+	italic = {
-    strings = true,
+		strings = true,
-    emphasis = true,
+		emphasis = true,
-    comments = true,
+		comments = true,
-    operators = false,
+		operators = false,
-    folds = true,
+		folds = true,
-  },
+	},
-  strikethrough = true,
+	strikethrough = true,
-  invert_selection = false,
+	invert_selection = false,
-  invert_signs = false,
+	invert_signs = false,
-  invert_tabline = false,
+	invert_tabline = false,
-  invert_intend_guides = false,
+	invert_intend_guides = false,
-  inverse = true, -- invert background for search, diffs, statuslines and errors
+	inverse = true, -- invert background for search, diffs, statuslines and errors
-  contrast = "", -- can be "hard", "soft" or empty string
+	contrast = "", -- can be "hard", "soft" or empty string
-  palette_overrides = {},
+	palette_overrides = {},
-  overrides = {},
+	overrides = {},
-  dim_inactive = false,
+	dim_inactive = false,
-  transparent_mode = false,
+	transparent_mode = not vim.g.neovide,
 })
 
-vim.o.background = "dark" -- or "light" for light mode
+require('color-scheme')
+
+local color_scheme_file = os.getenv("HOME") .. "/.cache/dotfiles/.config/nvim/lua/color-scheme.lua"
+require('fwatch').watch(color_scheme_file, "luafile " .. color_scheme_file)
 
 vim.cmd([[colorscheme gruvbox]])

tree/.config/nvim/plugin/packer_compiled.lua

@@ -1,338 +0,0 @@
--- Automatically generated packer.nvim plugin loader code
-
-if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
-  vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
-  return
-end
-
-vim.api.nvim_command('packadd packer.nvim')
-
-local no_errors, error_msg = pcall(function()
-
-_G._packer = _G._packer or {}
-_G._packer.inside_compile = true
-
-local time
-local profile_info
-local should_profile = false
-if should_profile then
-  local hrtime = vim.loop.hrtime
-  profile_info = {}
-  time = function(chunk, start)
-    if start then
-      profile_info[chunk] = hrtime()
-    else
-      profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
-    end
-  end
-else
-  time = function(chunk, start) end
-end
-
-local function save_profiles(threshold)
-  local sorted_times = {}
-  for chunk_name, time_taken in pairs(profile_info) do
-    sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
-  end
-  table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
-  local results = {}
-  for i, elem in ipairs(sorted_times) do
-    if not threshold or threshold and elem[2] > threshold then
-      results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
-    end
-  end
-  if threshold then
-    table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
-  end
-
-  _G._packer.profile_output = results
-end
-
-time([[Luarocks path setup]], true)
-local package_path_str = "/home/hulthe/.cache/nvim/packer_hererocks/2.1.1694285958/share/lua/5.1/?.lua;/home/hulthe/.cache/nvim/packer_hererocks/2.1.1694285958/share/lua/5.1/?/init.lua;/home/hulthe/.cache/nvim/packer_hererocks/2.1.1694285958/lib/luarocks/rocks-5.1/?.lua;/home/hulthe/.cache/nvim/packer_hererocks/2.1.1694285958/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/hulthe/.cache/nvim/packer_hererocks/2.1.1694285958/lib/lua/5.1/?.so"
-if not string.find(package.path, package_path_str, 1, true) then
-  package.path = package.path .. ';' .. package_path_str
-end
-
-if not string.find(package.cpath, install_cpath_pattern, 1, true) then
-  package.cpath = package.cpath .. ';' .. install_cpath_pattern
-end
-
-time([[Luarocks path setup]], false)
-time([[try_loadstring definition]], true)
-local function try_loadstring(s, component, name)
-  local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
-  if not success then
-    vim.schedule(function()
-      vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
-    end)
-  end
-  return result
-end
-
-time([[try_loadstring definition]], false)
-time([[Defining packer_plugins]], true)
-_G.packer_plugins = {
-  ale = {
-    commands = { "ALEEnable" },
-    config = { "vim.cmd[[ALEEnable]]" },
-    loaded = false,
-    needs_bufread = true,
-    only_cond = false,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/opt/ale",
-    url = "https://github.com/w0rp/ale"
-  },
-  ["beacon.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/beacon.nvim",
-    url = "https://github.com/danilamihailov/beacon.nvim"
-  },
-  ["cmp-buffer"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/cmp-buffer",
-    url = "https://github.com/hrsh7th/cmp-buffer"
-  },
-  ["cmp-nvim-lsp"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
-    url = "https://github.com/hrsh7th/cmp-nvim-lsp"
-  },
-  ["cmp-nvim-lsp-signature-help"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help",
-    url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help"
-  },
-  ["cmp-nvim-lua"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
-    url = "https://github.com/hrsh7th/cmp-nvim-lua"
-  },
-  ["cmp-path"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/cmp-path",
-    url = "https://github.com/hrsh7th/cmp-path"
-  },
-  ["cmp-vsnip"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/cmp-vsnip",
-    url = "https://github.com/hrsh7th/cmp-vsnip"
-  },
-  ["colorbuddy.vim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/colorbuddy.vim",
-    url = "https://github.com/tjdevries/colorbuddy.vim"
-  },
-  ["completion-nvim"] = {
-    after = { "vim-vsnip-integ" },
-    loaded = false,
-    needs_bufread = false,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/opt/completion-nvim",
-    url = "https://github.com/haorenW1025/completion-nvim"
-  },
-  dracula = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/dracula",
-    url = "https://github.com/dracula/vim"
-  },
-  firenvim = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/firenvim",
-    url = "https://github.com/glacambre/firenvim"
-  },
-  ["gruvbox.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/gruvbox.nvim",
-    url = "https://github.com/ellisonleao/gruvbox.nvim"
-  },
-  ["lualine-lsp-progress.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/lualine-lsp-progress.nvim",
-    url = "https://github.com/WhoIsSethDaniel/lualine-lsp-progress.nvim"
-  },
-  ["lualine.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/lualine.nvim",
-    url = "https://github.com/nvim-lualine/lualine.nvim"
-  },
-  ["markdown-preview.nvim"] = {
-    commands = { "MarkdownPreview" },
-    loaded = false,
-    needs_bufread = false,
-    only_cond = false,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/opt/markdown-preview.nvim",
-    url = "https://github.com/iamcco/markdown-preview.nvim"
-  },
-  ["mason-lspconfig.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
-    url = "https://github.com/williamboman/mason-lspconfig.nvim"
-  },
-  ["mason.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/mason.nvim",
-    url = "https://github.com/williamboman/mason.nvim"
-  },
-  ["nvim-cmp"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/nvim-cmp",
-    url = "https://github.com/hrsh7th/nvim-cmp"
-  },
-  ["nvim-lspconfig"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
-    url = "https://github.com/neovim/nvim-lspconfig"
-  },
-  ["nvim-treesitter"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
-    url = "https://github.com/nvim-treesitter/nvim-treesitter"
-  },
-  ["nvim-web-devicons"] = {
-    loaded = false,
-    needs_bufread = false,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons",
-    url = "https://github.com/nvim-tree/nvim-web-devicons"
-  },
-  ["packer.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/packer.nvim",
-    url = "https://github.com/wbthomason/packer.nvim"
-  },
-  ["plenary.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/plenary.nvim",
-    url = "https://github.com/nvim-lua/plenary.nvim"
-  },
-  ["rust-tools.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/rust-tools.nvim",
-    url = "https://github.com/simrat39/rust-tools.nvim"
-  },
-  ["telescope.nvim"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/telescope.nvim",
-    url = "https://github.com/nvim-telescope/telescope.nvim"
-  },
-  ["vim-closer"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/vim-closer",
-    url = "https://github.com/rstacruz/vim-closer"
-  },
-  ["vim-dispatch"] = {
-    commands = { "Dispatch", "Make", "Focus", "Start" },
-    loaded = false,
-    needs_bufread = false,
-    only_cond = false,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/opt/vim-dispatch",
-    url = "https://github.com/tpope/vim-dispatch"
-  },
-  ["vim-matchup"] = {
-    after_files = { "/home/hulthe/.local/share/nvim/site/pack/packer/opt/vim-matchup/after/plugin/matchit.vim" },
-    loaded = false,
-    needs_bufread = true,
-    only_cond = false,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/opt/vim-matchup",
-    url = "https://github.com/andymass/vim-matchup"
-  },
-  ["vim-vsnip"] = {
-    loaded = true,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/start/vim-vsnip",
-    url = "https://github.com/hrsh7th/vim-vsnip"
-  },
-  ["vim-vsnip-integ"] = {
-    after_files = { "/home/hulthe/.local/share/nvim/site/pack/packer/opt/vim-vsnip-integ/after/plugin/vsnip_integ.vim" },
-    load_after = {
-      ["completion-nvim"] = true
-    },
-    loaded = false,
-    needs_bufread = false,
-    path = "/home/hulthe/.local/share/nvim/site/pack/packer/opt/vim-vsnip-integ",
-    url = "https://github.com/hrsh7th/vim-vsnip-integ"
-  }
-}
-
-time([[Defining packer_plugins]], false)
-
--- Command lazy-loads
-time([[Defining lazy-load commands]], true)
-pcall(vim.api.nvim_create_user_command, 'MarkdownPreview', function(cmdargs)
-          require('packer.load')({'markdown-preview.nvim'}, { cmd = 'MarkdownPreview', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins)
-        end,
-        {nargs = '*', range = true, bang = true, complete = function()
-          require('packer.load')({'markdown-preview.nvim'}, {}, _G.packer_plugins)
-          return vim.fn.getcompletion('MarkdownPreview ', 'cmdline')
-      end})
-pcall(vim.api.nvim_create_user_command, 'Dispatch', function(cmdargs)
-          require('packer.load')({'vim-dispatch'}, { cmd = 'Dispatch', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins)
-        end,
-        {nargs = '*', range = true, bang = true, complete = function()
-          require('packer.load')({'vim-dispatch'}, {}, _G.packer_plugins)
-          return vim.fn.getcompletion('Dispatch ', 'cmdline')
-      end})
-pcall(vim.api.nvim_create_user_command, 'Make', function(cmdargs)
-          require('packer.load')({'vim-dispatch'}, { cmd = 'Make', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins)
-        end,
-        {nargs = '*', range = true, bang = true, complete = function()
-          require('packer.load')({'vim-dispatch'}, {}, _G.packer_plugins)
-          return vim.fn.getcompletion('Make ', 'cmdline')
-      end})
-pcall(vim.api.nvim_create_user_command, 'Focus', function(cmdargs)
-          require('packer.load')({'vim-dispatch'}, { cmd = 'Focus', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins)
-        end,
-        {nargs = '*', range = true, bang = true, complete = function()
-          require('packer.load')({'vim-dispatch'}, {}, _G.packer_plugins)
-          return vim.fn.getcompletion('Focus ', 'cmdline')
-      end})
-pcall(vim.api.nvim_create_user_command, 'Start', function(cmdargs)
-          require('packer.load')({'vim-dispatch'}, { cmd = 'Start', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins)
-        end,
-        {nargs = '*', range = true, bang = true, complete = function()
-          require('packer.load')({'vim-dispatch'}, {}, _G.packer_plugins)
-          return vim.fn.getcompletion('Start ', 'cmdline')
-      end})
-pcall(vim.api.nvim_create_user_command, 'ALEEnable', function(cmdargs)
-          require('packer.load')({'ale'}, { cmd = 'ALEEnable', l1 = cmdargs.line1, l2 = cmdargs.line2, bang = cmdargs.bang, args = cmdargs.args, mods = cmdargs.mods }, _G.packer_plugins)
-        end,
-        {nargs = '*', range = true, bang = true, complete = function()
-          require('packer.load')({'ale'}, {}, _G.packer_plugins)
-          return vim.fn.getcompletion('ALEEnable ', 'cmdline')
-      end})
-time([[Defining lazy-load commands]], false)
-
-vim.cmd [[augroup packer_load_aucmds]]
-vim.cmd [[au!]]
-  -- Filetype lazy-loads
-time([[Defining lazy-load filetype autocommands]], true)
-vim.cmd [[au FileType cmake ++once lua require("packer.load")({'ale'}, { ft = "cmake" }, _G.packer_plugins)]]
-vim.cmd [[au FileType html ++once lua require("packer.load")({'ale'}, { ft = "html" }, _G.packer_plugins)]]
-vim.cmd [[au FileType markdown ++once lua require("packer.load")({'ale'}, { ft = "markdown" }, _G.packer_plugins)]]
-vim.cmd [[au FileType racket ++once lua require("packer.load")({'ale'}, { ft = "racket" }, _G.packer_plugins)]]
-vim.cmd [[au FileType tex ++once lua require("packer.load")({'ale'}, { ft = "tex" }, _G.packer_plugins)]]
-vim.cmd [[au FileType vim ++once lua require("packer.load")({'ale'}, { ft = "vim" }, _G.packer_plugins)]]
-vim.cmd [[au FileType c ++once lua require("packer.load")({'ale'}, { ft = "c" }, _G.packer_plugins)]]
-vim.cmd [[au FileType sh ++once lua require("packer.load")({'ale'}, { ft = "sh" }, _G.packer_plugins)]]
-vim.cmd [[au FileType zsh ++once lua require("packer.load")({'ale'}, { ft = "zsh" }, _G.packer_plugins)]]
-vim.cmd [[au FileType bash ++once lua require("packer.load")({'ale'}, { ft = "bash" }, _G.packer_plugins)]]
-vim.cmd [[au FileType cpp ++once lua require("packer.load")({'ale'}, { ft = "cpp" }, _G.packer_plugins)]]
-time([[Defining lazy-load filetype autocommands]], false)
-  -- Event lazy-loads
-time([[Defining lazy-load event autocommands]], true)
-vim.cmd [[au VimEnter * ++once lua require("packer.load")({'vim-matchup'}, { event = "VimEnter *" }, _G.packer_plugins)]]
-time([[Defining lazy-load event autocommands]], false)
-vim.cmd("augroup END")
-
-_G._packer.inside_compile = false
-if _G._packer.needs_bufread == true then
-  vim.cmd("doautocmd BufRead")
-end
-_G._packer.needs_bufread = false
-
-if should_profile then save_profiles() end
-
-end)
-
-if not no_errors then
-  error_msg = error_msg:gsub('"', '\\"')
-  vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
-end

tree/.config/starship.toml.tpl

@@ -19,20 +19,20 @@ format = "[$hostname]($style) in "
 disabled = true
 {% end %}
 
-[custom.stl]
+#[custom.stl]
-description = "time logger"
+#description = "time logger"
-when = "stl stat -f /home/hulthe/.stld" # touch the file, but don't create it
+#when = "stl stat -f /home/hulthe/.stld" # touch the file, but don't create it
-command = "cat /home/hulthe/.stld"
+#command = "cat /home/hulthe/.stld"
-symbol = "🕑"
+#symbol = "🕑"
-style = "italic bright-purple"
+#style = "italic bright-purple"
-format = "[$symbol ($output )]($style)"
+#format = "[$symbol ($output )]($style)"
 {% if demo %}
-disabled = true
+#disabled = true
 {% end %}
 
 
-# hide all persondata while in demo mode
 {% if demo %}
+# hide all persondata while in demo mode
 [directory]
 truncation_length = 1
 

tree/.config/swayidle/config.tpl

@@ -0,0 +1,18 @@
+{% if hostname == "sputnik" %}
+lock '$HOME/.local/bin/screenlock'
+{% else %}
+lock '$HOME/.local/bin/screenlock'
+{% end %}
+before-sleep 'loginctl lock-session'
+
+{% if hostname == "sputnik" %}
+timeout 1770 'notify-send "Locking in 30s"'
+timeout 1800 'loginctl lock-session'
+{% else %}
+timeout 530 'notify-send "Locking in 30s"'
+timeout 600 'loginctl lock-session'
+{% end %}
+
+{% if hostname == "buran" %}
+timeout 660 'niri msg action power-off-monitors'
+{% end %}

tree/.config/swaync/config.json

@@ -0,0 +1,99 @@
+{
+  "$schema": "/etc/xdg/swaync/configSchema.json",
+  "positionX": "right",
+  "positionY": "top",
+  "control-center-margin-top": 10,
+  "control-center-margin-bottom": 10,
+  "control-center-margin-left": 10,
+  "notification-icon-size": 64,
+  "notification-body-image-height": 100,
+  "notification-body-image-width": 200,
+  "timeout": 10,
+  "timeout-low": 5,
+  "timeout-critical": 0,
+  "fit-to-screen": false,
+  "control-center-width": 500,
+  "control-center-height": 1033,
+  "notification-window-width": 500,
+  "keyboard-shortcuts": true,
+  "image-visibility": "when-available",
+  "transition-time": 200,
+  "hide-on-clear": false,
+  "hide-on-action": true,
+  "script-fail-notify": true,
+  "widgets": [
+    "buttons-grid",
+    "volume",
+    "backlight"
+  ],
+  "widget-config": {
+    "title": {
+      "text": "Notification Center",
+      "clear-all-button": true,
+      "button-text": "󰆴 Clear"
+    },
+    "dnd": {
+      "text": "Do Not Disturb"
+    },
+    "label": {
+      "max-lines": 1,
+      "text": "Notification Center"
+    },
+    "mpris": {
+      "image-size": 50,
+      "image-radius": 5
+    },
+    "volume": {
+      "label": "󰕾"
+    },
+    "backlight": {
+      "label": "󰃟"
+    },
+    "buttons-grid": {
+      "actions": [
+        {
+          "label": "󰐥",
+          "command": "systemctl poweroff"
+        },
+        {
+          "label": "󰜉",
+          "command": "systemctl reboot"
+        },
+        {
+          "label": "󰌾",
+          "command": "swaylock-corrupter"
+        },
+        {
+          "label": "󰍃",
+          "command": "swaymsg exit"
+        },
+        {
+          "label": "󰆴",
+          "command": "swaync-client -C"
+        },
+        {
+          "label": "󰕾",
+          "command": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+          "type": "toggle"
+        },
+        {
+          "label": "󰍬",
+          "command": "pactl set-source-mute @DEFAULT_SOURCE@ toggle",
+          "type": "toggle"
+        },
+        {
+          "label": "󰖩",
+          "command": "iwgtk"
+        },
+        {
+          "label": "󰂯",
+          "command": "blueman-manager"
+        },
+        {
+          "label": "",
+          "command": "kooha"
+        }
+      ]
+    }
+  }
+}

tree/.config/swaync/style.css

@@ -0,0 +1,307 @@
+
+@define-color cc-bg rgba(26, 27, 38, 1);
+/* @define-color noti-border-color rgba(255, 255, 255, 0.15); */
+@define-color noti-border-color #f65d76;
+@define-color noti-bg rgb(17, 17, 27);
+@define-color noti-bg-darker rgb(43, 43, 57);
+@define-color noti-bg-hover rgb(27, 27, 43);
+@define-color noti-bg-focus rgba(27, 27, 27, 0.6);
+@define-color noti-close-bg rgba(255, 255, 255, 0.1);
+@define-color noti-close-bg-hover rgba(255, 255, 255, 0.15);
+@define-color text-color rgba(169, 177, 214, 1);
+@define-color text-color-disabled rgb(150, 150, 150);
+@define-color bg-selected rgb(0, 128, 255);
+
+* {
+  font-family: JetBrainsMono NFM SemiBold;
+}
+
+.control-center .notification-row:focus,
+.control-center .notification-row:hover {
+  opacity: 1;
+  background: @noti-bg-darker;
+}
+
+.notification-row {
+  outline: none;
+  margin: 0px;
+  padding: 0px;
+}
+
+.notification {
+  background: @cc-bg;
+  border: 2px solid @noti-border-color;
+  border-radius: 12px;
+  margin: 6px 8px 0px 0px;
+  padding: 4px;
+}
+
+.notification-content {
+  background: @cc-bg;
+}
+
+.notification-default-action {
+  margin: 0;
+  padding: 0;
+}
+
+.close-button {
+  background: #f7768e;
+  color: @cc-bg;
+  text-shadow: none;
+  padding: 0px;
+  border-radius: 0px;
+  margin-top: 5px;
+  margin-right: 5px;
+}
+
+.close-button:hover {
+  box-shadow: none;
+  background: #f7768e;
+  transition: all 0.15s ease-in-out;
+  border: none;
+}
+
+.notification-action {
+  border: 2px solid #34548a;
+  border-top: none;
+}
+
+.notification-default-action:hover,
+.notification-action:hover {
+  color: #7aa2f7;
+  background: @cc-bg;
+}
+
+.notification-default-action:not(:only-child) {
+  border-bottom-left-radius: 7px;
+  border-bottom-right-radius: 7px;
+}
+
+.notification-action:first-child {
+  border-bottom-left-radius: 10px;
+  background: #1b1b2b;
+}
+
+.notification-action:last-child {
+  border-bottom-right-radius: 10px;
+  background: #1b1b2b;
+}
+
+.inline-reply {
+  margin-top: 8px;
+}
+
+.inline-reply-entry {
+  background: @noti-bg-darker;
+  color: @text-color;
+  caret-color: @text-color;
+  border: 1px solid @noti-border-color;
+  border-radius: 5px;
+}
+
+.inline-reply-button {
+  margin-left: 4px;
+  background: @noti-bg;
+  border: 1px solid @noti-border-color;
+  border-radius: 5px;
+  color: @text-color;
+}
+
+.inline-reply-button:disabled {
+  background: initial;
+  color: @text-color-disabled;
+  border: 1px solid transparent;
+}
+
+.inline-reply-button:hover {
+  background: @noti-bg-hover;
+}
+
+.image {
+  border-radius: 0px;
+  margin-right: 10px;
+}
+
+.summary {
+  font-size: 16px;
+  font-weight: 700;
+  background: transparent;
+  color: rgba(158, 206, 106, 1);
+  text-shadow: none;
+}
+
+.time {
+  font-size: 16px;
+  font-weight: 700;
+  background: transparent;
+  color: @text-color;
+  text-shadow: none;
+  margin-right: 18px;
+}
+
+.body {
+  font-size: 15px;
+  font-weight: 400;
+  background: transparent;
+  color: @text-color;
+  text-shadow: none;
+}
+
+.control-center {
+  background: @cc-bg;
+  border: 2px solid #34548a;
+  border-radius: 0px;
+}
+
+.control-center-list {
+  background: transparent;
+}
+
+.control-center-list-placeholder {
+  opacity: 0.5;
+}
+
+.floating-notifications {
+  background: transparent;
+}
+
+.blank-window {
+  background: alpha(black, 0.1);
+}
+
+.widget-title {
+  color: #7aa2f7;
+  background: @noti-bg-darker;
+  padding: 5px 10px;
+  margin: 10px 10px 5px 10px;
+  font-size: 1.5rem;
+  border-radius: 5px;
+}
+
+.widget-title > button {
+  font-size: 1rem;
+  color: @text-color;
+  text-shadow: none;
+  background: @noti-bg;
+  box-shadow: none;
+  border-radius: 5px;
+}
+
+.widget-title > button:hover {
+  background: #f7768e;
+  color: @cc-bg;
+}
+
+.widget-dnd {
+  background: @noti-bg-darker;
+  padding: 5px 10px;
+  margin: 5px 10px;
+  border-radius: 5px;
+  font-size: large;
+  color: #7aa2f7;
+}
+
+.widget-dnd > switch {
+  border-radius: 5px;
+  background: #7aa2f7;
+}
+
+.widget-dnd > switch:checked {
+  background: #f7768e;
+  border: 1px solid #f7768e;
+}
+
+.widget-dnd > switch slider,
+.widget-dnd > switch:checked slider {
+  background: @cc-bg;
+  border-radius: 5px;
+}
+
+.widget-label {
+  margin: 10px 10px 5px 10px;
+}
+
+.widget-label > label {
+  font-size: 1rem;
+  color: @text-color;
+}
+
+.widget-mpris {
+  color: @text-color;
+  background: @noti-bg-darker;
+  padding: 5px 10px;
+  margin: 5px 10px 5px 10px;
+  border-radius: 5px;
+}
+
+.widget-mpris > box > button {
+  border-radius: 5px;
+}
+
+.widget-mpris-player {
+  padding: 5px 10px;
+  margin: 10px;
+}
+
+.widget-mpris-title {
+  font-weight: 700;
+  font-size: 1.25rem;
+}
+
+.widget-mpris-subtitle {
+  font-size: 1.1rem;
+}
+
+.widget-buttons-grid {
+  font-size: x-large;
+  padding: 5px;
+  margin: 10px 10px 5px 10px;
+  border-radius: 0px;
+  background: @noti-bg-darker;
+}
+
+.widget-buttons-grid > flowbox > flowboxchild > button {
+  margin: 3px;
+  background: @cc-bg;
+  border-radius: 0px;
+  color: @text-color;
+}
+
+.widget-buttons-grid > flowbox > flowboxchild > button:hover {
+  background: rgba(122, 162, 247, 1);
+  color: @cc-bg;
+}
+
+.widget-buttons-grid > flowbox > flowboxchild > button:checked {
+  background: rgb(158, 206, 106);
+  color: @cc-bg;
+}
+
+.widget-menubar > box > .menu-button-bar > button {
+  border: none;
+  background: transparent;
+}
+
+.topbar-buttons > button {
+  border: none;
+  background: transparent;
+}
+
+.widget-volume {
+  background: @noti-bg-darker;
+  padding: 5px;
+  margin: 5px 10px;
+  border-radius: 0px;
+  font-size: 2rem;
+  color: #7aa2f7;
+}
+
+.widget-backlight {
+  background: @noti-bg-darker;
+  padding: 5px;
+  margin: 5px 10px;
+  border-radius: 0px;
+  font-size: 2rem;
+  color: #7aa2f7;
+}

tree/.face

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="120"
+   height="120"
+   viewBox="0 0 31.75 31.75"
+   version="1.1"
+   id="svg8"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:#ffffff;stroke-width:0.177246"
+       d="m 13.134179,31.651166 c -1.367874,-0.18043 -3.4872278,-0.85238 -4.780367,-1.51563 -1.871747,-0.96002 -4.179215,-3.22966 -5.0074297,-4.92534 -1.5914865,-3.25839 -1.6801158,-7.72336 -0.2278948,-11.48085 1.0247424,-2.65144 2.7098602,-4.5706201 5.4768881,-6.2376401 4.4640374,-2.6894 6.9208324,-4.59636 8.5218534,-6.61464 0.435944,-0.54955 0.851411,-0.9404 0.923263,-0.86855 0.34663,0.34663 0.709996,2.45556 0.596276,3.46071 l -0.118698,1.04918 0.543199,-0.3868 c 0.298763,-0.21273 0.754695,-0.66407 1.013185,-1.00297 0.258491,-0.3389 0.531184,-0.55268 0.605988,-0.47507 0.277608,0.28804 0.872923,2.3693 0.872923,3.05181 0,0.78189 -0.07309,0.70941 2.140938,2.12277 3.360595,2.14527 5.28622,5.2741001 5.845846,9.4985401 0.238089,1.79727 0.119928,4.12317 -0.289284,5.69424 -0.438918,1.68512 -1.295306,3.20011 -2.596637,4.59356 -2.715779,2.90803 -6.119638,4.1954 -10.928887,4.13338 -1.132683,-0.0146 -2.298705,-0.0581 -2.591161,-0.0967 z m 5.683631,-1.1265 c 5.074026,-0.89873 8.492767,-3.70496 9.49005,-7.7898 0.358508,-1.46844 0.317005,-5.28368 -0.07569,-6.95754 -0.594746,-2.53514 -2.005266,-4.78931 -3.64922,-5.8318801 -1.428352,-0.90583 -1.561881,-0.82384 -2.840659,1.7442101 -0.615739,1.23654 -1.777129,3.21756 -2.580868,4.40229 l -1.461342,2.15404 0.927607,0.3153 c 1.188141,0.40386 2.476979,1.20634 2.848748,1.77373 0.272049,0.4152 0.269021,0.4806 -0.04735,1.02231 -0.778356,1.33273 -2.272203,1.79512 -5.849412,1.81056 l -2.340153,0.0101 -2.489801,2.46697 c -2.6276133,2.60352 -2.8788341,3.03045 -2.0880964,3.54856 1.8126654,1.18771 7.0732674,1.8772 10.1561944,1.33115 z m 3.183004,-13.17071 c -0.205126,-0.14999 -0.329285,-0.4602 -0.329285,-0.8227 0,-0.96498 1.087198,-1.43355 1.715448,-0.73934 0.872429,0.96402 -0.338235,2.3283 -1.386163,1.56204 z m -3.186586,4.78402 c 1.133944,-0.30198 1.619925,-0.56299 1.85054,-0.9939 0.246861,-0.46126 -0.269147,-0.94676 -1.770094,-1.66543 -1.062457,-0.50872 -1.296906,-0.55176 -3.013183,-0.55311 -1.794444,-0.001 -1.910137,0.0225 -3.231141,0.66815 -1.860639,0.90936 -2.118197,1.48499 -0.948717,2.12031 1.182601,0.64245 5.357705,0.89133 7.112595,0.42398 z m -5.26747,-0.96936 c -1.113796,-0.13246 -1.303724,-0.23853 -1.149022,-0.64168 0.08921,-0.23246 0.582443,-0.27351 3.286452,-0.27351 1.749822,0 3.307658,0.0484 3.461858,0.10758 0.350902,0.13466 0.365077,0.53097 0.02367,0.66198 -0.432127,0.16582 -4.555272,0.2726 -5.622968,0.14563 z m -3.7845902,-3.81466 c 0.7343882,-0.537 0.2478022,-1.88618 -0.6802563,-1.88618 -0.5030742,0 -0.9992445,0.51278 -0.9992445,1.03268 0,0.90987 0.9453857,1.39029 1.6795008,0.8535 z"
+       id="path865" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.5967544,-6.2400058 c 0,0 -0.041418,0.1031026 -0.02862,0.2093299 0.012798,0.1062273 0.084435,0.1741091 0.084435,0.1741091 l -0.083147,0.088222 c 0,0 -0.1053512,-0.138166 -0.073877,-0.2774823 0.031474,-0.1393166 0.1012092,-0.1941783 0.101209,-0.1941787 z"
+       id="path1039" />
+  </g>
+  <g
+     id="layer2"
+     style="display:none" />
+  <g
+     id="layer3"
+     style="display:none" />
+</svg>

tree/.gitconfig.tpl

@@ -1,7 +1,9 @@
 [user]
-	email = joakim@hulthe.net
 	name = Joakim Hulthe
+{% if hostname != "buran" %}
+	email = joakim@hulthe.net
 	signingkey = joakim@hulthe.net
+{% end %}
 
 [commit]
 	gpgSign = true
@@ -10,7 +12,7 @@
 	rebase = true
 
 [core]
-	editor = nvim
+	editor = helix
 
 [init]
 	defaultBranch = master
@@ -26,3 +28,6 @@
 
 [interactive]
 	diffFilter = delta --color-only
+
+[log]
+	showSignature = true

tree/.local/bin/arch-firstinstall

@@ -14,41 +14,52 @@ sudo pacman --needed -S \
 	brightnessctl \
 	curl \
 	difftastic \
-	dunst \
 	dust \
+	ddcutil \
 	exa \
 	fd \
 	fish \
 	fuzzel \
 	git \
 	git-delta \
+	gnome \
 	grim \
 	htop \
 	hyprland \
 	hyprpaper \
+	i2c-tools \
+	lazygit \
+	luarocks \
+	man-db man-pages \
 	neovim \
 	nerd-fonts \
+	niri \
 	noto-fonts \
 	noto-fonts-emoji \
 	noto-fonts-extra \
 	nushell \
+	openbsd-netcat \
 	pamixer \
+	qt5ct \
 	qt5-wayland \
 	qt6-wayland \
 	ripgrep \
 	rustup \
 	sad \
+	starship \
+	swayidle \
+	swaylock \
+	swaync \
 	tig \
+	tree-sitter tree-sitter-cli \
 	vim \
+	vivid \
 	waybar \
 	wget \
 	wl-clipboard \
-	zathura
+	xdg-desktop-portal-gtk \
-
+	zathura \
-# install nvim packer
+	zoxide
-git clone --depth 1 https://github.com/wbthomason/packer.nvim \
-	~/.local/share/nvim/site/pack/packer/start/packer.nvim \
-	|| true # command will fail if packer is already installed
 
 rustup default stable
 
@@ -62,8 +73,9 @@ if ! command -v paru &> /dev/null; then
 	makepkg -si
 fi
 
-paru -S wdisplays eww-wayland
+paru -S wdisplays eww
 
+cargo install --locked --git https://git.nubo.sh/hulthe/wmutils.git
 cargo install --locked --git https://git.nubo.sh/hulthe/lockscreen-blur.git
 cargo install --locked --git https://git.nubo.sh/hulthe/volume_indicator.git
 

tree/.local/bin/get-color-scheme.tpl

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+{% if light %}
+echo light
+{% else %}
+echo dark
+{% end %}

tree/.local/bin/högtalare

@@ -5,7 +5,7 @@ set -x
 notify-send "Connecting to Högtalare"
 
 bluetoothctl power on
-if bluetoothctl connect 04:FE:A1:71:4C:70; then
+if bluetoothctl connect E8:26:CF:33:2D:BA; then
 	notify-send "Connected"
 else
 	notify-send "Failed to connect to Högtalare"

tree/.local/bin/mullpod

@@ -0,0 +1,53 @@
+#!/usr/bin/env fish
+
+# Extend the container in mullvadvpn-app with some useful dev tools and run it.
+
+cd $HOME/proj/mullvadvpn-app
+
+set base_tag (cat building/android-container-image.txt)
+set custom_tag "$base_tag-extra"
+
+# check if image exists
+if not podman image inspect $custom_tag >/dev/null
+	echo "Building custom image"
+	set tmp_dockerfile (mktemp)
+	echo "
+FROM $base_tag
+
+RUN apt-get update -y && apt-get upgrade -y && apt-get install -y \
+    fish \
+    procps
+
+# cargo-binstall
+RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+
+RUN cargo binstall bacon cargo-watch zoxide starship exa
+
+
+RUN curl -L --proto '=https' -sSf https://git.nubo.sh/hulthe/df/raw/branch/master/manager/setup.sh | bash
+
+RUN tee /entrypoint.sh <<EOF
+#!/bin/bash
+(cd ~/.config/dotfiles && git pull && dotfiles)
+
+exec \"\\\$@\"
+EOF
+
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT [\"/entrypoint.sh\"]
+
+" > $tmp_dockerfile
+
+
+	podman build -f $tmp_dockerfile -t $custom_tag || exit 1
+	rm $tmp_dockerfile
+end
+
+podman run --rm -it \
+	--hostname mullpod \
+	-v .:/build \
+	-v cargo-target:/cargo-target:Z \
+	-v cargo-registry:/root/.cargo/registry:Z \
+	-v gradle-cache:/root/.gradle:Z \
+	$custom_tag mold -run fish

tree/.local/bin/screenlock

@@ -0,0 +1,12 @@
+#!/usr/bin/fish
+
+# configured for wayland
+set LOCKPROG hyprlock
+
+# check if lock program is running
+if ps -e | grep " $LOCKPROG\$"
+    echo "$LOCKPROG is already running"
+    exit 1
+end
+
+ba $LOCKPROG $argv

tree/.local/bin/screenlock-video

@@ -0,0 +1,26 @@
+#!/usr/bin/fish
+
+# Run hyprlock and spawn fullscreen video windows to be shown behind the lockscreen
+
+set LOCKPROG hyprlock
+
+set video ~/hämtningar/video-screensavers/4k/comp_GMT329_117NC_401C_1037_IRELAND_TO_ASIA_v48_SDR_PS_FINAL_20180725_F0F6300_SDR_4K_HEVC.mov
+
+
+# check if lock program is running
+if ps -e | grep " $LOCKPROG\$"
+    echo "$LOCKPROG is already running"
+    exit 1
+end
+
+# Spawn an mpv instance for each monitor
+for workspace in (hyprctl -j monitors | jq '.[] | .activeWorkspace.id')
+	# Thi "WORKSPACE n" title is read by hyprland to position the window correctly
+	mpv --fs --loop-file=inf --panscan=1.0 --title="WORKSPACE $workspace" $video &
+end
+
+$LOCKPROG
+
+for pid in (jobs -p | tail -n +1)
+	kill $pid
+end

tree/.local/bin/screenlock.tpl

@@ -1,47 +0,0 @@
-#!/usr/bin/fish
-
-# configured for wayland
-set LOCKPROG swaylock
-set OPTIONAL_CMDS grep sed grim lockscreen-blur
-set CONFIG "$HOME/.config/sway/swaylock.config"
-set DEFAULT_ARGS --daemonize --color "302f3b" --config $CONFIG
-set BLUR_FACTOR 40
-
-# check if lock program is running
-if ps -e | grep " $LOCKPROG\$"
-	echo "$LOCKPROG is already running"
-	exit 1
-end
-
-for cmd in $OPTIONAL_CMDS
-	if not command -v $cmd &>/dev/null
-		echo "$cmd could not be found, falling back to basic mode."
-		$LOCKPROG $DEFAULT_ARGS
-		exit 0
-	end
-end
-
-
-{% if hostname == "buran" %}
-# list display outputs using hyprctl
-set outputs (hyprctl monitors | rg Monitor | sed 's/Monitor //' | sed 's/ (ID.*$//')
-{% elif hostname == "sputnik" %}
-# list display outputs using hyprctl
-set outputs (hyprctl monitors | rg Monitor | sed 's/Monitor //' | sed 's/ (ID.*$//')
-{% else %}
-# list display outputs using swaymsg
-set outputs (swaymsg -t get_outputs -r | grep "name" | sed 's/^.*"name": "//' | sed 's/",$//')
-{% end %}
-
-# take one screenshot of each output
-for output in $outputs
-	set img "/tmp/lock-$output.png"
-	grim -o $output -t ppm - | lockscreen-blur -o $img -b $BLUR_FACTOR --stamp ~/.config/wallpapers/ferris-stamp.png &
-	set -a images "--image"
-	set -a images "$output:$img"
-end
-
-wait
-
-$LOCKPROG $DEFAULT_ARGS $images
-

tree/.local/bin/set-color-scheme

@@ -0,0 +1,21 @@
+#!/bin/env fish
+
+switch $argv[1] 
+	case 'light'
+		# configure terminal stuff with light theme
+		dotfiles light
+
+		# change gtk theme
+		gsettings set org.gnome.desktop.interface color-scheme prefer-light
+
+	case 'dark'
+		# configure terminal stuff with dark theme
+		dotfiles
+
+		# change gtk theme
+		gsettings set org.gnome.desktop.interface color-scheme prefer-dark
+
+	case '*'
+		echo "usage: set-color-scheme <dark|light>"
+		exit 1
+end

tree/.local/bin/volshow

@@ -6,7 +6,7 @@ SOCKET="/tmp/volume_indicator"
 # If theres an existing volume_indicator running, prod the socket
 # Otherwise, start a new volume_indicator instance.
 nc -U "$SOCKET" 2>/dev/null || \
-ba alacritty -T "Volume" \
+ba alacritty -T "Volume Indicator" \
 		--class "volume_indicator" \
 		--config-file "$HOME/.config/alacritty/silent.toml" \
 		--command volume_indicator \

tree/.local/nu/cargo.nu

@@ -0,0 +1,6 @@
+# Resolve path to the cargo target dir, including an optional subpath
+def ctd [
+	path?: string
+] {
+	$"($env.CARGO_TARGET_DIR)/($path)"
+}

tree/.local/nu/git.nu

@@ -0,0 +1,20 @@
+def gitfixremote [
+	--name: string = "origin",
+] {
+	let url = (git remote get-url $name)
+	let parsed = ($url | parse --regex '^(\w+://)?(\w*@)?(?P<host>[^/:]+)(:(?P<port>\d+))?(:|/)(?P<owner>\w+)/(?P<repo>[\w_-]+)')
+
+	if ($parsed | is-empty) {
+		print "Unparseable remote"
+		return
+	}
+
+	let parsed = ($parsed | get 0)
+
+	if ($parsed.host in ["github.com" "git.nubo.sh"]) {
+		git remote set-url $name $"https://($parsed.host)/($parsed.owner)/($parsed.repo).git"
+		git remote set-url --push $name $"ssh://($parsed.host)/($parsed.owner)/($parsed.repo).git"
+	} else {
+		print $"Unknown host: ($parsed.host)"
+	}
+}

tree/.local/nu/macos.nu

@@ -0,0 +1,23 @@
+# Utility commands for macos
+
+def "net route 4" [
+] {
+	netstat -rnl -f inet | tail +4 | from ssv -m 1 | into int Refs Use Mtu
+}
+
+def "net route 6" [
+] {
+	netstat -rnl -f inet6 | tail +4 | from ssv -m 1 | into int Refs Use Mtu
+}
+
+def "net fw rule" [
+	--anchor (-a): string
+] {
+	sudo pfctl -sr -a $anchor | lines
+}
+
+def "net fw nat" [
+	--anchor (-a): string
+] {
+	sudo pfctl -sn -a $anchor | lines
+}

tree/.local/nu/mullvad.nu

@@ -1,5 +1,5 @@
 # Get a Mullvad api access token from an account number
-def m-token [
+def "m token" [
     account: string # Mullvad account number
 ] {
     (http post https://api.mullvad.net/auth/v1/token
@@ -8,7 +8,7 @@ def m-token [
 }
 
 # Add a device to a mullvad account
-def m-add-device [
+def "m add device" [
     account: string # Mullvad account number
 ] {
     let token = (m-token $account)
@@ -23,3 +23,258 @@ def m-add-device [
             kind: "App",
         })
 }
+
+# Get mullvad-daemon system path
+def "m daemon path" []: nothing -> string {
+    match (uname).kernel-name {
+        Linux => "/usr/bin/mullvad-daemon",
+        Darwin => "/Applications/Mullvad VPN.app/Contents/Resources/mullvad-daemon",
+        _ => (panic "Unknown Kernel"),
+    }
+}
+
+# Return true if mullvad-daemon is running
+def "m daemon is-running" [
+    # Only return true if mullvad-daemon is running as a launch daemon
+    --system (-s),
+] {
+    let procs = (^ps aux | lines)
+    if $system {
+        $procs | any { |line| $line =~ (m daemon path) }
+    } else {
+        $procs | any { |line| $line =~ "mullvad-daemon" }
+    }
+}
+
+def dns [
+    --server (-s): string,
+    name: string,
+] {
+    # HACK: turn the optional argument into a list. not sure how to pass it to nslookup otherwise.
+    let server = ([$server] | compact)
+
+    let ipv4 = (dig $name A    | lines | skip until {|l| $l =~ "ANSWER SECTION" } | skip 1 | take until { |l| $l == "" } | split column "\t" -c | rename host ttl _ type addr) | reject _
+    let ipv6 = (dig $name AAAA | lines | skip until {|l| $l =~ "ANSWER SECTION" } | skip 1 | take until { |l| $l == "" } | split column "\t" -c | rename host ttl _ type addr) | reject _
+
+    $ipv4 | append $ipv6
+}
+
+
+# Build and run mullvad-daemon
+def "m daemon" [
+    --release (-r)
+    # Force userspace wireguard
+    --userwg
+    # Use wireguard-go over GotaTun
+    --wggo
+    # Use stagemole
+    --stagemole
+    # Attach GDB
+    --gdb
+    # Add counters and such to nft rules
+    --debug-fw
+] {
+    mut daemon_args = []
+    mut cargo_flags = []
+    mut envs = [
+        MULLVAD_RESOURCE_DIR=./dist-assets/
+    ]
+
+    if $release {
+        $cargo_flags ++= [--release]
+    }
+
+    if $stagemole {
+        $cargo_flags ++= [--features api-override]
+        $envs ++= [
+            MULLVAD_API_HOST=api.stagemole.eu
+            MULLVAD_API_ADDR=(dns api.stagemole.eu | where type == A | get 0.addr):443
+        ]
+    }
+
+    if $debug_fw {
+        $envs ++= [TALPID_FIREWALL_DEBUG=1]
+    }
+
+    if $userwg {
+        $envs ++= [TALPID_FORCE_USERSPACE_WIREGUARD=1]
+    }
+
+    if $wggo {
+        $cargo_flags ++= [--features wireguard-go]
+    }
+
+    if (m daemon is-running --system) {
+        print "daemon is loaded, stopping..."
+
+        match (uname).kernel-name {
+            Linux => {
+                sudo systemctl stop mullvad-daemon
+            },
+            Darwin => {
+                sudo launchctl unload -w /Library/LaunchDaemons/net.mullvad.daemon.plist
+            },
+            _ => (panic "Unknown Kernel"),
+        }
+    } else if (m daemon is-running) {
+        print "mulvad-daemon is running in another terminal"
+        return
+    }
+
+    if $gdb {
+        $daemon_args ++= [gdb --args]
+    }
+
+    let daemon_path = if $release {
+        $daemon_args ++= [$"($env.CARGO_TARGET_DIR)/release/mullvad-daemon"]
+    } else {
+        $daemon_args ++= [$"($env.CARGO_TARGET_DIR)/debug/mullvad-daemon"]
+    }
+
+    # increase verbosity
+    $daemon_args ++= ["-vv"]
+
+    cargo b ...$cargo_flags
+    sudo ...$envs ...$daemon_args
+}
+
+def "m android cli" [
+    ...args
+] {
+    let socket_filename = "rpc-socket"
+    sudo MULLVAD_RPC_SOCKET_PATH=(sudo fd $socket_filename ~/.local/share/waydroid) mullvad ...$args
+}
+
+def "m android start" [
+] {
+    print "starting net.mullvad.mullvadvpn"    
+    adb shell am start -n net.mullvad.mullvadvpn/.ui.MainActivity;
+
+    # TODO: the waydroid cli is bork in the nix flake
+    # waydroid app launch net.mullvad.mullvadvpn
+}
+
+def "m android stop" [
+] {
+    let app_pid = (ps | where name =~ mullvadvpn | get -o pid.0)
+    if $app_pid != null {
+        print $"kill net.mullvad.mullvadvpn [($app_pid)]"
+        sudo kill $app_pid
+    } else {
+        print "net.mullvad.mullvadvpn is not running"
+    }
+}
+
+def "m android run" [
+] {
+    print "hack: making sure we're disconnected"
+    do --ignore-errors { m android cli disconnect }
+
+    print "compiling apk"
+    ./gradlew installOssProdDebug
+
+    m android start
+}
+
+def "m android reload-daemon" [
+] {
+    let daemon_path = (fd libmullvad_jni.so ~/.local/share/waydroid/ | lines | get -o 0)
+    if $daemon_path == null {
+        print "Can't find libmullvad_jni.so, hot-reload not available. Is the app installed?"
+        exit
+    }
+
+    m android stop
+
+    print "re-compiling libmullvad_jni.so"
+    ./gradlew app:cargoBuildX86_64;
+
+    print "Executing hot-swap!"
+    sudo cp ~/.cargo/target/x86_64-linux-android/debug/libmullvad_jni.so $daemon_path;
+
+    m android start
+}
+
+
+def "m e2e list" [
+    ...args
+] {
+    print "Building test utils"
+    cargo b --target aarch64-apple-darwin
+
+    let test_manager = $"($env.CARGO_TARGET_DIR)/aarch64-apple-darwin/debug/test-manager"
+
+    print "Listing tests"
+    ^$test_manager list-tests ...$args | from tsv | into int priority | sort-by priority name
+}
+
+def "m e2e run" [
+    account: string
+    vm: string
+    --skip: list<string>
+    --display (-d)
+    ...tests
+] {
+    let commit = (git rev-parse HEAD | take 6 | decode)
+    print $"Current commit: ($commit)"
+
+    let dist = "../dist"
+    print $"Looking in ($dist)"
+
+    let pkg_ext = match (uname).kernel-name {
+        "Linux" => "rpm", # TODO: rpm
+        "Darwin" => "pkg",
+        _ => (panic "Unknown kernel"),
+    }
+    let target = match (uname).kernel-name {
+        "Linux" => "x86_64-unknown-linux-musl",
+        "Darwin" => "aarch64-apple-darwin",
+        _ => (panic "Unknown kernel"),
+    }
+
+    let pkgs = (ls $dist | where name =~ $".*\\.($pkg_ext)")
+    let pkgs = ($pkgs | where name =~ $commit)
+
+    if ($pkgs | is-empty) {
+        print $"No .($pkg_ext) for current commit found."
+        print "Run ./build.sh"
+        return
+    }
+
+    if ($pkgs | length) > 1 {
+        print $"Multiple .($pkg_ext):s for current commit found."
+        print "Make sure there's only one"
+        print ...$pkgs
+        return
+    }
+
+    let pkg = ($pkgs | get 0.name)
+
+    print $"Using ($pkg)"
+
+    print "Building test utils"
+
+    cargo b --release --target $target -p test-runner -p connection-checker
+    cargo b -p test-manager
+
+    let test_manager = $"($env.CARGO_TARGET_DIR)/debug/test-manager"
+    let bin_dir = $"($env.CARGO_TARGET_DIR)/($target)/release/"
+
+    mut args = [
+        --vm $vm
+        --account $account
+        --app-package $pkg
+        --runner-dir $bin_dir
+    ]
+    if $display {
+        $args ++= [--display]
+    }
+    for s in $skip {
+        $args ++= ["--skip" $s]
+    }
+    let args = $args
+
+    print "Running tests"
+    RUST_LOG=debug ^$test_manager run-tests -v ...$args ...$tests
+}
+

tree/.local/nu/readelf.nu

@@ -2,7 +2,7 @@
 
 # Inpect ELF-files
 def elf [
-    elf: string # ELF-file to inspect
+    elf: glob # ELF-file to inspect
     get?: cell-path
 ] {
 	if $get == null {

tree/.local/nu/tailscale.nu

@@ -0,0 +1,71 @@
+# Get networking info about tailscale peers
+def "tailscale peer" [
+	hostname?: string
+	get_field?: cell-path
+]: nothing -> any {
+	let get_field = ($get_field | default ([] | into cell-path))
+
+	let status = (^tailscale status --json | from json)
+
+	let peers = ($status | get Peer)
+
+	if $peers == null {
+		return null
+	}
+
+	let peers = ($peers | transpose key fields | flatten fields)
+
+	let peers = ($peers | each { |peer|
+		let ipv4 = $peer.TailscaleIPs | where { |ip| "." in $ip } | first
+		let ipv6 = $peer.TailscaleIPs | where { |ip| ":" in $ip } | first
+
+		{
+			host: $peer.HostName,
+			ipv4: $ipv4,
+			ipv6: $ipv6,
+			online: $peer.Online,
+			active: $peer.Active,
+			rx: ($peer.RxBytes | into filesize),
+			tx: ($peer.TxBytes | into filesize),
+			dns: ($peer.DNSName),
+		}
+	})
+
+	if $hostname == null {
+		return $peers
+	}
+
+	let peers = ($peers | where host == $hostname)
+	if ($peers | is-empty) {
+		return null
+	}
+
+	$peers | first | get $get_field
+}
+
+# SSH to a tailscale peer
+def "tailscale ssh" [
+	user_hostname: string
+	...ssh_flags: string
+]: nothing -> any {
+	let hostname = ($user_hostname | parse -r "([^@]*@)?(?<hostname>.*)" | get 0.hostname)
+	ssh -o $"HostName (tailscale peer $hostname | get ipv6)" $user_hostname ...$ssh_flags
+}
+
+# SCP to a tailscale peer
+def "tailscale scp" [
+	from: string
+	to: string
+	...ssh_flags: string
+]: nothing -> any {
+
+	let options = (
+		[$from, $to] |
+		parse -r "([^@]*@)?(?<hostname>.*):(?<path>.*)" |
+		each { |it| $"HostName (tailscale peer $it.hostname | get ipv6)" } |
+		each { |option| ["-o", $option] } |
+		flatten
+	)
+
+	scp ...$options $from $to ...$ssh_flags
+}