diff --git a/flake.lock b/flake.lock index 47c7a76..e754b29 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1722320953, - "narHash": "sha256-DfGaJtgrzcwPQYLTvjL1KaVIjpvi85b2MpM6yEGvJzM=", + "lastModified": 1723185066, + "narHash": "sha256-u7guFfIrfspwUp6/SEWCDhs2tVoE1fcgft0Fw7LdNEU=", "owner": "nix-community", "repo": "fenix", - "rev": "483df76def3e5010d709aa3a0418ba2088503994", + "rev": "d5f1b280af93acddbcce948d946bb5db2f8035fe", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1722305447, - "narHash": "sha256-2jG85FHBhKeoF8vNUkCHflrliuC8HCaMOzmERct9imc=", + "lastModified": 1723218034, + "narHash": "sha256-I6hMy00IkfQRcKVFVciHcZcCvuPmdnW/f58Xkstl13Y=", "owner": "helix-editor", "repo": "helix", - "rev": "ce809fb9ef4c5af59b5401419a2e8ae6964c8229", + "rev": "e604d9f8e0fea2223a357be7c9dc6088daef47e7", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1722321190, - "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1722357433, - "narHash": "sha256-bv8oI8t46KXY6elO4n0R9P3SPBLtuJFMYm0oDxLD/90=", - "rev": "97a389b0bee7baf2d445121afa6ec84bef3a4bd7", + "lastModified": 1722484894, + "narHash": "sha256-mmbf3xFov+q8h+44xx3jI/RQnIqhSbVa6ljWYV/jF3c=", + "rev": "a3ab2cc78a736109435f3cc8e1364fcc366c6c97", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/97a389b0bee7baf2d445121afa6ec84bef3a4bd7.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a3ab2cc78a736109435f3cc8e1364fcc366c6c97.tar.gz" }, "original": { "type": "tarball", @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1720695775, - "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=", + "lastModified": 1722485024, + "narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=", "ref": "refs/heads/main", - "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a", - "revCount": 94, + "rev": "e350380d72f94035c309e19fda2fd550f6ab7376", + "revCount": 102, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -205,11 +205,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1722309256, - "narHash": "sha256-Eqlu/hisMWE51b9YeKqehNaHLPhZOmkFkrx+VzI5YcM=", + "lastModified": 1723197662, + "narHash": "sha256-NSvqhZYv0LY2eh0a3yoAvJjGlWeOLSjmPpivSnY9pXg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fcada1050e3820241590679838954bacf7d38f8", + "rev": "0048951e7a3eba3dce8bf6ba893390d29375c5d0", "type": "github" }, "original": { @@ -265,11 +265,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1722262053, - "narHash": "sha256-KxjkPVn9rQqYam6DhiN/V2NcMXtYW25maxkJoiVMpmE=", + "lastModified": 1723124382, + "narHash": "sha256-WdJYEBlc8qsif+y4qnkjaeEpDmOZhz8qA6i/2n1q2kw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a021b85be57d34b1eed687fcafd5d5ec64b2d853", + "rev": "dab022fb3127466e47e29e40769b11174b3e0ac3", "type": "github" }, "original": { diff --git a/modules/desktop-environment/home/terminal.nix b/modules/desktop-environment/home/terminal.nix index ad9f3c8..c8b3b54 100644 --- a/modules/desktop-environment/home/terminal.nix +++ b/modules/desktop-environment/home/terminal.nix @@ -5,6 +5,9 @@ name = "FiraCode Nerd Font"; size = 11; }; + keybindings = { + "ctrl+shift+n" = "new_os_window_with_cwd"; + }; settings = { #adjust_column_width = "70%"; color0 = "#282828"; diff --git a/other/config.nu b/other/config.nu index c735edb..8a95fc7 100644 --- a/other/config.nu +++ b/other/config.nu @@ -335,6 +335,27 @@ $env.config = { ] keybindings: [ + ################################################################################ + # Custom keybinds # + ################################################################################ + { + name: undo_change + modifier: control + keycode: char_z + mode: [vi_normal, vi_insert] + event: [ + { edit: Clear } + { + edit: InsertString + value: "zellij attach main -c" + } + { send: Enter } + ] + } + + ################################################################################ + # Default keybinds # + ################################################################################ { name: completion_menu modifier: none @@ -810,7 +831,7 @@ def start_zellij [] { } } -start_zellij +# start_zellij # plugin add nu_plugin_net # plugin add nu_plugin_gstat @@ -858,6 +879,16 @@ def typed [ mprocs --names Editor,Viewer,Notify $"hx '($name).typ'" $"while true; do mupdf-x11 '($name).pdf' && break; done" $"while inotifywait -e modify '($name).pdf' ; do pkill -HUP mupdf; done" } +def nev [ unit = day ] { + ( ( open Docs/dates.csv + | update datetime {|it| $it.datetime | into datetime } + | first + ).datetime - (date now) + ) + | into duration + | format duration $unit +} + alias gnix = cd ~/nix-configs; alias grepo = cd ~/Documents/repos; alias wh = wormhole-rs; diff --git a/other/scripts/desktop/shell-startup.nu b/other/scripts/desktop/shell-startup.nu index 961f702..8ce5547 100644 --- a/other/scripts/desktop/shell-startup.nu +++ b/other/scripts/desktop/shell-startup.nu @@ -48,7 +48,21 @@ def flag [ def main [] { print (flag $TRANS); - print $"(ansi attr_bold) Hi jade, you're on HRT for ((date now) - ('2024-02-18T20:53' | into datetime) | format duration month)s now!"; + let next_events = open ~/Docs/dates.csv + | update datetime {|ev| $ev.datetime | into datetime } + | sort-by datetime + | first + | each {|ev| $"(ansi attr_bold)($ev.event)(ansi reset) in (ansi attr_bold)(tfmt ($ev.datetime - (date now)))s(ansi reset)" }; + print $"Hi jade, you're on HRT for (ansi reset)(ansi attr_bold)((date now) - ('2024-02-18T20:53' | into datetime) | format duration month)s(ansi reset) now! | Next Event: ($next_events)"; # print (flag $LESBIAN); } +def tfmt [dur: duration] { + if ($dur < 1hr) { + return ($dur | format duration min); + } else if ($dur < 1day) { + return ($dur | format duration hr); + } else { + return ($dur | format duration day); + } +}