From 36e14ad3f681c7ae1b1d30f9b129078dbc7aa95e Mon Sep 17 00:00:00 2001 From: reo101 Date: Thu, 25 Jan 2024 17:39:43 +0200 Subject: [PATCH] style: format with `nix fmt` Currently uses `nixpkgs-fmt` --- .../aarch64-linux/cheetah/home.nix | 2 +- .../x86_64-linux/jeeves/configuration.nix | 12 +- .../nixos/x86_64-linux/jeeves/wireguard.nix | 6 +- .../darwin-trampolines/default.nix | 16 +- modules/home-manager/reo101-shell/atuin.nix | 114 +++---- modules/home-manager/reo101-shell/default.nix | 55 ++-- modules/nix-darwin/system/default.nix | 28 +- modules/nix-darwin/yabai/setbg/default.nix | 24 +- .../nix-darwin/yabai/sketchybar/default.nix | 298 +++++++++--------- modules/nixos/mindustry/default.nix | 9 +- 10 files changed, 284 insertions(+), 280 deletions(-) diff --git a/machines/nix-on-droid/aarch64-linux/cheetah/home.nix b/machines/nix-on-droid/aarch64-linux/cheetah/home.nix index 65fca66..31fe7e7 100644 --- a/machines/nix-on-droid/aarch64-linux/cheetah/home.nix +++ b/machines/nix-on-droid/aarch64-linux/cheetah/home.nix @@ -132,7 +132,7 @@ maxCacheTtl = 86400; pinentryFlavor = "tty"; enableSshSupport = true; - sshKeys = ["CFDE97EDC2FDB2FD27020A084F1E3F40221BAFE7"]; + sshKeys = [ "CFDE97EDC2FDB2FD27020A084F1E3F40221BAFE7" ]; }; home.sessionVariables."PASSWORD_STORE_DIR" = "${config.xdg.dataHome}/password-store"; diff --git a/machines/nixos/x86_64-linux/jeeves/configuration.nix b/machines/nixos/x86_64-linux/jeeves/configuration.nix index 71d9d31..1c60e23 100644 --- a/machines/nixos/x86_64-linux/jeeves/configuration.nix +++ b/machines/nixos/x86_64-linux/jeeves/configuration.nix @@ -77,7 +77,7 @@ age.secrets."jeeves.user.password" = { rekeyFile = "${inputs.self}/secrets/home/jeeves/user/password.age"; generator = { - script = {pkgs, ...}: '' + script = { pkgs, ... }: '' ${pkgs.mkpasswd}/bin/mkpasswd -m sha-516 ''; }; @@ -124,16 +124,16 @@ # }; security.sudo = { enable = true; - extraRules= [ + extraRules = [ { users = [ "jeeves" ]; commands = [ - { - command = "ALL" ; - options= [ "NOPASSWD" ]; # "SETENV" # Adding the following could be a good idea - } + { + command = "ALL"; + options = [ "NOPASSWD" ]; # "SETENV" # Adding the following could be a good idea + } ]; } ]; diff --git a/machines/nixos/x86_64-linux/jeeves/wireguard.nix b/machines/nixos/x86_64-linux/jeeves/wireguard.nix index 68bf730..d38fadf 100644 --- a/machines/nixos/x86_64-linux/jeeves/wireguard.nix +++ b/machines/nixos/x86_64-linux/jeeves/wireguard.nix @@ -14,7 +14,7 @@ mode = "077"; rekeyFile = "${inputs.self}/secrets/home/jeeves/wireguard/key.age"; generator = { - script = {lib, pkgs, file, ...}: '' + script = { lib, pkgs, file, ... }: '' priv=$(${pkgs.wireguard-tools}/bin/wg genkey) ${pkgs.wireguard-tools}/bin/wg pubkey <<< "$priv" > ${lib.escapeShellArg (lib.removeSuffix ".age" file + ".pub")} echo "$priv" @@ -22,7 +22,7 @@ }; }; - networking.firewall.allowedUDPPorts = [51820]; + networking.firewall.allowedUDPPorts = [ 51820 ]; systemd.network = { netdevs = { "50-wg0" = { @@ -76,7 +76,7 @@ }; networks.wg0 = { matchConfig.Name = "wg0"; - address = ["10.100.0.1/24"]; + address = [ "10.100.0.1/24" ]; networkConfig = { IPMasquerade = "ipv4"; IPForward = true; diff --git a/modules/home-manager/darwin-trampolines/default.nix b/modules/home-manager/darwin-trampolines/default.nix index 2a02019..8afbd36 100644 --- a/modules/home-manager/darwin-trampolines/default.nix +++ b/modules/home-manager/darwin-trampolines/default.nix @@ -8,13 +8,15 @@ config = { home.activation = lib.mkIf pkgs.stdenv.isDarwin { - trampolineApps = let - mac-app-util = inputs.mac-app-util.packages.${pkgs.stdenv.system}.default; - in lib.hm.dag.entryAfter [ "writeBoundary" ] '' - fromDir="$HOME/Applications/Home Manager Apps" - toDir="$HOME/Applications/Home Manager Trampolines" - ${mac-app-util}/bin/mac-app-util sync-trampolines "$fromDir" "$toDir" - ''; + trampolineApps = + let + mac-app-util = inputs.mac-app-util.packages.${pkgs.stdenv.system}.default; + in + lib.hm.dag.entryAfter [ "writeBoundary" ] '' + fromDir="$HOME/Applications/Home Manager Apps" + toDir="$HOME/Applications/Home Manager Trampolines" + ${mac-app-util}/bin/mac-app-util sync-trampolines "$fromDir" "$toDir" + ''; }; }; } diff --git a/modules/home-manager/reo101-shell/atuin.nix b/modules/home-manager/reo101-shell/atuin.nix index bb9ef02..8b6b5fb 100644 --- a/modules/home-manager/reo101-shell/atuin.nix +++ b/modules/home-manager/reo101-shell/atuin.nix @@ -1,79 +1,79 @@ { keyPath, ... }: '' -## where to store your database, default is your system data directory -## mac: ~/Library/Application Support/com.elliehuxtable.atuin/history.db -## linux: ~/.local/share/atuin/history.db -# db_path = "~/.history.db" + ## where to store your database, default is your system data directory + ## mac: ~/Library/Application Support/com.elliehuxtable.atuin/history.db + ## linux: ~/.local/share/atuin/history.db + # db_path = "~/.history.db" -## where to store your encryption key, default is your system data directory -key_path = "${keyPath}" + ## where to store your encryption key, default is your system data directory + key_path = "${keyPath}" -## where to store your auth session token, default is your system data directory -# session_path = "~/.key" + ## where to store your auth session token, default is your system data directory + # session_path = "~/.key" -## date format used, either "us" or "uk" -# dialect = "us" + ## date format used, either "us" or "uk" + # dialect = "us" -## enable or disable automatic sync -auto_sync = true + ## enable or disable automatic sync + auto_sync = true -## enable or disable automatic update checks -update_check = false + ## enable or disable automatic update checks + update_check = false -## address of the sync server -sync_address = "https://naboo.qtrp.org/atuin" + ## address of the sync server + sync_address = "https://naboo.qtrp.org/atuin" -## how often to sync history. note that this is only triggered when a command -## is ran, so sync intervals may well be longer -## set it to 0 to sync after every command -sync_frequency = "1m" + ## how often to sync history. note that this is only triggered when a command + ## is ran, so sync intervals may well be longer + ## set it to 0 to sync after every command + sync_frequency = "1m" -## which search mode to use -## possible values: prefix, fulltext, fuzzy, skim -# search_mode = "fuzzy" + ## which search mode to use + ## possible values: prefix, fulltext, fuzzy, skim + # search_mode = "fuzzy" -## which filter mode to use -## possible values: global, host, session, directory -filter_mode = "global" + ## which filter mode to use + ## possible values: global, host, session, directory + filter_mode = "global" -# ## which filter mode to use when atuin is invoked from a shell up-key binding -# ## the accepted values are identical to those of "filter_mode" -# ## leave unspecified to use same mode set in "filter_mode" -# filter_mode_shell_up_keybinding = "session" + # ## which filter mode to use when atuin is invoked from a shell up-key binding + # ## the accepted values are identical to those of "filter_mode" + # ## leave unspecified to use same mode set in "filter_mode" + # filter_mode_shell_up_keybinding = "session" -## which style to use -## possible values: auto, full, compact -# style = "auto" + ## which style to use + ## possible values: auto, full, compact + # style = "auto" -## the maximum number of lines the interface should take up -## set it to 0 to always go full screen -# inline_height = 0 + ## the maximum number of lines the interface should take up + ## set it to 0 to always go full screen + # inline_height = 0 -## enable or disable showing a preview of the selected command -## useful when the command is longer than the terminal width and is cut off -# show_preview = false + ## enable or disable showing a preview of the selected command + ## useful when the command is longer than the terminal width and is cut off + # show_preview = false -## what to do when the escape key is pressed when searching -## possible values: return-original, return-query -# exit_mode = "return-original" + ## what to do when the escape key is pressed when searching + ## possible values: return-original, return-query + # exit_mode = "return-original" -## possible values: emacs, subl -# word_jump_mode = "emacs" + ## possible values: emacs, subl + # word_jump_mode = "emacs" -## characters that count as a part of a word -# word_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" + ## characters that count as a part of a word + # word_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -## number of context lines to show when scrolling by pages -# scroll_context_lines = 1 + ## number of context lines to show when scrolling by pages + # scroll_context_lines = 1 -## prevent commands matching any of these regexes from being written to history. -## Note that these regular expressions are unanchored, i.e. if they don't start -## with ^ or end with $, they'll match anywhere in the command. -## For details on the supported regular expression syntax, see -## https://docs.rs/regex/latest/regex/#syntax -# history_filter = [ -# "^secret-cmd", -# "^innocuous-cmd .*--secret=.+" -# ] + ## prevent commands matching any of these regexes from being written to history. + ## Note that these regular expressions are unanchored, i.e. if they don't start + ## with ^ or end with $, they'll match anywhere in the command. + ## For details on the supported regular expression syntax, see + ## https://docs.rs/regex/latest/regex/#syntax + # history_filter = [ + # "^secret-cmd", + # "^innocuous-cmd .*--secret=.+" + # ] '' diff --git a/modules/home-manager/reo101-shell/default.nix b/modules/home-manager/reo101-shell/default.nix index fa25d22..1aedcc4 100644 --- a/modules/home-manager/reo101-shell/default.nix +++ b/modules/home-manager/reo101-shell/default.nix @@ -11,31 +11,32 @@ let shellAliases = { cp = "${pkgs.advcpmv}/bin/advcp -rvi"; mv = "${pkgs.advcpmv}/bin/advmv -vi"; - rebuild = let - rebuild_script = pkgs.writeShellScript "rebuild" '' - ${ - let - inherit (lib.strings) - hasInfix; - inherit (pkgs.hostPlatform) - isx86_64 isAarch64 - isLinux isDarwin; - in - if isx86_64 && isLinux then - "sudo --validate && sudo nixos-rebuild" - else if isDarwin then - "darwin-rebuild" - else if isAarch64 then - "nix-on-droid" - else - "home-manager" - } --flake ${ - if cfg.hostname != null - then "${cfg.flakePath}#${cfg.hostname}" - else "${cfg.flakePath}" - } ''$''\{1:-switch''\} "''$''\{@:2''\}" # |& nix run nixpkgs#nix-output-monitor - ''; - in + rebuild = + let + rebuild_script = pkgs.writeShellScript "rebuild" '' + ${ + let + inherit (lib.strings) + hasInfix; + inherit (pkgs.hostPlatform) + isx86_64 isAarch64 + isLinux isDarwin; + in + if isx86_64 && isLinux then + "sudo --validate && sudo nixos-rebuild" + else if isDarwin then + "darwin-rebuild" + else if isAarch64 then + "nix-on-droid" + else + "home-manager" + } --flake ${ + if cfg.hostname != null + then "${cfg.flakePath}#${cfg.hostname}" + else "${cfg.flakePath}" + } ''$''\{1:-switch''\} "''$''\{@:2''\}" # |& nix run nixpkgs#nix-output-monitor + ''; + in "${rebuild_script}"; }; in @@ -168,7 +169,7 @@ in let shellPackage = builtins.getAttr (builtins.head cfg.shells) pkgs; in - "${shellPackage}/${shellPackage.shellPath}"; + "${shellPackage}/${shellPackage.shellPath}"; }; # Nushell @@ -184,7 +185,7 @@ in inherit shellAliases; - environmentVariables = {}; + environmentVariables = { }; }) (mkIf cfg.atuin { extraEnv = '' diff --git a/modules/nix-darwin/system/default.nix b/modules/nix-darwin/system/default.nix index a4be9cc..f294241 100644 --- a/modules/nix-darwin/system/default.nix +++ b/modules/nix-darwin/system/default.nix @@ -100,7 +100,7 @@ in CustomUserPreferences = { "NSGlobalDomain" = { - "AppleSpacesSwitchOnActivate"= 0; + "AppleSpacesSwitchOnActivate" = 0; }; }; @@ -297,19 +297,19 @@ in defaults write com.apple.dock persistent-apps -array \ "$(__dock_item "/System/Applications/System Settings.app")" ''; - # defaults write com.apple.dock persistent-apps -array \ - # "$(__dock_item /Applications/1Password.app)" \ - # "$(__dock_item ${pkgs.slack}/Applications/Slack.app)" \ - # "$(__dock_item /System/Applications/Calendar.app)" \ - # "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \ - # "$(__dock_item /System/Applications/Messages.app)" \ - # "$(__dock_item /System/Applications/Mail.app)" \ - # "$(__dock_item /Applications/Mimestream.app)" \ - # "$(__dock_item /Applications/zoom.us.app)" \ - # "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \ - # "$(__dock_item /Applications/Obsidian.app)" \ - # "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \ - # "$(__dock_item /System/Applications/System\ Settings.app)" + # defaults write com.apple.dock persistent-apps -array \ + # "$(__dock_item /Applications/1Password.app)" \ + # "$(__dock_item ${pkgs.slack}/Applications/Slack.app)" \ + # "$(__dock_item /System/Applications/Calendar.app)" \ + # "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \ + # "$(__dock_item /System/Applications/Messages.app)" \ + # "$(__dock_item /System/Applications/Mail.app)" \ + # "$(__dock_item /Applications/Mimestream.app)" \ + # "$(__dock_item /Applications/zoom.us.app)" \ + # "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \ + # "$(__dock_item /Applications/Obsidian.app)" \ + # "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \ + # "$(__dock_item /System/Applications/System\ Settings.app)" }; }; diff --git a/modules/nix-darwin/yabai/setbg/default.nix b/modules/nix-darwin/yabai/setbg/default.nix index 09d168c..22411ac 100644 --- a/modules/nix-darwin/yabai/setbg/default.nix +++ b/modules/nix-darwin/yabai/setbg/default.nix @@ -13,15 +13,15 @@ let osascript ${./setbg.scpt} "''${1}" ''; in - symlinkJoin { - name = "setbg"; - paths = [ setWallpaperUnwrapped ]; - buildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/setbg \ - --prefix PATH : ${lib.makeBinPath [ - jq - yabai - ]} - ''; - } +symlinkJoin { + name = "setbg"; + paths = [ setWallpaperUnwrapped ]; + buildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram $out/bin/setbg \ + --prefix PATH : ${lib.makeBinPath [ + jq + yabai + ]} + ''; +} diff --git a/modules/nix-darwin/yabai/sketchybar/default.nix b/modules/nix-darwin/yabai/sketchybar/default.nix index 124549b..ad22adb 100755 --- a/modules/nix-darwin/yabai/sketchybar/default.nix +++ b/modules/nix-darwin/yabai/sketchybar/default.nix @@ -21,153 +21,153 @@ let }; in '' -export PLUGIN_DIR="${plugin_dir}" -export UTIL_DIR="${util_dir}" - -##### Bar Appearance ##### -BACKGROUND_COLOR="0x502a2d3d" - -appearance=''$''\(defaults read -g AppleInterfaceStyle''\) - -if [[ ''$''\{appearance''\} != 'Dark' ]]; then - BACKGROUND_COLOR="0x50f5f0f5" -fi - -height=''$''\(${get_menu_bar_height}/bin/get_menu_bar_height''\) - -sketchybar --bar height="32" \ - blur_radius="25" \ - position="top" \ - sticky="on" \ - margin="10" \ - color="0x002a2d3d" \ - notch_offset="5" \ - corner_radius="12" \ - border_color="0x80c4a7e7" \ - border_width="0" - -##### Changing Defaults ##### -# We now change some default values that are applied to all further items -# For a full list of all available item properties see: -# https://felixkratz.github.io/SketchyBar/config/items - -sketchybar --default updates="when_shown" \ - icon.font="SF Pro Rounded:Bold:14.0" \ - icon.color="0xffc6ceef" \ - label.font="SF Pro Rounded:Bold:14.0" \ - label.color="0xffc6ceef" \ - padding_left="3" \ - padding_right="3" \ - label.padding_left="4" \ - label.padding_right="4" \ - icon.padding_left="4" \ - icon.padding_right="4" - -##### Adding Mission Control Space Indicators ##### -# Now we add some mission control spaces: -# https://felixkratz.github.io/SketchyBar/config/components#space----associate-mission-control-spaces-with-an-item -# to indicate active and available mission control spaces - -SPACE_ICONS=("1" "2" "3" "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" "15" "16") - -for i in "''$''\{!SPACE_ICONS[@]''\}"; do - sid=$(($i+1)) - sketchybar --add space space.''$''\{sid''\} left \ - --set space.''$''\{sid''\} associated_space="''$''\{sid''\}" \ - icon="''$''\{SPACE_ICONS[i]''\}" \ - background.color="0x44ffffff" \ - background.corner_radius="7" \ - background.height="20" \ - background.drawing="on" \ - background.border_color="0x952a2d3d" \ - background.border_width="1" \ - label.drawing="off" \ - script="''$''\{PLUGIN_DIR''\}/space.sh" \ - click_script="yabai -m space --focus ''$''\{sid''\}" -done - -##### Adding Left Items ##### -# We add some regular items to the left side of the bar -# only the properties deviating from the current defaults need to be set - -sketchybar --add item space_separator left \ - --set space_separator icon="λ" \ - icon.color="0xffff946f" \ - padding_left="10" \ - padding_right="10" \ - label.drawing="off" \ - \ - --add item front_app left \ - --set front_app script="''$''\{PLUGIN_DIR''\}/front_app.sh" \ - icon.drawing="off" \ - background.color="''$''\{BACKGROUND_COLOR''\}" \ - background.corner_radius="7" \ - blur_radius="30" \ - background.border_color="0x80c4a7e7" \ - background.border_width="1" \ - --subscribe front_app front_app_switched - -##### Adding Right Items ##### -# In the same way as the left items we can add items to the right side. -# Additional position (e.g. center) are available, see: -# https://felixkratz.github.io/SketchyBar/config/items#adding-items-to-sketchybar - -# Some items refresh on a fixed cycle, e.g. the clock runs its script once -# every 10s. Other items respond to events they subscribe to, e.g. the -# volume.sh script is only executed once an actual change in system audio -# volume is registered. More info about the event system can be found here: -# https://felixkratz.github.io/SketchyBar/config/events - -sketchybar --add item clock right i \ - --set clock update_freq="10" \ - icon="􀐬" \ - background.color="''$''\{BACKGROUND_COLOR''\}" \ - background.corner_radius="7" \ - icon.padding_left="10" \ - label.padding_right="10" \ - blur_radius="30" \ - background.border_color="0x80c4a7e7" \ - background.border_width="1" \ - script="''$''\{PLUGIN_DIR''\}/clock.sh" \ - \ - --add item wifi right \ - --set wifi script="''$''\{PLUGIN_DIR''\}/wifi.sh" \ - icon="􀙇" \ - background.color="''$''\{BACKGROUND_COLOR''\}" \ - background.corner_radius="7" \ - icon.padding_left="10" \ - label.padding_right="10" \ - blur_radius="30" \ - background.border_color="0x80c4a7e7" \ - background.border_width="1" \ - --subscribe wifi wifi_change \ - \ - --add item volume right \ - --set volume script="''$''\{PLUGIN_DIR''\}/volume.sh" \ - background.color="''$''\{BACKGROUND_COLOR''\}" \ - background.corner_radius="7" \ - icon.padding_left="10" \ - label.padding_right="10" \ - blur_radius="30" \ - background.border_color="0x80c4a7e7" \ - background.border_width="1" \ - --subscribe volume volume_change \ - \ - --add item battery right \ - --set battery script="''$''\{PLUGIN_DIR''\}/battery.sh" \ - update_freq="120" \ - background.color="''$''\{BACKGROUND_COLOR''\}" \ - background.corner_radius="7" \ - icon.padding_left="10" \ - label.padding_right="10" \ - blur_radius="30" \ - background.border_color="0x80c4a7e7" \ - background.border_width="1" \ - --subscribe battery system_woke power_source_change \ - -##### Finalizing Setup ##### -# The below command is only needed at the end of the initial configuration to -# force all scripts to run the first time, it should never be run in an item script. - -sketchybar --update + export PLUGIN_DIR="${plugin_dir}" + export UTIL_DIR="${util_dir}" + + ##### Bar Appearance ##### + BACKGROUND_COLOR="0x502a2d3d" + + appearance=''$''\(defaults read -g AppleInterfaceStyle''\) + + if [[ ''$''\{appearance''\} != 'Dark' ]]; then + BACKGROUND_COLOR="0x50f5f0f5" + fi + + height=''$''\(${get_menu_bar_height}/bin/get_menu_bar_height''\) + + sketchybar --bar height="32" \ + blur_radius="25" \ + position="top" \ + sticky="on" \ + margin="10" \ + color="0x002a2d3d" \ + notch_offset="5" \ + corner_radius="12" \ + border_color="0x80c4a7e7" \ + border_width="0" + + ##### Changing Defaults ##### + # We now change some default values that are applied to all further items + # For a full list of all available item properties see: + # https://felixkratz.github.io/SketchyBar/config/items + + sketchybar --default updates="when_shown" \ + icon.font="SF Pro Rounded:Bold:14.0" \ + icon.color="0xffc6ceef" \ + label.font="SF Pro Rounded:Bold:14.0" \ + label.color="0xffc6ceef" \ + padding_left="3" \ + padding_right="3" \ + label.padding_left="4" \ + label.padding_right="4" \ + icon.padding_left="4" \ + icon.padding_right="4" + + ##### Adding Mission Control Space Indicators ##### + # Now we add some mission control spaces: + # https://felixkratz.github.io/SketchyBar/config/components#space----associate-mission-control-spaces-with-an-item + # to indicate active and available mission control spaces + + SPACE_ICONS=("1" "2" "3" "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" "15" "16") + + for i in "''$''\{!SPACE_ICONS[@]''\}"; do + sid=$(($i+1)) + sketchybar --add space space.''$''\{sid''\} left \ + --set space.''$''\{sid''\} associated_space="''$''\{sid''\}" \ + icon="''$''\{SPACE_ICONS[i]''\}" \ + background.color="0x44ffffff" \ + background.corner_radius="7" \ + background.height="20" \ + background.drawing="on" \ + background.border_color="0x952a2d3d" \ + background.border_width="1" \ + label.drawing="off" \ + script="''$''\{PLUGIN_DIR''\}/space.sh" \ + click_script="yabai -m space --focus ''$''\{sid''\}" + done + + ##### Adding Left Items ##### + # We add some regular items to the left side of the bar + # only the properties deviating from the current defaults need to be set + + sketchybar --add item space_separator left \ + --set space_separator icon="λ" \ + icon.color="0xffff946f" \ + padding_left="10" \ + padding_right="10" \ + label.drawing="off" \ + \ + --add item front_app left \ + --set front_app script="''$''\{PLUGIN_DIR''\}/front_app.sh" \ + icon.drawing="off" \ + background.color="''$''\{BACKGROUND_COLOR''\}" \ + background.corner_radius="7" \ + blur_radius="30" \ + background.border_color="0x80c4a7e7" \ + background.border_width="1" \ + --subscribe front_app front_app_switched + + ##### Adding Right Items ##### + # In the same way as the left items we can add items to the right side. + # Additional position (e.g. center) are available, see: + # https://felixkratz.github.io/SketchyBar/config/items#adding-items-to-sketchybar + + # Some items refresh on a fixed cycle, e.g. the clock runs its script once + # every 10s. Other items respond to events they subscribe to, e.g. the + # volume.sh script is only executed once an actual change in system audio + # volume is registered. More info about the event system can be found here: + # https://felixkratz.github.io/SketchyBar/config/events + + sketchybar --add item clock right i \ + --set clock update_freq="10" \ + icon="􀐬" \ + background.color="''$''\{BACKGROUND_COLOR''\}" \ + background.corner_radius="7" \ + icon.padding_left="10" \ + label.padding_right="10" \ + blur_radius="30" \ + background.border_color="0x80c4a7e7" \ + background.border_width="1" \ + script="''$''\{PLUGIN_DIR''\}/clock.sh" \ + \ + --add item wifi right \ + --set wifi script="''$''\{PLUGIN_DIR''\}/wifi.sh" \ + icon="􀙇" \ + background.color="''$''\{BACKGROUND_COLOR''\}" \ + background.corner_radius="7" \ + icon.padding_left="10" \ + label.padding_right="10" \ + blur_radius="30" \ + background.border_color="0x80c4a7e7" \ + background.border_width="1" \ + --subscribe wifi wifi_change \ + \ + --add item volume right \ + --set volume script="''$''\{PLUGIN_DIR''\}/volume.sh" \ + background.color="''$''\{BACKGROUND_COLOR''\}" \ + background.corner_radius="7" \ + icon.padding_left="10" \ + label.padding_right="10" \ + blur_radius="30" \ + background.border_color="0x80c4a7e7" \ + background.border_width="1" \ + --subscribe volume volume_change \ + \ + --add item battery right \ + --set battery script="''$''\{PLUGIN_DIR''\}/battery.sh" \ + update_freq="120" \ + background.color="''$''\{BACKGROUND_COLOR''\}" \ + background.corner_radius="7" \ + icon.padding_left="10" \ + label.padding_right="10" \ + blur_radius="30" \ + background.border_color="0x80c4a7e7" \ + background.border_width="1" \ + --subscribe battery system_woke power_source_change \ + + ##### Finalizing Setup ##### + # The below command is only needed at the end of the initial configuration to + # force all scripts to run the first time, it should never be run in an item script. + + sketchybar --update '' diff --git a/modules/nixos/mindustry/default.nix b/modules/nixos/mindustry/default.nix index 8d565c6..eb7c2ac 100644 --- a/modules/nixos/mindustry/default.nix +++ b/modules/nixos/mindustry/default.nix @@ -51,7 +51,7 @@ in port = mkOption { type = types.port; default = 6567; - description ='' + description = '' Port to run the game server on ''; }; @@ -65,7 +65,8 @@ in }; }; - config = mkIf cfg.enable ( let + config = mkIf cfg.enable ( + let # mindustryJar = builtins.fetchurl { # url = cfg.jarUrl; # sha256 = cfg.jarSha256; @@ -103,13 +104,13 @@ in networking.firewall = lib.pipe - ["TCP" "UDP"] + [ "TCP" "UDP" ] [ (builtins.map (protocol: lib.nameValuePair "allowed${protocol}Ports" - [cfg.port])) + [ cfg.port ])) builtins.listToAttrs ];