diff --git a/build-utils/templ-edit.nu b/build-utils/templ-edit.nu index e38fc89..34a1ff8 100755 --- a/build-utils/templ-edit.nu +++ b/build-utils/templ-edit.nu @@ -8,10 +8,11 @@ def "main find" [ open $file --raw | lines | enumerate - | update item {|it| $it.item | parse '{current}#:{name}:-{template}-:#' } - | filter {|it| $it.item | is-not-empty} + | update item {|it| $it.item | parse '{current}# :{name}:-{template}-:#' } + | where {|it| $it.item | is-not-empty } | flatten -a | rename -c { index: line } + | to json } # TODO: support mroe then single template @@ -22,11 +23,12 @@ def "main edit" [ --preview ] { let template = main find $file + | from json | where name == $name | first; let new = $template.template | str replace $"%($name)%" $to - | append $" #:($template.name):-($template.template)-:#" + | append $" # :($template.name):-($template.template)-:#" | str join; let rest = open $file --raw | lines diff --git a/common.nix b/common.nix index 7d6e511..266ede4 100644 --- a/common.nix +++ b/common.nix @@ -105,6 +105,14 @@ with builtins; bluetooth.enable = true; }; + services.chrony = { + enable = true; + enableNTS = true; + serverOption = "offline"; + extraFlags = [ "-s" ]; + extraConfig = "makestep 1 -1"; + }; + security.rtkit.enable = true; users.users.jade = { diff --git a/flake.lock b/flake.lock index 793fa8f..e6cf851 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "crane": { "locked": { - "lastModified": 1755993354, - "narHash": "sha256-FCRRAzSaL/+umLIm3RU3O/+fJ2ssaPHseI2SSFL8yZU=", + "lastModified": 1759893430, + "narHash": "sha256-yAy4otLYm9iZ+NtQwTMEbqHwswSFUbhn7x826RR6djw=", "owner": "ipetkov", "repo": "crane", - "rev": "25bd41b24426c7734278c2ff02e53258851db914", + "rev": "1979a2524cb8c801520bd94c38bb3d5692419d93", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1755585599, - "narHash": "sha256-tl/0cnsqB/Yt7DbaGMel2RLa7QG5elA8lkaOXli6VdY=", + "lastModified": 1760250892, + "narHash": "sha256-4dCaizaWtGsxA3w7oHKDKkALSoXmEkXEFjA6obKIMh0=", "owner": "nix-community", "repo": "fenix", - "rev": "6ed03ef4c8ec36d193c18e06b9ecddde78fb7e42", + "rev": "b0b86e20829d1766bffb9f654d9fad47e099dc1b", "type": "github" }, "original": { @@ -143,11 +143,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1756496801, - "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=", + "lastModified": 1760312644, + "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb", + "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1756265386, - "narHash": "sha256-AGzXkcbafClvd31K/C/Nb9MByIws+WV0lYKQ1JzvVQA=", - "rev": "fe6395cd4d7aa1ffd415cb2267ff431b5c66152f", + "lastModified": 1760292753, + "narHash": "sha256-UDXkh/LOK4Qs+HUgSLOz2+JZ+YCSmtbEIqSSIKigm1I=", + "rev": "e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fe6395cd4d7aa1ffd415cb2267ff431b5c66152f.tar.gz?rev=fe6395cd4d7aa1ffd415cb2267ff431b5c66152f" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb.tar.gz?rev=e9f6baedd11d5bf0a9cf43e50b8e4878b32e1cdb" }, "original": { "type": "tarball", @@ -360,11 +360,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756451209, - "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=", + "lastModified": 1760328462, + "narHash": "sha256-LAmGgkv25DFSmYyIbcAMGGqKb8ZpFIpsoD5HqtpFPFo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cdfffe0b009582f5161dcd030a5549236287767b", + "rev": "d8ed6b75d4ff881bf04c805964fd6362c2282ecb", "type": "github" }, "original": { @@ -376,16 +376,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.08", "repo": "niri", "type": "github" } @@ -393,11 +393,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756448032, - "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=", + "lastModified": 1759395653, + "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b", + "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1756430462, - "narHash": "sha256-7eyB++u0w76rIeWK9Ro0m9xA6x1RUrTwkLWQG4FF2oE=", + "lastModified": 1760319606, + "narHash": "sha256-1OYV+2e3i8ZN65M4OZpiiXbol2B/gIHcss67+Myy670=", "owner": "kaylorben", "repo": "nixcord", - "rev": "6224976ea28552c7dc0ceaa189e7d9a5b80875f6", + "rev": "e3b0094a4486b1c983d46aa79328efa23f1329b4", "type": "github" }, "original": { @@ -428,11 +428,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -485,11 +485,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1756217674, - "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { @@ -516,11 +516,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1756487429, - "narHash": "sha256-dKmUp2Z5JS8exaYq4+2TnjzzLSyYMpCvCGaCxMAnD1I=", + "lastModified": 1760205645, + "narHash": "sha256-y85FWbpmo6JCAPcqfdxdCUkchUjBo5bdS8rb5pCM/7A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "84fddb6f4ccf28d904b0d82d1878c36f94c6b629", + "rev": "66e5020bfe0af40ffa127426f8405edbdadbb40b", "type": "github" }, "original": { @@ -547,11 +547,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756386758, - "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -562,11 +562,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -604,11 +604,11 @@ ] }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -637,11 +637,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1755504847, - "narHash": "sha256-VX0B9hwhJypCGqncVVLC+SmeMVd/GAYbJZ0MiiUn2Pk=", + "lastModified": 1760201021, + "narHash": "sha256-+Q7q1EEPVpx96qysrSE7drXcXMFt0xY3HYdO1qU9Csg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a905e3b21b144d77e1b304e49f3264f6f8d4db75", + "rev": "6fcd20b1acd355d2d253bd6747386ed8f629b4d0", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755997543, - "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", + "lastModified": 1760261849, + "narHash": "sha256-P0u31LhxDfzVmP/rpfPCHbUj92r4pyAEd9FW8/GdZHU=", "owner": "danth", "repo": "stylix", - "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", + "rev": "83e0cbfa4a93b1dda28518df0e5df6dbc957c2c8", "type": "github" }, "original": { @@ -793,11 +793,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -809,11 +809,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -825,11 +825,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -881,11 +881,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1756260173, - "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", + "lastModified": 1759707084, + "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", + "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", "type": "github" }, "original": { diff --git a/hosts/monosodium-glutamate-g/modules/input.nix b/hosts/monosodium-glutamate-g/modules/input.nix index 41486b2..7019eb2 100644 --- a/hosts/monosodium-glutamate-g/modules/input.nix +++ b/hosts/monosodium-glutamate-g/modules/input.nix @@ -39,5 +39,24 @@ ]; } ]; + devices."Cherry USB keyboard" = { + swapKeys = [ + [ + "KEY_Y" + "KEY_Z" + ] + [ + "KEY_LEFTALT" + "KEY_LEFTMETA" + ] + ]; + dual_role = [ + { + input = "KEY_CAPSLOCK"; + hold = [ "KEY_LEFTCTRL" ]; + tap = [ "KEY_ESC" ]; + } + ]; + }; }; } diff --git a/justfile b/justfile index 76fb10c..4666fa8 100644 --- a/justfile +++ b/justfile @@ -12,6 +12,23 @@ tbuild: update: nix flake update --commit-lock-file --log-format multiline +toggle-gaps: replace-gaps test + +replace-gaps: + #!/usr/bin/env nu + let style_file = './modules/desktop/home/niri/style.nix'; + let gap_state = ./build-utils/templ-edit.nu find $style_file + | from json + | get 0.current + | parse " gaps = {v}; " + | get v.0; + print $gap_state; + if $gap_state == "0" { + ./build-utils/templ-edit.nu edit $style_file GAPS 15 + } else { + ./build-utils/templ-edit.nu edit $style_file GAPS 0 + } + update-typst-configs: #!/usr/bin/env nu let file = './modules/media/typst.nix'; diff --git a/modules/desktop/home/eww/configDir/eww.yuck b/modules/desktop/home/eww/configDir/eww.yuck index 5b0f9b6..f6f20f5 100644 --- a/modules/desktop/home/eww/configDir/eww.yuck +++ b/modules/desktop/home/eww/configDir/eww.yuck @@ -1,6 +1,8 @@ (include "topBar/topBar.yuck") (include "bottomBar/bottomBar.yuck") +(include "topBar/time.yuck") + (defwindow streamUi :monitor 0 :stacking "fg" @@ -10,6 +12,25 @@ :width "640px" :height "100%" :anchor "center right") - (box + (centerbox + :style "padding: 0 3px" + :orientation "vertical" (label :text "hi") - )) + (label :text "hi") + (centerbox + :valign "end" + (box + :halign "start" + (systray + :icon-size 18 + :spacing 3 + ) + ) + (box) + (box + :halign "end" + (time) + ) + ) + ) +) diff --git a/modules/desktop/home/niri/style.nix b/modules/desktop/home/niri/style.nix index 3b5822d..e9b0085 100644 --- a/modules/desktop/home/niri/style.nix +++ b/modules/desktop/home/niri/style.nix @@ -17,7 +17,7 @@ animations.shaders.window-open = builtins.readFile ./shaders/glitch-open.frag; layout = { - gaps = 15; + gaps = 15; # :GAPS:- gaps = %GAPS%;-:# focus-ring.enable = false; border = { enable = true; @@ -58,6 +58,9 @@ is-floating = true; } ]; + excludes = [ + { app-id = "steam_app_[0-9]+"; } + ]; baba-is-float = true; shadow = { offset.y = 0; @@ -68,6 +71,12 @@ enable = true; }; } + { + matches = [ + { app-id = "(steam_app_[0-9]+|[Mm]inecraft.*|gamescope)"; } + ]; + border.enable = false; + } { geometry-corner-radius = let diff --git a/modules/shell/default.nix b/modules/shell/default.nix index ed20039..8db99b2 100644 --- a/modules/shell/default.nix +++ b/modules/shell/default.nix @@ -22,6 +22,15 @@ }; programs.carapace.enable = true; programs.direnv.enable = true; + programs.navi.enable = true; + programs.tealdeer = { + enable = true; + enableAutoUpdates = true; + # updates = { + # auto_update_interval_hours = 24; + # auto_update = true; + # }; + }; }; users.defaultUserShell = pkgs.nushell;