Compare commits
68 Commits
9001a8f4bd
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
5e7c193a28
|
|||
|
67f7129dac
|
|||
|
333bd228d4
|
|||
|
5c7e24e645
|
|||
|
4ff5da379c
|
|||
|
53b3e791df
|
|||
|
cf7a36c3ba
|
|||
|
af3ccebaae
|
|||
|
10c12125a3
|
|||
|
6e67fa87bb
|
|||
|
2628308f0b
|
|||
|
bbb7add614
|
|||
|
5b4f97982d
|
|||
| 96f80a024a | |||
| 18a93fe079 | |||
|
8517bc121c
|
|||
|
354a7118de
|
|||
|
d7b18e47b0
|
|||
|
5ae87c8796
|
|||
|
d395cc57c8
|
|||
| c910091882 | |||
|
f51a70d0a3
|
|||
|
98af89fa7d
|
|||
|
952a358d91
|
|||
|
594b3d667b
|
|||
|
e63b1fd2e6
|
|||
|
9661b20ede
|
|||
|
a59d2f6a65
|
|||
|
e10eb03b3d
|
|||
|
5abd83a2e5
|
|||
| b48aa761bb | |||
|
ffb0c2717e
|
|||
|
399ac740fa
|
|||
|
051927907d
|
|||
|
3fd0b5a647
|
|||
|
87b77cd412
|
|||
| 57198f0f77 | |||
|
5fe3c435c5
|
|||
|
7d8410f5ad
|
|||
|
9cb3239cfe
|
|||
|
0a7942333a
|
|||
| db852f5144 | |||
| 79b41aa29f | |||
|
d3cece065e
|
|||
|
979647e7ff
|
|||
|
f01522b313
|
|||
|
f9d5c1f65a
|
|||
|
fa4126ab3d
|
|||
|
a68cd06f99
|
|||
|
78a9b670c1
|
|||
|
2c607a8e74
|
|||
|
7edbac4624
|
|||
|
3ec25cd975
|
|||
|
e0ed6a4de9
|
|||
|
e73ca2721d
|
|||
|
b563afec08
|
|||
|
957d0e91dc
|
|||
|
ceb4fa97d5
|
|||
|
c043f4e9f8
|
|||
|
90d4b80cf9
|
|||
|
d7f7fab0e7
|
|||
|
31f14bf065
|
|||
|
5b7b3ad924
|
|||
|
a411350480
|
|||
| 06affa9723 | |||
| 06257367b8 | |||
| c9a710b86b | |||
| e0d95e3bd0 |
467
manager/Cargo.lock
generated
467
manager/Cargo.lock
generated
@ -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"
|
||||
source = "git+https://git.nubo.sh/hulthe/blueprint.git#974a6e89b2b62cfe97e82d2b128f3f2321995606"
|
||||
version = "0.5.0"
|
||||
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"
|
||||
version = "0.2.6"
|
||||
name = "gimli"
|
||||
version = "0.24.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi 0.10.2+wasi-snapshot-preview1",
|
||||
]
|
||||
checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189"
|
||||
|
||||
[[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"
|
||||
version = "1.4.0"
|
||||
name = "indenter"
|
||||
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"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
@ -343,22 +383,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "0.8.3"
|
||||
name = "miniz_oxide"
|
||||
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 0.11.0+wasi-snapshot-preview1",
|
||||
"windows-sys",
|
||||
"wasi",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[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"
|
||||
version = "1.13.1"
|
||||
name = "object"
|
||||
version = "0.24.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
]
|
||||
checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
|
||||
|
||||
[[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",
|
||||
]
|
||||
|
||||
[[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",
|
||||
"bitflags 2.6.0",
|
||||
]
|
||||
|
||||
[[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"
|
||||
version = "1.4.0"
|
||||
name = "shlex"
|
||||
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"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
|
||||
|
||||
[[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"
|
||||
version = "0.36.1"
|
||||
name = "windows_aarch64_gnullvm"
|
||||
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"
|
||||
dependencies = [
|
||||
"dirs",
|
||||
]
|
||||
checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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::TypeErr
|
||||
.with_location(&cfg.variables_path)
|
||||
.into())
|
||||
}
|
||||
_ => return Err(InnerError::Type.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> {
|
||||
read_to_string("/etc/hostname").await.ok()
|
||||
async fn read_hostname_file() -> eyre::Result<String> {
|
||||
Ok(read_to_string("/etc/hostname").await?)
|
||||
}
|
||||
|
||||
// TODO: should be async
|
||||
fn run_hostname_cmd() -> Option<String> {
|
||||
async fn run_hostname_cmd() -> eyre::Result<String> {
|
||||
Command::new("hostname")
|
||||
.output()
|
||||
.ok()
|
||||
.and_then(|out| from_utf8(&out.stdout).ok().map(str::to_string))
|
||||
.await
|
||||
.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_else(String::new)
|
||||
.unwrap_or(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()
|
||||
}
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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");
|
||||
peek_tree(&cfg).await?;
|
||||
info!("scanning tree");
|
||||
print_variables(&cfg).await?;
|
||||
} else {
|
||||
info!("building tree");
|
||||
build_tree(&cfg).await?;
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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 %}
|
||||
@ -366,6 +369,8 @@ program = "nu"
|
||||
[window]
|
||||
{% if demo %}
|
||||
opacity = 1.0
|
||||
{% elif os == "darwin" %}
|
||||
opacity = 0.95
|
||||
{% else %}
|
||||
opacity = 0.90
|
||||
{% end %}
|
||||
|
||||
220
tree/.config/caelestia/shell.json
Normal file
220
tree/.config/caelestia/shell.json
Normal file
@ -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"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
@ -163,6 +163,15 @@ scale trough {
|
||||
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;
|
||||
}
|
||||
|
||||
@ -40,12 +40,14 @@
|
||||
(speaker)
|
||||
(temperature)
|
||||
(battery)
|
||||
(ram)
|
||||
(box :class "thingy" (systray :orientation "v"))
|
||||
(color_scheme)
|
||||
(xwayland)
|
||||
(kb_layout)
|
||||
(date)
|
||||
(clock)
|
||||
(notifications)
|
||||
(lock)
|
||||
))
|
||||
|
||||
@ -137,6 +139,21 @@
|
||||
(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"
|
||||
@ -175,17 +192,15 @@
|
||||
: "wmutils xwayland start && ${EWW_CMD} update xwayland_on=true"
|
||||
}
|
||||
:hexpand true
|
||||
:class "thingy clickable"
|
||||
(label :text {
|
||||
xwayland_on ? "Xwa" : "Way"
|
||||
})
|
||||
:class {"thingy clickable toggleable" + (xwayland_on ? " on" : "")}
|
||||
(label :text "XWL")
|
||||
))
|
||||
|
||||
(defwidget kb_layout []
|
||||
(button :onclick "niri msg action switch-layout next"
|
||||
(button :onclick "wmutils next-keyboard-layout"
|
||||
:hexpand true
|
||||
:class "thingy clickable"
|
||||
(label :text "KBL")
|
||||
(label :text keyboard_layout)
|
||||
))
|
||||
|
||||
(defwidget date []
|
||||
@ -207,6 +222,14 @@
|
||||
(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"
|
||||
@ -254,6 +277,8 @@
|
||||
(defpoll current_month :interval "60s" "date +%b")
|
||||
(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'}" )
|
||||
|
||||
23
tree/.config/fuzzel/fuzzel.ini
Normal file
23
tree/.config/fuzzel/fuzzel.ini
Normal file
@ -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
|
||||
@ -1,2 +1,4 @@
|
||||
{% if hostname != "pinenote" %}
|
||||
[Settings]
|
||||
gtk-application-prefer-dark-theme = true
|
||||
{% end %}
|
||||
@ -1,2 +1,5 @@
|
||||
{% if hostname != "pinenote" %}
|
||||
[Settings]
|
||||
gtk-application-prefer-dark-theme = true
|
||||
{% end %}
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
theme = "gruvbox"
|
||||
|
||||
[editor]
|
||||
auto-format = true
|
||||
#line-number = "relative"
|
||||
|
||||
[editor.cursor-shape]
|
||||
insert = "bar"
|
||||
normal = "block"
|
||||
select = "underline"
|
||||
21
tree/.config/helix/config.toml.tpl
Normal file
21
tree/.config/helix/config.toml.tpl
Normal file
@ -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
|
||||
@ -1,2 +1,6 @@
|
||||
[[language]]
|
||||
name = "rust"
|
||||
diagnostic-severity = "info" # don't show hints
|
||||
|
||||
[language-server.qmlls]
|
||||
command = "qmlls6"
|
||||
|
||||
|
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 156 KiB |
@ -6,12 +6,10 @@ general {
|
||||
background {
|
||||
monitor =
|
||||
|
||||
{% if hostname == "sputnik" %}
|
||||
# make background transparent, used in combination with screenlock-video
|
||||
color = rgba(00000000)
|
||||
{% else %}
|
||||
#color = rgba(00000000)
|
||||
|
||||
path = ~/.config/wallpapers/6000x3376/akira.jpg
|
||||
{% end %}
|
||||
}
|
||||
|
||||
input-field {
|
||||
@ -53,7 +51,7 @@ input-field {
|
||||
# ferris image in the center
|
||||
image {
|
||||
monitor =
|
||||
path = ~/.config/wallpapers/ferris-stamp.png
|
||||
path = ~/.config/hypr/ferris-stamp.png
|
||||
rounding = 0
|
||||
size = 300
|
||||
position = 0, 0
|
||||
|
||||
@ -5,6 +5,8 @@
|
||||
|
||||
environment {
|
||||
DISPLAY ":0"
|
||||
ELECTRON_OZONE_PLATFORM_HINT "auto"
|
||||
QT_QPA_PLATFORMTHEME "qt5ct"
|
||||
}
|
||||
|
||||
// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
|
||||
@ -19,17 +21,36 @@ input {
|
||||
}
|
||||
|
||||
// Focus windows and outputs automatically when moving the mouse into them.
|
||||
focus-follows-mouse
|
||||
focus-follows-mouse max-scroll-amount="0%"
|
||||
|
||||
{% if hostname == "sputnik" %}
|
||||
tablet {
|
||||
map-to-output "Microstep MSI MAG342CQR DB6H262101804"
|
||||
}
|
||||
{% end %}
|
||||
}
|
||||
|
||||
// https://gdthub.com/YaLTeR/niri/wiki/Configuration:-Outputs
|
||||
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
|
||||
|
||||
output "Microstep MSI MAG342CQR DB6H262101804" {
|
||||
mode "3440x1440@100.000" // TODO: Get cable that supports 144Hz
|
||||
// layout {
|
||||
// gaps 0
|
||||
// }
|
||||
}
|
||||
|
||||
output "eDP-1" {
|
||||
@ -46,7 +67,23 @@ output "DP-2" {
|
||||
// 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
|
||||
@ -73,6 +110,10 @@ layout {
|
||||
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.
|
||||
@ -84,25 +125,11 @@ layout {
|
||||
// active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
|
||||
// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
|
||||
}
|
||||
|
||||
// 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 64
|
||||
// right 64
|
||||
// top 64
|
||||
// bottom 64
|
||||
}
|
||||
}
|
||||
|
||||
spawn-at-startup "hyprpaper"
|
||||
spawn-at-startup "eww" "daemon"
|
||||
spawn-at-startup "eww" "open" "bar0"
|
||||
spawn-at-startup "eww" "open" "bar1"
|
||||
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.
|
||||
@ -228,26 +255,48 @@ vec4 close_color(vec3 coords_geo, vec3 size_geo) {
|
||||
// Find more information on the wiki:
|
||||
// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
|
||||
|
||||
// Work around WezTerm's initial configure bug
|
||||
// by setting an empty default-column-width.
|
||||
window-rule {
|
||||
geometry-corner-radius 16
|
||||
geometry-corner-radius 22
|
||||
clip-to-geometry true
|
||||
}
|
||||
|
||||
// Indicate screencasted windows with red colors.
|
||||
window-rule {
|
||||
// This regular expression is intentionally made as specific as possible,
|
||||
// since this is the default config, and we want no false positives.
|
||||
// You can get away with just app-id="wezterm" if you want.
|
||||
match app-id=r#"^org\.wezfurlong\.wezterm$"#
|
||||
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"
|
||||
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.
|
||||
@ -258,6 +307,18 @@ window-rule {
|
||||
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
|
||||
@ -271,11 +332,13 @@ binds {
|
||||
|
||||
// Mod-Shift-/, which is usually the same as Mod-?,
|
||||
// shows a list of important hotkeys.
|
||||
Mod+Shift+Slash { show-hotkey-overlay; }
|
||||
Mod+Shift+Plus { show-hotkey-overlay; }
|
||||
|
||||
Mod+Return { spawn "alacritty"; }
|
||||
Mod+D { spawn "fuzzel"; }
|
||||
Mod+Plus { spawn "loginctl lock-session"; }
|
||||
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"; }
|
||||
@ -291,6 +354,9 @@ binds {
|
||||
|
||||
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; }
|
||||
@ -332,14 +398,6 @@ binds {
|
||||
Mod+Shift+Ctrl+K { move-column-to-monitor-up; }
|
||||
Mod+Shift+Ctrl+L { move-column-to-monitor-right; }
|
||||
|
||||
// Alternatively, there are commands to move just a single window:
|
||||
// Mod+Shift+Ctrl+Left { move-window-to-monitor-left; }
|
||||
// ...
|
||||
|
||||
// And you can also move a whole workspace to another monitor:
|
||||
// Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; }
|
||||
// ...
|
||||
|
||||
Mod+Page_Down { focus-workspace-down; }
|
||||
Mod+Page_Up { focus-workspace-up; }
|
||||
Mod+U { focus-workspace-down; }
|
||||
@ -349,15 +407,13 @@ binds {
|
||||
Mod+Ctrl+U { move-column-to-workspace-down; }
|
||||
Mod+Ctrl+I { move-column-to-workspace-up; }
|
||||
|
||||
// Alternatively, there are commands to move just a single window:
|
||||
// Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
|
||||
// ...
|
||||
|
||||
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.
|
||||
//
|
||||
@ -425,6 +481,7 @@ binds {
|
||||
|
||||
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; }
|
||||
@ -462,10 +519,23 @@ binds {
|
||||
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; }
|
||||
// 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; }
|
||||
}
|
||||
|
||||
@ -7,22 +7,18 @@
|
||||
# And here is the theme collection
|
||||
# https://github.com/nushell/nu_scripts/tree/main/themes
|
||||
|
||||
|
||||
# Use fish for external completion
|
||||
let fish_completer = {|spans|
|
||||
# if the current command is an alias, get it's expansion
|
||||
let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion)
|
||||
|
||||
# overwrite
|
||||
let spans = (if $expanded_alias != null {
|
||||
# put the first word of the expanded alias first in the span
|
||||
$spans | skip 1 | prepend ($expanded_alias | split row " " | take 1)
|
||||
} else { $spans })
|
||||
|
||||
|
||||
fish --command $'complete "--do-complete=($spans | str join " ")"'
|
||||
| $"value(char tab)description(char newline)" + $in
|
||||
| from tsv --flexible --no-infer
|
||||
fish --command $"complete '--do-complete=($spans | str replace --all "'" "\\'" | str join ' ')'"
|
||||
| from tsv --flexible --noheaders --no-infer
|
||||
| rename value description
|
||||
| update value {|row|
|
||||
let value = $row.value
|
||||
let need_quote = ['\' ',' '[' ']' '(' ')' ' ' '\t' "'" '"' "`"] | any {$in in $value}
|
||||
if ($need_quote and ($value | path exists)) {
|
||||
let expanded_path = if ($value starts-with ~) {$value | path expand --no-symlink} else {$value}
|
||||
$'"($expanded_path | str replace --all "\"" "\\\"")"'
|
||||
} else {$value}
|
||||
}
|
||||
}
|
||||
|
||||
source theme.nu
|
||||
@ -30,6 +26,13 @@ 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.
|
||||
@ -111,8 +114,7 @@ $env.config = {
|
||||
}
|
||||
|
||||
filesize: {
|
||||
metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
|
||||
format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
|
||||
unit: "binary" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
|
||||
}
|
||||
|
||||
cursor_shape: {
|
||||
@ -667,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
|
||||
@ -675,6 +678,10 @@ alias xo = xdg-open
|
||||
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
|
||||
@ -3,43 +3,43 @@
|
||||
# version = 0.83.1
|
||||
|
||||
def create_left_prompt [] {
|
||||
mut home = ""
|
||||
try {
|
||||
if $nu.os-info.name == "windows" {
|
||||
$home = $env.USERPROFILE
|
||||
} else {
|
||||
$home = $env.HOME
|
||||
}
|
||||
}
|
||||
mut home = ""
|
||||
try {
|
||||
if $nu.os-info.name == "windows" {
|
||||
$home = $env.USERPROFILE
|
||||
} else {
|
||||
$home = $env.HOME
|
||||
}
|
||||
}
|
||||
|
||||
let dir = ([
|
||||
($env.PWD | str substring 0..($home | str length) | str replace $home "~"),
|
||||
($env.PWD | str substring ($home | str length)..)
|
||||
] | str join)
|
||||
let dir = ([
|
||||
($env.PWD | str substring 0..($home | str length) | str replace $home "~"),
|
||||
($env.PWD | str substring ($home | str length)..)
|
||||
] | str join)
|
||||
|
||||
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 path_segment = $"($path_color)($dir)"
|
||||
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 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
|
||||
let time_segment = ([
|
||||
(ansi reset)
|
||||
(ansi magenta)
|
||||
(date now | date format '%Y/%m/%d %r')
|
||||
] | str join | str replace --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
|
||||
str replace --all "([AP]M)" $"(ansi magenta_underline)${1}")
|
||||
# create a right prompt in magenta with green separators and am/pm underlined
|
||||
let time_segment = ([
|
||||
(ansi reset)
|
||||
(ansi magenta)
|
||||
(date now | date format '%Y/%m/%d %r')
|
||||
] | str join | str replace --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
|
||||
str replace --all "([AP]M)" $"(ansi magenta_underline)${1}")
|
||||
|
||||
let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
|
||||
(ansi rb)
|
||||
($env.LAST_EXIT_CODE)
|
||||
] | str join)
|
||||
} else { "" }
|
||||
let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
|
||||
(ansi rb)
|
||||
($env.LAST_EXIT_CODE)
|
||||
] | str join)
|
||||
} 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,31 +58,36 @@ $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": {
|
||||
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
|
||||
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
|
||||
}
|
||||
"Path": {
|
||||
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
|
||||
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
|
||||
}
|
||||
"PATH": {
|
||||
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
|
||||
to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
|
||||
}
|
||||
"Path": {
|
||||
from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
|
||||
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 + "/.cargo/bin"),
|
||||
($env.HOME + "/.radicle/bin"),
|
||||
($env.HOME + "/.volta/bin"),
|
||||
($env.HOME + "/.local/bin"),
|
||||
($env.HOME + "/.cargo/bin"),
|
||||
($env.HOME + "/.radicle/bin"),
|
||||
($env.HOME + "/.volta/bin"),
|
||||
($env.HOME + "/.orbstack/bin"), # docker on macos
|
||||
])
|
||||
|
||||
# auto-detect which ssh-agent to use
|
||||
@ -96,7 +101,7 @@ if ("XDG_RUNTIME_DIR" in $env) {
|
||||
|
||||
$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"
|
||||
|
||||
@ -5,60 +5,67 @@ 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
|
||||
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 = {},
|
||||
-- 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 = { 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'
|
||||
})
|
||||
-- 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
|
||||
-- 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
|
||||
vim.g["rust-analyzer-target-test"] = settings
|
||||
|
||||
return settings
|
||||
end,
|
||||
},
|
||||
return settings
|
||||
end,
|
||||
},
|
||||
|
||||
-- DAP configuration
|
||||
dap = {},
|
||||
-- DAP configuration
|
||||
dap = {},
|
||||
}
|
||||
|
||||
|
||||
@ -82,122 +89,125 @@ local language_servers = {
|
||||
"wgsl_analyzer",
|
||||
}
|
||||
require("mason").setup({
|
||||
ui = {
|
||||
icons = {
|
||||
package_installed = "",
|
||||
package_pending = "",
|
||||
package_uninstalled = "",
|
||||
},
|
||||
},
|
||||
ensure_installed = language_servers,
|
||||
ui = {
|
||||
icons = {
|
||||
package_installed = "",
|
||||
package_pending = "",
|
||||
package_uninstalled = "",
|
||||
},
|
||||
},
|
||||
ensure_installed = language_servers,
|
||||
})
|
||||
require("mason-lspconfig").setup_handlers {
|
||||
-- rust_analyzer is managed by rustaceanvim
|
||||
['rust_analyzer'] = function() end
|
||||
require("mason-lspconfig").setup {
|
||||
automatic_enable = {
|
||||
exclude = {
|
||||
-- rust_analyzer is managed by rustaceanvim
|
||||
"rust_analyzer",
|
||||
}
|
||||
}
|
||||
}
|
||||
require("mason-lspconfig").setup()
|
||||
|
||||
local lspconfig = require("lspconfig")
|
||||
for _,l in pairs(language_servers) do
|
||||
for _, l in pairs(language_servers) do
|
||||
lspconfig[l].setup {}
|
||||
end
|
||||
|
||||
require('dapui').setup();
|
||||
|
||||
local compare = require "cmp.config.compare"
|
||||
require('cmp').setup.filetype({ "rust" }, {
|
||||
sorting = {
|
||||
priority_weight = 2,
|
||||
comparators = {
|
||||
-- deprioritize `.box`, `.mut`, etc.
|
||||
require("cmp-rust").deprioritize_postfix,
|
||||
-- deprioritize `Borrow::borrow` and `BorrowMut::borrow_mut`
|
||||
require("cmp-rust").deprioritize_borrow,
|
||||
-- deprioritize `Deref::deref` and `DerefMut::deref_mut`
|
||||
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,
|
||||
},
|
||||
},
|
||||
sorting = {
|
||||
priority_weight = 2,
|
||||
comparators = {
|
||||
-- deprioritize `.box`, `.mut`, etc.
|
||||
require("cmp-rust").deprioritize_postfix,
|
||||
-- deprioritize `Borrow::borrow` and `BorrowMut::borrow_mut`
|
||||
require("cmp-rust").deprioritize_borrow,
|
||||
-- deprioritize `Deref::deref` and `DerefMut::deref_mut`
|
||||
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,
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
require("todo-comments").setup()
|
||||
|
||||
-- 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
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
-- Add tab support
|
||||
['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
||||
['<Tab>'] = cmp.mapping.select_next_item(),
|
||||
['<C-S-f>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.close(),
|
||||
['<CR>'] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
})
|
||||
},
|
||||
-- Installed sources:
|
||||
sources = {
|
||||
{ name = 'path' }, -- file paths
|
||||
{ name = 'nvim_lsp', keyword_length = 3 }, -- from language server
|
||||
{ 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 = 'buffer', keyword_length = 2 }, -- source current buffer
|
||||
{ name = 'vsnip', keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
||||
{ name = 'calc'}, -- source for math calculation
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
formatting = {
|
||||
fields = {'menu', 'abbr', 'kind'},
|
||||
format = function(entry, item)
|
||||
local menu_icon ={
|
||||
nvim_lsp = 'λ',
|
||||
vsnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '🖫',
|
||||
}
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
-- Enable LSP snippets
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
-- Add tab support
|
||||
['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
||||
['<Tab>'] = cmp.mapping.select_next_item(),
|
||||
['<C-S-f>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.close(),
|
||||
['<CR>'] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
})
|
||||
},
|
||||
-- Installed sources:
|
||||
sources = {
|
||||
{ name = 'path' }, -- file paths
|
||||
{ name = 'nvim_lsp', keyword_length = 3 }, -- from language server
|
||||
{ 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 = 'buffer', keyword_length = 2 }, -- source current buffer
|
||||
{ name = 'vsnip', keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
||||
{ name = 'calc' }, -- source for math calculation
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
formatting = {
|
||||
fields = { 'menu', 'abbr', 'kind' },
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = 'λ',
|
||||
vsnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '🖫',
|
||||
}
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
-- Treesitter Plugin Setup
|
||||
require('nvim-treesitter.configs').setup {
|
||||
ensure_installed = { "lua", "rust", "toml" },
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting=false,
|
||||
},
|
||||
ident = { enable = true },
|
||||
rainbow = {
|
||||
enable = true,
|
||||
extended_mode = true,
|
||||
max_file_lines = nil,
|
||||
}
|
||||
ensure_installed = { "lua", "rust", "toml" },
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
ident = { enable = true },
|
||||
rainbow = {
|
||||
enable = true,
|
||||
extended_mode = true,
|
||||
max_file_lines = nil,
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,115 +4,115 @@ local codelldb_bin = "/usr/bin/codelldb"
|
||||
|
||||
-- Rust, C++, C
|
||||
dap.adapters.codelldb = {
|
||||
type = 'server',
|
||||
port = "${port}",
|
||||
executable = {
|
||||
command = codelldb_bin,
|
||||
args = {"--port", "${port}"},
|
||||
}
|
||||
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
|
||||
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()
|
||||
{
|
||||
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,
|
||||
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",
|
||||
},
|
||||
},
|
||||
-- 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,
|
||||
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
|
||||
|
||||
@ -1,47 +1,132 @@
|
||||
local telescope = require('telescope.builtin')
|
||||
local wk = require('which-key')
|
||||
local harpoon = require("harpoon")
|
||||
local telescope_conf = require("telescope.config").values
|
||||
harpoon:setup()
|
||||
|
||||
vim.keymap.set('n', '<leader>f', telescope.find_files, { desc = "File picker" })
|
||||
vim.keymap.set('n', '<leader>g', telescope.live_grep, { desc = "Grep recursively" })
|
||||
vim.keymap.set('n', '<leader>b', telescope.buffers, { desc = "Buffer picker" })
|
||||
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)
|
||||
|
||||
|
||||
-- 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', {}),
|
||||
callback = function(ev)
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
|
||||
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
|
||||
callback = function(ev)
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
|
||||
|
||||
-- Buffer local mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
vim.keymap.set('n', '<leader>ld', telescope.lsp_definitions, { desc = "Show definitons", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>lr', telescope.lsp_references, { desc = "Show references", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>li', telescope.lsp_implementations, { desc = "Show implementations", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>lt', telescope.lsp_type_definitions, { desc = "Show type definitions", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>le', telescope.diagnostics, { desc = "Show diagnostics", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>ls', telescope.lsp_workspace_symbols, { desc = "Show workspace symbols", buffer = ev.buf })
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = ev.buf })
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, { buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, { desc = "Add workspace folder", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, { desc = "Remove workspace folder", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>wl', function()
|
||||
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 })
|
||||
-- Buffer local mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
vim.keymap.set('n', '<leader>ld', telescope.lsp_definitions, { desc = "Show definitons", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>lr', telescope.lsp_references, { desc = "Show references", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>li', telescope.lsp_implementations,
|
||||
{ desc = "Show implementations", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>lt', telescope.lsp_type_definitions,
|
||||
{ desc = "Show type definitions", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>le', telescope.diagnostics, { desc = "Show diagnostics", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>ls', telescope.lsp_workspace_symbols,
|
||||
{ desc = "Show workspace symbols", buffer = ev.buf })
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = ev.buf })
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, { buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder,
|
||||
{ desc = "Add workspace folder", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder,
|
||||
{ desc = "Remove workspace folder", buffer = ev.buf })
|
||||
vim.keymap.set('n', '<leader>wl', function()
|
||||
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,
|
||||
wk.add({
|
||||
{ "<leader>l", desc = "Language server stuff" },
|
||||
{ "<leader>w", desc = "Workspace stuff" },
|
||||
})
|
||||
end,
|
||||
})
|
||||
|
||||
--local rust_tools = require("rust-tools")
|
||||
|
||||
@ -1,16 +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
|
||||
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)
|
||||
|
||||
@ -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.number = true -- bool: Show line numbers
|
||||
opt.relativenumber = true -- bool: Show relative line numbers
|
||||
opt.scrolloff = 10 -- int: Min num lines of context
|
||||
opt.signcolumn = "yes" -- str: Show the sign column
|
||||
opt.colorcolumn = '100' -- str: Show col for max line length
|
||||
opt.number = true -- bool: Show line numbers
|
||||
opt.relativenumber = true -- bool: Show relative line numbers
|
||||
opt.scrolloff = 10 -- int: Min num lines of context
|
||||
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
|
||||
vim.filetype.add({extension = {wgsl = "wgsl"}})
|
||||
vim.filetype.add({ extension = { wgsl = "wgsl" } })
|
||||
|
||||
-- [[ Theme ]]
|
||||
opt.syntax = "ON" -- str: Allow syntax highlighting
|
||||
opt.termguicolors = true -- bool: If term supports ui color then enable
|
||||
opt.syntax = "ON" -- str: Allow syntax highlighting
|
||||
opt.termguicolors = true -- bool: If term supports ui color then enable
|
||||
|
||||
-- [[ Search ]]
|
||||
opt.ignorecase = true -- bool: Ignore case in search patterns
|
||||
opt.smartcase = true -- bool: Override ignorecase if search contains capitals
|
||||
opt.incsearch = true -- bool: Use incremental search
|
||||
opt.hlsearch = false -- bool: Highlight search matches
|
||||
opt.ignorecase = true -- bool: Ignore case in search patterns
|
||||
opt.smartcase = true -- bool: Override ignorecase if search contains capitals
|
||||
opt.incsearch = true -- bool: Use incremental search
|
||||
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.softtabstop = 4 -- num: Number of spaces tabs count for in insert mode
|
||||
opt.tabstop = 4 -- num: Number of spaces tabs count for
|
||||
opt.list = true -- show some whitespace
|
||||
opt.shiftwidth = 4 -- num: Size of an indent
|
||||
opt.softtabstop = 4 -- num: Number of spaces tabs count for in insert mode
|
||||
opt.tabstop = 4 -- num: Number of spaces tabs count for
|
||||
opt.list = true -- show some whitespace
|
||||
|
||||
-- [[ Splits ]]
|
||||
opt.splitright = true -- bool: Place new window to right of current one
|
||||
opt.splitbelow = true -- bool: Place new window below the 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
|
||||
|
||||
--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.shortmess = vim.opt.shortmess + { c = true}
|
||||
vim.opt.completeopt = { 'menuone', 'noselect', 'noinsert' }
|
||||
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()'
|
||||
|
||||
|
||||
@ -1,70 +1,122 @@
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
-- install plugins
|
||||
{ 'nvim-treesitter/nvim-treesitter' },
|
||||
{ 'ellisonleao/gruvbox.nvim' },
|
||||
{ 'danilamihailov/beacon.nvim' },
|
||||
{ 'nvim-lua/plenary.nvim' },
|
||||
{
|
||||
'folke/todo-comments.nvim',
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
},
|
||||
{
|
||||
"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' },
|
||||
spec = {
|
||||
-- install plugins
|
||||
{ 'nvim-treesitter/nvim-treesitter' },
|
||||
{ '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" },
|
||||
},
|
||||
},
|
||||
|
||||
-- -- language server stuff
|
||||
{ 'williamboman/mason.nvim' },
|
||||
{ 'williamboman/mason-lspconfig.nvim' },
|
||||
{ 'neovim/nvim-lspconfig' },
|
||||
{
|
||||
'mrcjkb/rustaceanvim',
|
||||
version = '^4',
|
||||
lazy = false, -- This plugin is already lazy
|
||||
},
|
||||
{ 'mfussenegger/nvim-dap' },
|
||||
-- -- language server stuff
|
||||
{ 'williamboman/mason.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' },
|
||||
|
||||
-- -- nushell support
|
||||
-- --use { 'LhKipp/nvim-nu', run = function() vim.fn[':TSInstall nu'] end} }
|
||||
{ 'LhKipp/nvim-nu' },
|
||||
-- -- nushell support
|
||||
-- --use { 'LhKipp/nvim-nu', run = function() vim.fn[':TSInstall nu'] end} }
|
||||
{ 'LhKipp/nvim-nu' },
|
||||
|
||||
-- -- Completion framework:
|
||||
{ 'hrsh7th/nvim-cmp' },
|
||||
-- -- Completion framework:
|
||||
{ 'hrsh7th/nvim-cmp' },
|
||||
|
||||
-- -- LSP completion source:
|
||||
{ 'hrsh7th/cmp-nvim-lsp' },
|
||||
-- -- LSP completion source:
|
||||
{ 'hrsh7th/cmp-nvim-lsp' },
|
||||
|
||||
-- -- Useful completion sources:
|
||||
{ 'hrsh7th/cmp-nvim-lua' },
|
||||
{ 'hrsh7th/cmp-nvim-lsp-signature-help' },
|
||||
{ 'hrsh7th/cmp-vsnip' },
|
||||
{ 'hrsh7th/cmp-path' },
|
||||
{ 'hrsh7th/cmp-buffer' },
|
||||
{ 'hrsh7th/vim-vsnip' },
|
||||
{ 'ryo33/nvim-cmp-rust' },
|
||||
-- -- Useful completion sources:
|
||||
{ 'hrsh7th/cmp-nvim-lua' },
|
||||
{ 'hrsh7th/cmp-nvim-lsp-signature-help' },
|
||||
{ 'hrsh7th/cmp-vsnip' },
|
||||
{ 'hrsh7th/cmp-path' },
|
||||
{ 'hrsh7th/cmp-buffer' },
|
||||
{ 'hrsh7th/vim-vsnip' },
|
||||
{ 'ryo33/nvim-cmp-rust' },
|
||||
|
||||
{ 'nvim-telescope/telescope.nvim', branch = '0.1.x',
|
||||
dependencies = { 'nvim-lua/plenary.nvim' }
|
||||
},
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
branch = '0.1.x',
|
||||
dependencies = { 'nvim-lua/plenary.nvim' }
|
||||
},
|
||||
{
|
||||
"ThePrimeagen/harpoon",
|
||||
branch = "harpoon2",
|
||||
dependencies = { "nvim-lua/plenary.nvim" }
|
||||
},
|
||||
|
||||
-- -- status line
|
||||
{ 'linrongbin16/lsp-progress.nvim' },
|
||||
{ 'nvim-lualine/lualine.nvim' },
|
||||
},
|
||||
-- Configure any other settings here. See the documentation for more details.
|
||||
-- colorscheme that will be used when installing plugins.
|
||||
install = { colorscheme = { "habamax" } },
|
||||
-- automatically check for plugin updates
|
||||
checker = { enabled = true },
|
||||
-- -- status line
|
||||
{ 'linrongbin16/lsp-progress.nvim' },
|
||||
{ 'nvim-lualine/lualine.nvim' },
|
||||
},
|
||||
-- Configure any other settings here. See the documentation for more details.
|
||||
-- colorscheme that will be used when installing plugins.
|
||||
install = { colorscheme = { "habamax" } },
|
||||
-- automatically check for plugin updates
|
||||
checker = {
|
||||
enabled = true,
|
||||
notify = false,
|
||||
},
|
||||
})
|
||||
|
||||
@ -1,139 +1,139 @@
|
||||
return {
|
||||
braille = { "⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷" },
|
||||
triangles = { "◢", "◣", "◤", "◥" },
|
||||
dwarf_fortress = {
|
||||
" ██████£££ ",
|
||||
"☺██████£££ ",
|
||||
"☺██████£££ ",
|
||||
"☺▓█████£££ ",
|
||||
"☺▓█████£££ ",
|
||||
"☺▒█████£££ ",
|
||||
"☺▒█████£££ ",
|
||||
"☺░█████£££ ",
|
||||
"☺░█████£££ ",
|
||||
"☺ █████£££ ",
|
||||
" ☺█████£££ ",
|
||||
" ☺█████£££ ",
|
||||
" ☺▓████£££ ",
|
||||
" ☺▓████£££ ",
|
||||
" ☺▒████£££ ",
|
||||
" ☺▒████£££ ",
|
||||
" ☺░████£££ ",
|
||||
" ☺░████£££ ",
|
||||
" ☺ ████£££ ",
|
||||
" ☺████£££ ",
|
||||
" ☺████£££ ",
|
||||
" ☺▓███£££ ",
|
||||
" ☺▓███£££ ",
|
||||
" ☺▒███£££ ",
|
||||
" ☺▒███£££ ",
|
||||
" ☺░███£££ ",
|
||||
" ☺░███£££ ",
|
||||
" ☺ ███£££ ",
|
||||
" ☺███£££ ",
|
||||
" ☺███£££ ",
|
||||
" ☺▓██£££ ",
|
||||
" ☺▓██£££ ",
|
||||
" ☺▒██£££ ",
|
||||
" ☺▒██£££ ",
|
||||
" ☺░██£££ ",
|
||||
" ☺░██£££ ",
|
||||
" ☺ ██£££ ",
|
||||
" ☺██£££ ",
|
||||
" ☺██£££ ",
|
||||
" ☺▓█£££ ",
|
||||
" ☺▓█£££ ",
|
||||
" ☺▒█£££ ",
|
||||
" ☺▒█£££ ",
|
||||
" ☺░█£££ ",
|
||||
" ☺░█£££ ",
|
||||
" ☺ █£££ ",
|
||||
" ☺█£££ ",
|
||||
" ☺█£££ ",
|
||||
" ☺▓£££ ",
|
||||
" ☺▓£££ ",
|
||||
" ☺▒£££ ",
|
||||
" ☺▒£££ ",
|
||||
" ☺░£££ ",
|
||||
" ☺░£££ ",
|
||||
" ☺ £££ ",
|
||||
" ☺£££ ",
|
||||
" ☺£££ ",
|
||||
" ☺▓££ ",
|
||||
" ☺▓££ ",
|
||||
" ☺▒££ ",
|
||||
" ☺▒££ ",
|
||||
" ☺░££ ",
|
||||
" ☺░££ ",
|
||||
" ☺ ££ ",
|
||||
" ☺££ ",
|
||||
" ☺££ ",
|
||||
" ☺▓£ ",
|
||||
" ☺▓£ ",
|
||||
" ☺▒£ ",
|
||||
" ☺▒£ ",
|
||||
" ☺░£ ",
|
||||
" ☺░£ ",
|
||||
" ☺ £ ",
|
||||
" ☺£ ",
|
||||
" ☺£ ",
|
||||
" ☺▓ ",
|
||||
" ☺▓ ",
|
||||
" ☺▒ ",
|
||||
" ☺▒ ",
|
||||
" ☺░ ",
|
||||
" ☺░ ",
|
||||
" ☺ ",
|
||||
" ☺ &",
|
||||
" ☺ ☼&",
|
||||
" ☺ ☼ &",
|
||||
" ☺☼ &",
|
||||
" ☺☼ & ",
|
||||
" ‼ & ",
|
||||
" ☺ & ",
|
||||
" ‼ & ",
|
||||
" ☺ & ",
|
||||
" ‼ & ",
|
||||
" ☺ & ",
|
||||
"‼ & ",
|
||||
" & ",
|
||||
" & ",
|
||||
" & ░ ",
|
||||
" & ▒ ",
|
||||
" & ▓ ",
|
||||
" & £ ",
|
||||
" & ░£ ",
|
||||
" & ▒£ ",
|
||||
" & ▓£ ",
|
||||
" & ££ ",
|
||||
" & ░££ ",
|
||||
" & ▒££ ",
|
||||
"& ▓££ ",
|
||||
"& £££ ",
|
||||
" ░£££ ",
|
||||
" ▒£££ ",
|
||||
" ▓£££ ",
|
||||
" █£££ ",
|
||||
" ░█£££ ",
|
||||
" ▒█£££ ",
|
||||
" ▓█£££ ",
|
||||
" ██£££ ",
|
||||
" ░██£££ ",
|
||||
" ▒██£££ ",
|
||||
" ▓██£££ ",
|
||||
" ███£££ ",
|
||||
" ░███£££ ",
|
||||
" ▒███£££ ",
|
||||
" ▓███£££ ",
|
||||
" ████£££ ",
|
||||
" ░████£££ ",
|
||||
" ▒████£££ ",
|
||||
" ▓████£££ ",
|
||||
" █████£££ ",
|
||||
" ░█████£££ ",
|
||||
" ▒█████£££ ",
|
||||
" ▓█████£££ ",
|
||||
" ██████£££ ",
|
||||
" ██████£££ ",
|
||||
},
|
||||
braille = { "⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷" },
|
||||
triangles = { "◢", "◣", "◤", "◥" },
|
||||
dwarf_fortress = {
|
||||
" ██████£££ ",
|
||||
"☺██████£££ ",
|
||||
"☺██████£££ ",
|
||||
"☺▓█████£££ ",
|
||||
"☺▓█████£££ ",
|
||||
"☺▒█████£££ ",
|
||||
"☺▒█████£££ ",
|
||||
"☺░█████£££ ",
|
||||
"☺░█████£££ ",
|
||||
"☺ █████£££ ",
|
||||
" ☺█████£££ ",
|
||||
" ☺█████£££ ",
|
||||
" ☺▓████£££ ",
|
||||
" ☺▓████£££ ",
|
||||
" ☺▒████£££ ",
|
||||
" ☺▒████£££ ",
|
||||
" ☺░████£££ ",
|
||||
" ☺░████£££ ",
|
||||
" ☺ ████£££ ",
|
||||
" ☺████£££ ",
|
||||
" ☺████£££ ",
|
||||
" ☺▓███£££ ",
|
||||
" ☺▓███£££ ",
|
||||
" ☺▒███£££ ",
|
||||
" ☺▒███£££ ",
|
||||
" ☺░███£££ ",
|
||||
" ☺░███£££ ",
|
||||
" ☺ ███£££ ",
|
||||
" ☺███£££ ",
|
||||
" ☺███£££ ",
|
||||
" ☺▓██£££ ",
|
||||
" ☺▓██£££ ",
|
||||
" ☺▒██£££ ",
|
||||
" ☺▒██£££ ",
|
||||
" ☺░██£££ ",
|
||||
" ☺░██£££ ",
|
||||
" ☺ ██£££ ",
|
||||
" ☺██£££ ",
|
||||
" ☺██£££ ",
|
||||
" ☺▓█£££ ",
|
||||
" ☺▓█£££ ",
|
||||
" ☺▒█£££ ",
|
||||
" ☺▒█£££ ",
|
||||
" ☺░█£££ ",
|
||||
" ☺░█£££ ",
|
||||
" ☺ █£££ ",
|
||||
" ☺█£££ ",
|
||||
" ☺█£££ ",
|
||||
" ☺▓£££ ",
|
||||
" ☺▓£££ ",
|
||||
" ☺▒£££ ",
|
||||
" ☺▒£££ ",
|
||||
" ☺░£££ ",
|
||||
" ☺░£££ ",
|
||||
" ☺ £££ ",
|
||||
" ☺£££ ",
|
||||
" ☺£££ ",
|
||||
" ☺▓££ ",
|
||||
" ☺▓££ ",
|
||||
" ☺▒££ ",
|
||||
" ☺▒££ ",
|
||||
" ☺░££ ",
|
||||
" ☺░££ ",
|
||||
" ☺ ££ ",
|
||||
" ☺££ ",
|
||||
" ☺££ ",
|
||||
" ☺▓£ ",
|
||||
" ☺▓£ ",
|
||||
" ☺▒£ ",
|
||||
" ☺▒£ ",
|
||||
" ☺░£ ",
|
||||
" ☺░£ ",
|
||||
" ☺ £ ",
|
||||
" ☺£ ",
|
||||
" ☺£ ",
|
||||
" ☺▓ ",
|
||||
" ☺▓ ",
|
||||
" ☺▒ ",
|
||||
" ☺▒ ",
|
||||
" ☺░ ",
|
||||
" ☺░ ",
|
||||
" ☺ ",
|
||||
" ☺ &",
|
||||
" ☺ ☼&",
|
||||
" ☺ ☼ &",
|
||||
" ☺☼ &",
|
||||
" ☺☼ & ",
|
||||
" ‼ & ",
|
||||
" ☺ & ",
|
||||
" ‼ & ",
|
||||
" ☺ & ",
|
||||
" ‼ & ",
|
||||
" ☺ & ",
|
||||
"‼ & ",
|
||||
" & ",
|
||||
" & ",
|
||||
" & ░ ",
|
||||
" & ▒ ",
|
||||
" & ▓ ",
|
||||
" & £ ",
|
||||
" & ░£ ",
|
||||
" & ▒£ ",
|
||||
" & ▓£ ",
|
||||
" & ££ ",
|
||||
" & ░££ ",
|
||||
" & ▒££ ",
|
||||
"& ▓££ ",
|
||||
"& £££ ",
|
||||
" ░£££ ",
|
||||
" ▒£££ ",
|
||||
" ▓£££ ",
|
||||
" █£££ ",
|
||||
" ░█£££ ",
|
||||
" ▒█£££ ",
|
||||
" ▓█£££ ",
|
||||
" ██£££ ",
|
||||
" ░██£££ ",
|
||||
" ▒██£££ ",
|
||||
" ▓██£££ ",
|
||||
" ███£££ ",
|
||||
" ░███£££ ",
|
||||
" ▒███£££ ",
|
||||
" ▓███£££ ",
|
||||
" ████£££ ",
|
||||
" ░████£££ ",
|
||||
" ▒████£££ ",
|
||||
" ▓████£££ ",
|
||||
" █████£££ ",
|
||||
" ░█████£££ ",
|
||||
" ▒█████£££ ",
|
||||
" ▓█████£££ ",
|
||||
" ██████£££ ",
|
||||
" ██████£££ ",
|
||||
},
|
||||
}
|
||||
|
||||
@ -1,58 +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,
|
||||
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 = {
|
||||
icons_enabled = true,
|
||||
theme = 'auto',
|
||||
component_separators = { left = '', right = ''},
|
||||
section_separators = { left = '', right = ''},
|
||||
disabled_filetypes = {
|
||||
statusline = {},
|
||||
winbar = {},
|
||||
},
|
||||
ignore_focus = {},
|
||||
always_divide_middle = true,
|
||||
globalstatus = false,
|
||||
refresh = {
|
||||
statusline = 200,
|
||||
tabline = 1000,
|
||||
winbar = 1000,
|
||||
}
|
||||
},
|
||||
sections = {
|
||||
lualine_a = {'mode'},
|
||||
lualine_b = {'branch', 'diff', 'diagnostics'},
|
||||
lualine_c = {'filename'},
|
||||
lualine_x = {
|
||||
function()
|
||||
return require('lsp-progress').progress()
|
||||
end
|
||||
},
|
||||
lualine_y = {'encoding', 'fileformat', 'filetype'},
|
||||
lualine_z = {'location'}
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = {},
|
||||
lualine_b = {},
|
||||
lualine_c = {'filename'},
|
||||
lualine_x = {'location'},
|
||||
lualine_y = {},
|
||||
lualine_z = {}
|
||||
},
|
||||
tabline = {},
|
||||
winbar = {},
|
||||
inactive_winbar = {},
|
||||
extensions = {}
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
theme = 'auto',
|
||||
component_separators = { left = '', right = '' },
|
||||
section_separators = { left = '', right = '' },
|
||||
disabled_filetypes = {
|
||||
statusline = {},
|
||||
winbar = {},
|
||||
},
|
||||
ignore_focus = {},
|
||||
always_divide_middle = true,
|
||||
globalstatus = false,
|
||||
refresh = {
|
||||
statusline = 200,
|
||||
tabline = 1000,
|
||||
winbar = 1000,
|
||||
}
|
||||
},
|
||||
sections = {
|
||||
lualine_a = { 'mode' },
|
||||
lualine_b = { 'branch', 'diff', 'diagnostics' },
|
||||
lualine_c = { 'filename' },
|
||||
lualine_x = {
|
||||
function()
|
||||
return require('lsp-progress').progress()
|
||||
end
|
||||
},
|
||||
lualine_y = { 'encoding', 'fileformat', 'filetype' },
|
||||
lualine_z = { 'location' }
|
||||
},
|
||||
inactive_sections = {
|
||||
lualine_a = {},
|
||||
lualine_b = {},
|
||||
lualine_c = { 'filename' },
|
||||
lualine_x = { 'location' },
|
||||
lualine_y = {},
|
||||
lualine_z = {}
|
||||
},
|
||||
tabline = {},
|
||||
winbar = {},
|
||||
inactive_winbar = {},
|
||||
extensions = {}
|
||||
}
|
||||
|
||||
@ -1,28 +1,28 @@
|
||||
-- setup must be called before loading the colorscheme
|
||||
-- Default options:
|
||||
require("gruvbox").setup({
|
||||
terminal_colors = true, -- add neovim terminal colors
|
||||
undercurl = true,
|
||||
underline = true,
|
||||
bold = true,
|
||||
italic = {
|
||||
strings = true,
|
||||
emphasis = true,
|
||||
comments = true,
|
||||
operators = false,
|
||||
folds = true,
|
||||
},
|
||||
strikethrough = true,
|
||||
invert_selection = false,
|
||||
invert_signs = false,
|
||||
invert_tabline = false,
|
||||
invert_intend_guides = false,
|
||||
inverse = true, -- invert background for search, diffs, statuslines and errors
|
||||
contrast = "", -- can be "hard", "soft" or empty string
|
||||
palette_overrides = {},
|
||||
overrides = {},
|
||||
dim_inactive = false,
|
||||
transparent_mode = true,
|
||||
terminal_colors = true, -- add neovim terminal colors
|
||||
undercurl = true,
|
||||
underline = true,
|
||||
bold = true,
|
||||
italic = {
|
||||
strings = true,
|
||||
emphasis = true,
|
||||
comments = true,
|
||||
operators = false,
|
||||
folds = true,
|
||||
},
|
||||
strikethrough = true,
|
||||
invert_selection = false,
|
||||
invert_signs = false,
|
||||
invert_tabline = false,
|
||||
invert_intend_guides = false,
|
||||
inverse = true, -- invert background for search, diffs, statuslines and errors
|
||||
contrast = "", -- can be "hard", "soft" or empty string
|
||||
palette_overrides = {},
|
||||
overrides = {},
|
||||
dim_inactive = false,
|
||||
transparent_mode = not vim.g.neovide,
|
||||
})
|
||||
|
||||
require('color-scheme')
|
||||
|
||||
@ -19,20 +19,20 @@ format = "[$hostname]($style) in "
|
||||
disabled = true
|
||||
{% end %}
|
||||
|
||||
[custom.stl]
|
||||
description = "time logger"
|
||||
when = "stl stat -f /home/hulthe/.stld" # touch the file, but don't create it
|
||||
command = "cat /home/hulthe/.stld"
|
||||
symbol = "🕑"
|
||||
style = "italic bright-purple"
|
||||
format = "[$symbol ($output )]($style)"
|
||||
#[custom.stl]
|
||||
#description = "time logger"
|
||||
#when = "stl stat -f /home/hulthe/.stld" # touch the file, but don't create it
|
||||
#command = "cat /home/hulthe/.stld"
|
||||
#symbol = "🕑"
|
||||
#style = "italic bright-purple"
|
||||
#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
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{% if hostname == "sputnik" %}
|
||||
lock '$HOME/.local/bin/screenlock-video'
|
||||
lock '$HOME/.local/bin/screenlock'
|
||||
{% else %}
|
||||
lock '$HOME/.local/bin/screenlock'
|
||||
{% end %}
|
||||
|
||||
99
tree/.config/swaync/config.json
Normal file
99
tree/.config/swaync/config.json
Normal file
@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
307
tree/.config/swaync/style.css
Normal file
307
tree/.config/swaync/style.css
Normal file
@ -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;
|
||||
}
|
||||
44
tree/.face
Normal file
44
tree/.face
Normal file
@ -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>
|
||||
|
After Width: | Height: | Size: 3.9 KiB |
@ -12,7 +12,7 @@
|
||||
rebase = true
|
||||
|
||||
[core]
|
||||
editor = nvim
|
||||
editor = helix
|
||||
|
||||
[init]
|
||||
defaultBranch = master
|
||||
|
||||
@ -14,8 +14,8 @@ sudo pacman --needed -S \
|
||||
brightnessctl \
|
||||
curl \
|
||||
difftastic \
|
||||
dunst \
|
||||
dust \
|
||||
ddcutil \
|
||||
exa \
|
||||
fd \
|
||||
fish \
|
||||
@ -27,7 +27,10 @@ sudo pacman --needed -S \
|
||||
htop \
|
||||
hyprland \
|
||||
hyprpaper \
|
||||
i2c-tools \
|
||||
lazygit \
|
||||
luarocks \
|
||||
man-db man-pages \
|
||||
neovim \
|
||||
nerd-fonts \
|
||||
niri \
|
||||
@ -37,6 +40,7 @@ sudo pacman --needed -S \
|
||||
nushell \
|
||||
openbsd-netcat \
|
||||
pamixer \
|
||||
qt5ct \
|
||||
qt5-wayland \
|
||||
qt6-wayland \
|
||||
ripgrep \
|
||||
@ -45,6 +49,7 @@ sudo pacman --needed -S \
|
||||
starship \
|
||||
swayidle \
|
||||
swaylock \
|
||||
swaync \
|
||||
tig \
|
||||
tree-sitter tree-sitter-cli \
|
||||
vim \
|
||||
|
||||
@ -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"
|
||||
|
||||
53
tree/.local/bin/mullpod
Executable file
53
tree/.local/bin/mullpod
Executable file
@ -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
|
||||
@ -9,4 +9,4 @@ if ps -e | grep " $LOCKPROG\$"
|
||||
exit 1
|
||||
end
|
||||
|
||||
$LOCKPROG $argv
|
||||
ba $LOCKPROG $argv
|
||||
|
||||
23
tree/.local/nu/macos.nu
Normal file
23
tree/.local/nu/macos.nu
Normal file
@ -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
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
|
||||
|
||||
@ -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 {
|
||||
|
||||
71
tree/.local/nu/tailscale.nu
Normal file
71
tree/.local/nu/tailscale.nu
Normal file
@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user