diff --git a/docs/scripts/keybindings_to_markdown.sh b/docs/scripts/keybindings_to_markdown.sh index eba528a..1e42fcb 100644 --- a/docs/scripts/keybindings_to_markdown.sh +++ b/docs/scripts/keybindings_to_markdown.sh @@ -9,20 +9,20 @@ KEYBINDINGS_FILE="./docs/KEYBINDINGS.md" -function getList(){ - content=$1 - name=$2 - list_start=$(echo "$content" | sed "/$name = \[/!d;=;Q") - list=$(echo "$content" | tail +$list_start) - list_end=$(echo "$list" | sed '/\]/!d;=;Q') - list=$(echo "$list" | head -n$list_end) +function getList() { + content=$1 + name=$2 + list_start=$(echo "$content" | sed "/$name = \[/!d;=;Q") + list=$(echo "$content" | tail +"$list_start") + list_end=$(echo "$list" | sed '/\]/!d;=;Q') + list=$(echo "$list" | head -n"$list_end") - echo "$list" + echo "$list" } [[ -f "./home/system/hyprland/default.nix" ]] || (echo "File ./home/system/hyprland/default.nix not found" && exit 1) -config=$( cat "./home/system/hyprland/default.nix") +config=$(cat "./home/system/hyprland/default.nix") # Bind bind=$(getList "$config" "bind") @@ -36,27 +36,26 @@ bindle=$(getList "$config" "bindle") # Join the lists: keybindings=$(echo -e "$bind\n$bindm\n$bindl\n$bindle" | grep '"') -echo "# Keybindings" > "$KEYBINDINGS_FILE" -echo "" >> "$KEYBINDINGS_FILE" -echo "The list of the keybindings working on Hyprland:" >> "$KEYBINDINGS_FILE" -echo "" >> "$KEYBINDINGS_FILE" +echo "# Keybindings" >"$KEYBINDINGS_FILE" +echo "" >>"$KEYBINDINGS_FILE" +echo "The list of the keybindings working on Hyprland:" >>"$KEYBINDINGS_FILE" +echo "" >>"$KEYBINDINGS_FILE" -echo "| Description | Keybinding | Command |" >> "$KEYBINDINGS_FILE" -echo "| -- | -- | -- |" >> "$KEYBINDINGS_FILE" -echo "| Switch Workspace | SUPER + {Number} | workspace {Number} |" >> "$KEYBINDINGS_FILE" -echo "| Move app to Workspace | SUPER SHIFT + {Number} | movetoworkspace {Number} |" >> "$KEYBINDINGS_FILE" -echo "$keybindings" | while read line -do - comment=$(echo "$line" | cut -d\# -f2) - line=$(echo "$line" | cut -d\# -f1) - line=${line:1:${#line}-3} - mod=$(echo "$line" | cut -d, -f1) - key=$(echo "$line" | cut -d, -f2) - dispatcher=$(echo "$line" | cut -d, -f3) - params=$(echo "$line" | cut -d, -f4) +echo "| Description | Keybinding | Command |" >>"$KEYBINDINGS_FILE" +echo "| -- | -- | -- |" >>"$KEYBINDINGS_FILE" +echo "| Switch Workspace | SUPER + {Number} | workspace {Number} |" >>"$KEYBINDINGS_FILE" +echo "| Move app to Workspace | SUPER SHIFT + {Number} | movetoworkspace {Number} |" >>"$KEYBINDINGS_FILE" +echo "$keybindings" | while read line; do + comment=$(echo "$line" | cut -d\# -f2) + line=$(echo "$line" | cut -d\# -f1) + line=${line:1:${#line}-3} + mod=$(echo "$line" | cut -d, -f1) + key=$(echo "$line" | cut -d, -f2) + dispatcher=$(echo "$line" | cut -d, -f3) + params=$(echo "$line" | cut -d, -f4) - [[ $mod == '$mod' ]] && mod="SUPER + " - [[ $mod == '$shiftMod' ]] && mod="SUPER SHIFT + " + [[ $mod == '$mod' ]] && mod="SUPER + " + [[ $mod == '$shiftMod' ]] && mod="SUPER SHIFT + " - echo "| $comment | $mod$key | $dispatcher $params |" >> "$KEYBINDINGS_FILE" -done \ No newline at end of file + echo "| $comment | $mod$key | $dispatcher $params |" >>"$KEYBINDINGS_FILE" +done diff --git a/home/programs/nvim/plugins/obsidian.nix b/home/programs/nvim/plugins/obsidian.nix index 6951a97..717442f 100644 --- a/home/programs/nvim/plugins/obsidian.nix +++ b/home/programs/nvim/plugins/obsidian.nix @@ -2,8 +2,15 @@ programs.nixvim.plugins.obsidian = { enable = config.var.obsidian; settings = { - dir = "~/nextcloud/Notes"; + completion = { + min_chars = 2; + nvim_cmp = true; + }; disable_frontmatter = true; + workspaces = [{ + name = "note"; + path = "~/nextcloud/Notes"; + }]; }; }; } diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix index c4b4938..3db8e4a 100644 --- a/home/programs/shell/zsh.nix +++ b/home/programs/shell/zsh.nix @@ -2,6 +2,8 @@ home.packages = with pkgs; [ bat ripgrep tldr ]; + home.sessionPath = [ "$HOME/go/bin" ]; + programs.zsh = { enable = true; enableCompletion = true; @@ -27,10 +29,6 @@ size = 1000000; }; - home.sessionPath = [ - "$HOME/go/bin" - ]; - profileExtra = lib.optionalString (config.home.sessionPath != [ ]) '' export PATH="$PATH''${PATH:+:}${ lib.concatStringsSep ":" config.home.sessionPath