style: format with nix fmt
Currently uses `nixpkgs-fmt`
This commit is contained in:
parent
a6efd4146b
commit
36e14ad3f6
GPG key ID:
675AA7EF13964ACB
10 changed files with 267 additions and 263 deletions
|
|
@ -132,7 +132,7 @@
|
|||
maxCacheTtl = 86400;
|
||||
pinentryFlavor = "tty";
|
||||
enableSshSupport = true;
|
||||
sshKeys = ["CFDE97EDC2FDB2FD27020A084F1E3F40221BAFE7"];
|
||||
sshKeys = [ "CFDE97EDC2FDB2FD27020A084F1E3F40221BAFE7" ];
|
||||
};
|
||||
|
||||
home.sessionVariables."PASSWORD_STORE_DIR" = "${config.xdg.dataHome}/password-store";
|
||||
|
|
|
|||
|
|
@ -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,15 +124,15 @@
|
|||
# };
|
||||
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
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -8,9 +8,11 @@
|
|||
|
||||
config = {
|
||||
home.activation = lib.mkIf pkgs.stdenv.isDarwin {
|
||||
trampolineApps = let
|
||||
trampolineApps =
|
||||
let
|
||||
mac-app-util = inputs.mac-app-util.packages.${pkgs.stdenv.system}.default;
|
||||
in lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -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=.+"
|
||||
# ]
|
||||
''
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ let
|
|||
shellAliases = {
|
||||
cp = "${pkgs.advcpmv}/bin/advcp -rvi";
|
||||
mv = "${pkgs.advcpmv}/bin/advmv -vi";
|
||||
rebuild = let
|
||||
rebuild =
|
||||
let
|
||||
rebuild_script = pkgs.writeShellScript "rebuild" ''
|
||||
${
|
||||
let
|
||||
|
|
@ -184,7 +185,7 @@ in
|
|||
|
||||
inherit shellAliases;
|
||||
|
||||
environmentVariables = {};
|
||||
environmentVariables = { };
|
||||
})
|
||||
(mkIf cfg.atuin {
|
||||
extraEnv = ''
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ in
|
|||
|
||||
CustomUserPreferences = {
|
||||
"NSGlobalDomain" = {
|
||||
"AppleSpacesSwitchOnActivate"= 0;
|
||||
"AppleSpacesSwitchOnActivate" = 0;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ let
|
|||
osascript ${./setbg.scpt} "''${1}"
|
||||
'';
|
||||
in
|
||||
symlinkJoin {
|
||||
symlinkJoin {
|
||||
name = "setbg";
|
||||
paths = [ setWallpaperUnwrapped ];
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
|
@ -24,4 +24,4 @@ in
|
|||
yabai
|
||||
]}
|
||||
'';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,21 +21,21 @@ let
|
|||
};
|
||||
in
|
||||
''
|
||||
export PLUGIN_DIR="${plugin_dir}"
|
||||
export UTIL_DIR="${util_dir}"
|
||||
export PLUGIN_DIR="${plugin_dir}"
|
||||
export UTIL_DIR="${util_dir}"
|
||||
|
||||
##### Bar Appearance #####
|
||||
BACKGROUND_COLOR="0x502a2d3d"
|
||||
##### Bar Appearance #####
|
||||
BACKGROUND_COLOR="0x502a2d3d"
|
||||
|
||||
appearance=''$''\(defaults read -g AppleInterfaceStyle''\)
|
||||
appearance=''$''\(defaults read -g AppleInterfaceStyle''\)
|
||||
|
||||
if [[ ''$''\{appearance''\} != 'Dark' ]]; then
|
||||
if [[ ''$''\{appearance''\} != 'Dark' ]]; then
|
||||
BACKGROUND_COLOR="0x50f5f0f5"
|
||||
fi
|
||||
fi
|
||||
|
||||
height=''$''\(${get_menu_bar_height}/bin/get_menu_bar_height''\)
|
||||
height=''$''\(${get_menu_bar_height}/bin/get_menu_bar_height''\)
|
||||
|
||||
sketchybar --bar height="32" \
|
||||
sketchybar --bar height="32" \
|
||||
blur_radius="25" \
|
||||
position="top" \
|
||||
sticky="on" \
|
||||
|
|
@ -46,12 +46,12 @@ sketchybar --bar height="32" \
|
|||
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
|
||||
##### 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" \
|
||||
sketchybar --default updates="when_shown" \
|
||||
icon.font="SF Pro Rounded:Bold:14.0" \
|
||||
icon.color="0xffc6ceef" \
|
||||
label.font="SF Pro Rounded:Bold:14.0" \
|
||||
|
|
@ -63,14 +63,14 @@ sketchybar --default updates="when_shown" \
|
|||
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
|
||||
##### 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")
|
||||
SPACE_ICONS=("1" "2" "3" "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" "15" "16")
|
||||
|
||||
for i in "''$''\{!SPACE_ICONS[@]''\}"; do
|
||||
for i in "''$''\{!SPACE_ICONS[@]''\}"; do
|
||||
sid=$(($i+1))
|
||||
sketchybar --add space space.''$''\{sid''\} left \
|
||||
--set space.''$''\{sid''\} associated_space="''$''\{sid''\}" \
|
||||
|
|
@ -84,13 +84,13 @@ for i in "''$''\{!SPACE_ICONS[@]''\}"; do
|
|||
label.drawing="off" \
|
||||
script="''$''\{PLUGIN_DIR''\}/space.sh" \
|
||||
click_script="yabai -m space --focus ''$''\{sid''\}"
|
||||
done
|
||||
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
|
||||
##### 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 \
|
||||
sketchybar --add item space_separator left \
|
||||
--set space_separator icon="λ" \
|
||||
icon.color="0xffff946f" \
|
||||
padding_left="10" \
|
||||
|
|
@ -107,18 +107,18 @@ sketchybar --add item space_separator left \
|
|||
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
|
||||
##### 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
|
||||
# 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 \
|
||||
sketchybar --add item clock right i \
|
||||
--set clock update_freq="10" \
|
||||
icon="" \
|
||||
background.color="''$''\{BACKGROUND_COLOR''\}" \
|
||||
|
|
@ -165,9 +165,9 @@ sketchybar --add item clock right i \
|
|||
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.
|
||||
##### 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
|
||||
sketchybar --update
|
||||
''
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue