Move large fish scripts to own files Some people even split their Nix configs into a gazillion tiny files for each app/service but I don't need to go that far. But putting the scripts in their own files makes syntax highlighting, fish_indent, etc work.

Changes

4 changed files (+28/-31)

• ThinkPad-X1-Yoga-Gen-6/default.nix
  • @@ -40,8 +40,6 @@
    programs = { firefox = { enable = true; - # TODO: Firefox will get XDG support soon - # https://phabricator.services.mozilla.com/D6995 preferences = { # Screw you useless Firefox AI garbage "browser.ml.chat.menu" = false;
  • @@ -168,8 +166,6 @@
    }; # KDE! YAY! - # TODO: Sometimes Plasma takes 30 seconds to start - # Maybe related to PAM or SDDM? services.desktopManager.plasma6 = { enable = true; # Save some disk space
  • @@ -233,20 +229,8 @@
    # https://unnamed.website/posts/switch-virtual-keyboard/ systemd.user.services.switch-virtual-keyboard = { wantedBy = [ "default.target" ]; - serviceConfig.ExecStart = pkgs.writers.writeFish "switch-virtual-keyboard" '' - function switch_virtual_keyboard - echo Starting $argv[1] - ${pkgs.kdePackages.kconfig}/bin/kwriteconfig6 --file kwinrc --group Wayland --key InputMethod /run/current-system/sw/share/applications/$argv[1] - busctl --user emit /kwinrc org.kde.kconfig.notify ConfigChanged a{saay} 1 Wayland 1 11 73 110 112 117 116 77 101 116 104 111 100 - end - busctl --user monitor --match type=signal,interface=org.kde.KWin.TabletModeManager,member=tabletModeChanged | while read -l line - if string match -q "*true*" $line - switch_virtual_keyboard org.kde.plasma.keyboard.desktop - else if string match -q "*false*" $line - switch_virtual_keyboard fcitx5-wayland-launcher.desktop - end - end - ''; + path = with pkgs; [ kdePackages.kconfig ]; + serviceConfig.ExecStart = pkgs.writers.writeFish "switch-virtual-keyboard" ./switch-virtual-keyboard.fish; }; # Add SSH key to agent during desktop login
• ThinkPad-X1-Yoga-Gen-6/switch-virtual-keyboard.fish (new)
  • @@ -0,0 +1,13 @@
    + function switch_virtual_keyboard + echo Starting $argv[1] + kwriteconfig6 --file kwinrc --group Wayland --key InputMethod /run/current-system/sw/share/applications/$argv[1] + busctl --user emit /kwinrc org.kde.kconfig.notify ConfigChanged a{saay} 1 Wayland 1 11 73 110 112 117 116 77 101 116 104 111 100 + end + + busctl --user monitor --match type=signal,interface=org.kde.KWin.TabletModeManager,member=tabletModeChanged | while read -l line + if string match -q "*true*" $line + switch_virtual_keyboard org.kde.plasma.keyboard.desktop + else if string match -q "*false*" $line + switch_virtual_keyboard fcitx5-wayland-launcher.desktop + end + end
• Unnamed-Server/default.nix
  • @@ -224,19 +224,7 @@
    serviceConfig = { User = "a"; Group = "users"; - ExecStart = pkgs.writers.writeFish "update-mirrors" '' - function update-mirrors - if test -f $argv[1]/description - cd $argv[1] - ${pkgs.git}/bin/git remote update - else - for i in $argv[1]/* - update-mirrors $i - end - end - end - update-mirrors /srv/git - ''; + ExecStart = pkgs.writers.writeFish "update-mirrors" ./update-mirrors.fish; }; }; timers.update-mirrors = {
• Unnamed-Server/update-mirrors.fish (new)
  • @@ -0,0 +1,12 @@
    + function update-mirrors + if test -f $argv[1]/description + cd $argv[1] + git remote update + else + for i in $argv[1]/* + update-mirrors $i + end + end + end + + update-mirrors /srv/git