diff --git a/build-utils/templ-edit.nu b/build-utils/templ-edit.nu deleted file mode 100755 index e38fc89..0000000 --- a/build-utils/templ-edit.nu +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env nu - -def main [] {} - -def "main find" [ - file: string -] { - open $file --raw - | lines - | enumerate - | update item {|it| $it.item | parse '{current}#:{name}:-{template}-:#' } - | filter {|it| $it.item | is-not-empty} - | flatten -a - | rename -c { index: line } -} - -# TODO: support mroe then single template -def "main edit" [ - file: path - name: string - to: string - --preview -] { - let template = main find $file - | where name == $name - | first; - let new = $template.template - | str replace $"%($name)%" $to - | append $" #:($template.name):-($template.template)-:#" - | str join; - let rest = open $file --raw - | lines - | enumerate - | where index != $template.line - | append { index: $template.line, item: $new} - | sort-by index - | reject index - | get item - | append "" - | str join "\n"; - - if $preview { - print $rest - } else { - $rest | save -f $file - } -} diff --git a/justfile b/justfile index 9d972c9..3243fda 100644 --- a/justfile +++ b/justfile @@ -9,19 +9,8 @@ build: tbuild: sudo nixos-rebuild switch --flake . --impure --fast --log-format multiline-with-logs --show-trace -update: update-typst-configs +update: nix flake update --commit-lock-file --log-format multiline build-mac: sudo nixos-rebuild switch --flake . --impure --override-input mac-brcm-fw path:/home/jade/mac-brcm-fw --fast --log-format multiline - -update-typst-configs: - #!/usr/bin/env nu - let file = './modules/desktop-environment/home/typst.nix'; - let $rev = http get https://forge.katzen.cafe/schrottkatze/typst-configs/commits/branch/main | query web -mq '.commit-list tr:first-of-type a.ui.sha.label' -a href | path basename | first; - ./build-utils/templ-edit.nu edit $file REV $rev; - let $hash = nix-prefetch-url https://forge.katzen.cafe/schrottkatze/typst-configs/archive/main.tar.gz --unpack; - let $sri = nix hash to-sri --type sha256 $hash; - ./build-utils/templ-edit.nu edit $file SHA $sri; - git add $file - git commit -m "typst-configs: Update" diff --git a/modules/desktop-environment/home/panels/eww/configDir/eww.css b/modules/desktop-environment/home/panels/eww/configDir/eww.css index a61a23f..94ff7aa 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/eww.css +++ b/modules/desktop-environment/home/panels/eww/configDir/eww.css @@ -2,12 +2,9 @@ label { font: 14pt "Departure Mono Nerd Font"; } -.background { - background-color: #1d2021; -} - .workspaces button { border: 0px; + background-color: #282828; } .workspaces button.urgent { diff --git a/modules/desktop-environment/home/terminal.nix b/modules/desktop-environment/home/terminal.nix index cfa9ac2..c8b3b54 100644 --- a/modules/desktop-environment/home/terminal.nix +++ b/modules/desktop-environment/home/terminal.nix @@ -2,13 +2,13 @@ programs.kitty = { enable = true; font = { - name = "Departure Mono Nerd Font"; - size = 12; + name = "FiraCode Nerd Font"; + size = 11; }; keybindings = { "ctrl+shift+n" = "new_os_window_with_cwd"; }; - settings = rec { + settings = { #adjust_column_width = "70%"; color0 = "#282828"; color8 = "#928374"; @@ -26,8 +26,8 @@ color14 = "#8ec07c"; color7 = "#a89984"; color15 = "#ebdbb2"; - foreground = color15; - background = "#1d2021"; + foreground = "#ebdbb2"; + background = "#282828"; confirm_os_window_close = 0; }; }; diff --git a/modules/desktop-environment/home/typst.nix b/modules/desktop-environment/home/typst.nix index 1b7f032..4bf4d64 100644 --- a/modules/desktop-environment/home/typst.nix +++ b/modules/desktop-environment/home/typst.nix @@ -4,8 +4,8 @@ domain = "forge.katzen.cafe"; owner = "schrottkatze"; repo = "typst-configs"; - rev = "7e184eecd8c6f87c08246a0bb105867423bd4fbf"; #:REV:- rev = "%REV%";-:# - sha256 = "sha256-Lv5/DxBiG7EUgcOHPL8aqztJ97s+78TXXENB7lb1olM="; #:SHA:- sha256 = "%SHA%";-:# + rev = "569cd8525a85878140baf5952597f27fd7ea51d3"; + sha256 = "sha256-4pAammwrFGhpSquEsh4QSd8Hw/ioHm3fMiC5oqNgbAQ="; }; flow = pkgs.fetchFromGitHub { owner = "MultisampledNight"; diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 1f8a2f2..ad5b857 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -25,7 +25,7 @@ defaultEditor = true; package = helix-inline-diags.outputs.packages."x86_64-linux".default; settings = { - theme = "gruvbox_dark_hard"; + theme = "gruvbox"; editor = { line-number = "relative"; bufferline = "multiple"; diff --git a/modules/shell/nu/config.nu b/modules/shell/nu/config.nu index 9a53c97..c2348f0 100644 --- a/modules/shell/nu/config.nu +++ b/modules/shell/nu/config.nu @@ -73,7 +73,6 @@ $env.config = { } history: { - file_format: sqlite, max_size: 1_000_000_000 # Session has to be reloaded for this to take effect isolation: false } diff --git a/modules/shell/nu/env.nu b/modules/shell/nu/env.nu index 5df3a55..908d237 100644 --- a/modules/shell/nu/env.nu +++ b/modules/shell/nu/env.nu @@ -35,9 +35,9 @@ $env.PROMPT_COMMAND = {|| let deco = if ($env.CMD_COUNT == 0) { flag $TRANS "=" $len } else if ($env.CMD_COUNT | is even) { - flag $LESBIAN "–" $len + flag $LESBIAN "-" $len } else { - flag $TRANS "–" $len + flag $TRANS "-" $len }; $item | append $deco | str join