diff --git a/.gitignore b/.gitignore index e114c5f..10c7e8b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,8 +23,6 @@ xdg-ninja/ PowerToys/ # Nushell tools/nushell/ -# fzf -common/fzfrc # OS generated files .DS_Store diff --git a/.just.d/check.just b/.just.d/check.just new file mode 100644 index 0000000..b06d518 --- /dev/null +++ b/.just.d/check.just @@ -0,0 +1,45 @@ + +test: + echo "DOTFILES={{DOTFILES}}" + echo "XDG_CONFIG_HOME={{XDG_CONFIG_HOME}}" + echo "XDG_DATA_HOME={{XDG_DATA_HOME}}" + + +check: + @just check_shell +format: + @just format_shell + + +[private] +[unix] +check_shell: + shellcheck -x -s sh --severity=error **/*.sh platforms/mac/yabairc + shellcheck -x -s bash --severity=error **/*.bash tools/bash/* **/*.bashrc + +[private] +[unix] +format_shell: + shfmt -w -i 2 -ci -bn -p **/*.sh + shfmt -w -i 2 -ci -bn -ln bash **/*.bash platforms/mac/sketchybar/sketchybarrc + # Ignore syntax errors in zsh files + shfmt -w -i 2 -ci -bn -ln bash **/*.zsh tools/zsh/**/* **/zshrc || true + +[private] +check_info: + shellcheck -x -s sh **/*.sh platforms/mac/yabairc + shellcheck -x -s bash **/*.bash tools/bash/* scripts/*.{sh,zsh,bash} **/*.bashrc + +[private] +init: + git remote add github git@github.com:js0ny/dotfiles.git + git remote add codeberg git@codeberg.org:js0ny/dotfiles.git + +[private] +push: + git push github master + git push codeberg master + +[private] +pull: + git pull github master diff --git a/.just.d/cmds.just b/.just.d/cmds.just new file mode 100644 index 0000000..8d9a4bd --- /dev/null +++ b/.just.d/cmds.just @@ -0,0 +1,26 @@ + +# Sudo and coreutils are required +LN := \ + if os_family() == "windows" { + "sudo ln -sf" + } else { + "ln -sf" + } +CLIP := \ + if os() == "windows" { "clip.exe" } \ + else if os() == "linux" { "wl-copy" } \ + else if os() == "macos" { "pbcopy" } \ + else { "" } + + +CURL := \ + if os() == "windows" { "Invoke-WebRequest" } \ + else if os() == "linux" { "curl" } \ + else if os() == "macos" { "curl" } \ + else { "" } + +CURL_OUT := \ + if os() == "windows" { "-OutFile" } \ + else if os() == "linux" { "-o" } \ + else if os() == "macos" { "-o" } \ + else { "" } diff --git a/.just.d/common.just b/.just.d/common.just new file mode 100644 index 0000000..606cc32 --- /dev/null +++ b/.just.d/common.just @@ -0,0 +1,34 @@ +ideavim: + {{LN}} {{DOTFILES}}/common/ideavimrc {{XDG_CONFIG_HOME}}/ideavim/ideavimrc + git clone https://github.com/MarcoIeni/intellimacs {{join(home_directory(), ".local/share/intellimacs")}} --depth 1 + +lsd: + -mkdir {{XDG_CONFIG_HOME}}/lsd + {{LN}} {{DOTFILES}}/common/lsd.yaml {{XDG_CONFIG_HOME}}/lsd/config.yaml + + +[unix] +neovide: + which neovide + -mkdir -p {{XDG_CONFIG_HOME}}/neovide + {{LN}} {{DOTFILES}}/platforms/{{OS}}/neovide.toml {{XDG_CONFIG_HOME}}/neovide/config.toml + + +[linux] +readline: + mkdir -p {{XDG_CONFIG_HOME}}/readline + {{LN}} {{DOTFILES}}/common/inputrc {{XDG_CONFIG_HOME}}/readline/inputrc + + +[unix] +vim: + mkdir -p {{XDG_DATA_HOME}}/vim/after + mkdir -p {{XDG_STATE_HOME}}/vim/{backup,swap,undo,view} + mkdir -p {{XDG_CONFIG_HOME}}/vim/ + ln -sf {{DOTFILES}}/common/vimrc {{XDG_CONFIG_HOME}}/vim/vimrc + + +[windows] +vim: + New-Item -ItemType SymbolicLink -Path $HOME/_vimrc -Value {{DOTFILES}}/common/vim.noxdg.vimrc + diff --git a/.just.d/linux.just b/.just.d/linux.just new file mode 100644 index 0000000..7c6d56a --- /dev/null +++ b/.just.d/linux.just @@ -0,0 +1,49 @@ + +[linux] +systemd: + ln -sf {{DOTFILES}}/platforms/{{OS}}/systemd {{XDG_CONFIG_HOME}}/systemd/ + +[linux] +keyd: + -which keyd || sudo pacman -S keyd --noconfirm || sudo apt install keyd --yes || @just build_keyd + sudo cp {{DOTFILES}}/platforms/linux/keyd/keyd.conf /etc/keyd/default.conf + mkdir -p {{XDG_CONFIG_HOME}}/keyd + {{LN}} {{DOTFILES}}/platforms/linux/keyd/app.conf {{XDG_CONFIG_HOME}}/keyd/app.conf + sudo systemctl enable keyd + +[linux] +[private] +build_keyd: + git clone https://github.com/rvaiya/keyd $HOME/.local/build/keyd + cd $HOME/.local/build/keyd && make && sudo make install + +[linux] +flatpak: + flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + +[linux] +swaylock: + mkdir -p {{XDG_CONFIG_HOME}}/swaylock + {{LN}} {{DOTFILES}}/platforms/linux/swaylock {{XDG_CONFIG_HOME}}/swaylock/config + +[linux] +dunst: + mkdir -p {{XDG_CONFIG_HOME}}/dunst + {{LN}} {{DOTFILES}}/platforms/linux/dunstrc {{XDG_CONFIG_HOME}}/dunst/dunstrc + +[linux] +hypr: + {{LN}} {{DOTFILES}}/platforms/linux/hypr {{XDG_CONFIG_HOME}}/hypr + +[linux] +rofi: + {{LN}} {{DOTFILES}}/platforms/linux/rofi {{XDG_CONFIG_HOME}}/rofi + +[linux] +hyprland: + @just hypr + @just dunst + @just swaylock + @just rofi + + diff --git a/.just.d/misc.just b/.just.d/misc.just new file mode 100644 index 0000000..cb85132 --- /dev/null +++ b/.just.d/misc.just @@ -0,0 +1,15 @@ +uv: + uv init {{XDG_DATA_HOME}}/uvenv + cd {{XDG_DATA_HOME}}/uvenv + uv venv + uv add -r {{DOTFILES}}/bootstrap/components/requirements.txt + +vivaldi: + {{CURL}} https://github.com/SocietasEvanescentes/Vivaldi/files/12446831/Rose.Pine.Dawn.zip {{CURL_OUT}} "$HOME/Downloads/vivaldi-light.zip" # Rose Pine Dawn + {{CURL}} https://github.com/catppuccin/vivaldi/releases/download/1.0.0-ctpv2/Catppuccin.Mocha.Lavender.zip {{CURL_OUT}} "$HOME/Downloads/vivaldi-dark.zip" # Catppuccino Mocha Lavender + + +zotero: + {{CURL}} https://github.com/syt2/zotero-addons/releases/download/V1.8.1/zotero-addons.xpi {{CURL_OUT}} "$HOME/Downloads/zotero-addons.xpi" + + diff --git a/.just.d/tools.just b/.just.d/tools.just new file mode 100644 index 0000000..7f17c9b --- /dev/null +++ b/.just.d/tools.just @@ -0,0 +1,55 @@ +[unix] +kitty: + which kitty + {{LN}} {{DOTFILES}}/tools/kitty {{XDG_CONFIG_HOME}}/kitty + +neovim: + which nvim + {{LN}} {{DOTFILES}}/tools/nvim {{XDG_CONFIG_HOME}}/nvim + nvim --headless +checkhealth +"w nvim-healthcheck.txt" +qall + +nvim: + @just neovim + +[linux] +bash: + {{LN}} {{DOTFILES}}/tools/bash {{XDG_CONFIG_HOME}}/bash + sudo cp {{DOTFILES}}/tools/bash/xdg-compat.sh /etc/profile.d/xdg-compat.sh + +[unix] +fish: + {{LN}} {{DOTFILES}}/tools/fish {{XDG_CONFIG_HOME}}/fish + {{CURL}} https://raw.githubusercontent.com/SpaceAceMonkey/dotenv-for-fish/refs/heads/main/dotenv.fish {{CURL_OUT}} "{{DOTFILES}}/tools/fish/functions/dotenv.fish" + +[unix] +screen: + {{LN}} {{DOTFILES}}/tools/screen {{XDG_CONFIG_HOME}}/screen + +thunderbird: + {{CURL}} https://github.com/wshanks/tbkeys/releases/download/v2.4.0/tbkeys.xpi {{CURL_OUT}} "$HOME/Downloads/tbkeys.xpi" + {{CURL}} https://github.com/htyxyt/htyxyt-immersive-translate-Thunderbird/releases/download/thunderbird-v1.14.8/immersive-translate-Thunderbird.v1.14.8.xpi {{CURL_OUT}} "$HOME/Downloads/immersive-translate-Thunderbird.xpi" + cat {{DOTFILES}}/tools/thunderbird/tbkeys.json | {{CLIP}} + +wezterm: + which wezterm + {{LN}} {{DOTFILES}}/tools/wezterm {{XDG_CONFIG_HOME}}/wezterm + + +yazi: + which yazi || cargo install --locked yazi-fm yazi-cli + -ya pack -a llanosrocas/yaziline + -ya pack -a yazi-rs/plugins:git + -ya pack -a Rolv-Apneseth/starship + +[unix] +zsh: + -[[ -f /etc/zshenv ]] && sudo cp {{DOTFILES}}/tools/zsh/global.zshenv /etc/zshenv # or /etc/zsh/zshenv + -[[ -f /etc/zsh/zshenv ]] && sudo cp {{DOTFILES}}/tools/zsh/global.zshenv /etc/zsh/zshenv + mkdir -p {{XDG_CONFIG_HOME}}/zsh + {{LN}} {{DOTFILES}}/tools/zsh/zshenv {{XDG_CONFIG_HOME}}/zsh/.zshenv + {{LN}} {{DOTFILES}}/tools/zsh/zshrc {{XDG_CONFIG_HOME}}/zsh/.zshrc + {{LN}} {{DOTFILES}}/tools/zsh/zprofile {{XDG_CONFIG_HOME}}/zsh/.zprofile + test -d {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-autosuggestions || git clone --depth 1 https://github.com/zsh-users/zsh-autosuggestions.git {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-autosuggestions + test -d {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-syntax-highlighting || git clone --depth 1 https://github.com/zsh-users/zsh-syntax-highlighting.git {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-syntax-highlighting + test -d {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-history-substring-search || git clone --depth 1 https://github.com/zsh-users/zsh-history-substring-search.git {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-history-substring-search + test -d {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-completions || git clone --depth 1 https://github.com/zsh-users/zsh-completions.git {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-completions diff --git a/.just.d/vars.just b/.just.d/vars.just new file mode 100644 index 0000000..5fd1146 --- /dev/null +++ b/.just.d/vars.just @@ -0,0 +1,42 @@ +OS := \ + if os() == "linux" { + if env("WSL_DISTRO_NAME","") != "" { + "wsl" + } else { + "linux" + } + } else if os() == "windows" { + "win" + } else if os() == "macos" { + "mac" + } else { "" } +DOTFILES := join(home_directory(), ".dotfiles") +XDG_CONFIG_HOME := \ + if env("XDG_CONFIG_HOME", "") != "" {env("XDG_CONFIG_HOME", "")} \ + else { + if os_family() == "windows" { + env("APPDATA") + } else { + join(home_directory(), ".config") + } + } + +XDG_DATA_HOME := \ + if env("XDG_DATA_HOME", "") != "" {env("XDG_DATA_HOME", "")} \ + else { + if os_family() == "windows" { + env("LOCALAPPDATA", "") + } else { + join(home_directory(), ".local/share") + } + } + +XDG_STATE_HOME := \ + if env("XDG_STATE_HOME", "") != "" {env("XDG_STATE_HOME", "")} \ + else { + if os_family() == "windows" { + join(env("LOCALAPPDATA", ""), "state") + } else { + join(home_directory(), ".local/state") + } + } diff --git a/Justfile b/Justfile index 70cdb76..e81b300 100644 --- a/Justfile +++ b/Justfile @@ -2,250 +2,14 @@ set shell := ["bash", "-c"] set windows-shell := ["pwsh", "-c"] +import '.just.d/vars.just' +import '.just.d/cmds.just' +import '.just.d/common.just' +import '.just.d/tools.just' +import '.just.d/misc.just' +import '.just.d/linux.just' +import '.just.d/check.just' -OS := \ - if os() == "linux" { - if env("WSL_DISTRO_NAME","") != "" { - "wsl" - } else { - "linux" - } - } else if os() == "windows" { - "win" - } else if os() == "macos" { - "mac" - } else { "" } -DOTFILES := join(home_directory(), ".dotfiles") -XDG_CONFIG_HOME := \ - if env("XDG_CONFIG_HOME", "") != "" {env("XDG_CONFIG_HOME", "")} \ - else { - if os_family() == "windows" { - env("APPDATA") - } else { - join(home_directory(), ".config") - } - } - -XDG_DATA_HOME := \ - if env("XDG_DATA_HOME", "") != "" {env("XDG_DATA_HOME", "")} \ - else { - if os_family() == "windows" { - env("LOCALAPPDATA", "") - } else { - join(home_directory(), ".local/share") - } - } - -XDG_STATE_HOME := \ - if env("XDG_STATE_HOME", "") != "" {env("XDG_STATE_HOME", "")} \ - else { - if os_family() == "windows" { - join(env("LOCALAPPDATA", ""), "state") - } else { - join(home_directory(), ".local/state") - } - } - -# Sudo and coreutils are required -LN := \ - if os_family() == "windows" { - "sudo ln -sf" - } else { - "ln -sf" - } -CLIP := \ - if os() == "windows" { "clip.exe" } \ - else if os() == "linux" { "wl-copy" } \ - else if os() == "macos" { "pbcopy" } \ - else { "" } - - -test: - echo {{DOTFILES}} - echo {{XDG_CONFIG_HOME}} - echo {{XDG_DATA_HOME}} - -init: - git remote remove origin - git remote add github git@github.com:js0ny/dotfiles.git - git remote add codeberg git@codeberg.org:js0ny/dotfiles.git - -check: - @just check_shell -format: - @just format_shell -push: - git push github master - git push codeberg master - -setup: - @just ideavim - @just vivaldi - -ideavim: - ln -sf {{DOTFILES}}/common/ideavimrc {{XDG_CONFIG_HOME}}/ideavim/ideavimrc - git clone https://github.com/MarcoIeni/intellimacs {{join(home_directory(), ".local/share/intellimacs")}} --depth 1 - -[unix] -vivaldi: - curl -L https://github.com/SocietasEvanescentes/Vivaldi/files/12446831/Rose.Pine.Dawn.zip -o "$HOME/Downloads/vivaldi-light.zip" # Rose Pine Dawn - curl -L https://github.com/catppuccin/vivaldi/releases/download/1.0.0-ctpv2/Catppuccin.Mocha.Lavender.zip -o "$HOME/Downloads/vivaldi-dark.zip" # Catppuccino Mocha Lavender - - -[linux] -systemd: - ln -sf {{DOTFILES}}/platforms/{{OS}}/systemd {{XDG_CONFIG_HOME}}/systemd/ - - -uv: - uv init {{XDG_DATA_HOME}}/uvenv - cd {{XDG_DATA_HOME}}/uvenv - uv venv - uv add -r {{DOTFILES}}/bootstrap/components/requirements.txt - -[unix] -vim: - mkdir -p {{XDG_DATA_HOME}}/vim/after - mkdir -p {{XDG_STATE_HOME}}/vim/{backup,swap,undo,view} - mkdir -p {{XDG_CONFIG_HOME}}/vim/ - ln -sf {{DOTFILES}}/common/vimrc {{XDG_CONFIG_HOME}}/vim/vimrc - - -[windows] -vim: - New-Item -ItemType SymbolicLink -Path $HOME/_vimrc -Value {{DOTFILES}}/common/vim.noxdg.vimrc - -yazi: - which yazi || cargo install --locked yazi-fm yazi-cli - -ya pack -a llanosrocas/yaziline - -ya pack -a yazi-rs/plugins:git - -ya pack -a Rolv-Apneseth/starship - -wezterm: - which wezterm - {{LN}} {{DOTFILES}}/tools/wezterm {{XDG_CONFIG_HOME}}/wezterm/wezterm.lua - -neovim: - which nvim - {{LN}} {{DOTFILES}}/tools/nvim {{XDG_CONFIG_HOME}}/nvim - nvim --headless +checkhealth +"w nvim-healthcheck.txt" +qall - -[unix] -neovide: - which neovide - -mkdir -p {{XDG_CONFIG_HOME}}/neovide - {{LN}} {{DOTFILES}}/platforms/{{OS}}/neovide.toml {{XDG_CONFIG_HOME}}/neovide/config.toml - -[unix] -thunderbird: - curl -L https://github.com/wshanks/tbkeys/releases/download/v2.4.0/tbkeys.xpi -o "$HOME/Downloads/tbkeys.xpi" - curl -L https://github.com/htyxyt/htyxyt-immersive-translate-Thunderbird/releases/download/thunderbird-v1.14.8/immersive-translate-Thunderbird.v1.14.8.xpi -o "$HOME/Downloads/immersive-translate-Thunderbird.xpi" - cat {{DOTFILES}}/tools/thunderbird/tbkeys.json | {{CLIP}} - -[linux] -readline: - mkdir -p {{XDG_CONFIG_HOME}}/readline - {{LN}} {{DOTFILES}}/common/inputrc {{XDG_CONFIG_HOME}}/readline/inputrc - -[linux] -bash: - {{LN}} {{DOTFILES}}/tools/bash {{XDG_CONFIG_HOME}}/bash - sudo cp {{DOTFILES}}/tools/bash/xdg-compat.sh /etc/profile.d/xdg-compat.sh - -[linux] -keyd: - -which keyd || sudo pacman -S keyd --noconfirm || sudo apt install keyd --yes || @just build_keyd - sudo cp {{DOTFILES}}/platforms/linux/keyd/keyd.conf /etc/keyd/default.conf - mkdir -p {{XDG_CONFIG_HOME}}/keyd - {{LN}} {{DOTFILES}}/platforms/linux/keyd/app.conf {{XDG_CONFIG_HOME}}/keyd/app.conf - sudo systemctl enable keyd - -[linux] -[private] -build_keyd: - git clone https://github.com/rvaiya/keyd $HOME/.local/build/keyd - cd $HOME/.local/build/keyd && make && sudo make install - -[unix] -kitty: - which kitty - {{LN}} {{DOTFILES}}/tools/kitty {{XDG_CONFIG_HOME}}/kitty - -[unix] -zotero: - curl -L https://github.com/syt2/zotero-addons/releases/download/V1.8.1/zotero-addons.xpi -o "$HOME/Downloads/zotero-addons.xpi" - -[unix] -fish: - {{LN}} {{DOTFILES}}/tools/fish {{XDG_CONFIG_HOME}}/fish - curl -L https://raw.githubusercontent.com/SpaceAceMonkey/dotenv-for-fish/refs/heads/main/dotenv.fish -o "{{DOTFILES}}/tools/fish/functions/dotenv.fish" - -[unix] -screen: - {{LN}} {{DOTFILES}}/tools/screen {{XDG_CONFIG_HOME}}/screen - -[unix] -zsh: - -[[ -f /etc/zshenv ]] && sudo cp {{DOTFILES}}/tools/zsh/global.zshenv /etc/zshenv # or /etc/zsh/zshenv - -[[ -f /etc/zsh/zshenv ]] && sudo cp {{DOTFILES}}/tools/zsh/global.zshenv /etc/zsh/zshenv - mkdir -p {{XDG_CONFIG_HOME}}/zsh - {{LN}} {{DOTFILES}}/tools/zsh/zshenv {{XDG_CONFIG_HOME}}/zsh/.zshenv - {{LN}} {{DOTFILES}}/tools/zsh/zshrc {{XDG_CONFIG_HOME}}/zsh/.zshrc - {{LN}} {{DOTFILES}}/tools/zsh/zprofile {{XDG_CONFIG_HOME}}/zsh/.zprofile - test -d {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-autosuggestions || git clone --depth 1 https://github.com/zsh-users/zsh-autosuggestions.git {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-autosuggestions - test -d {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-syntax-highlighting || git clone --depth 1 https://github.com/zsh-users/zsh-syntax-highlighting.git {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-syntax-highlighting - test -d {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-history-substring-search || git clone --depth 1 https://github.com/zsh-users/zsh-history-substring-search.git {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-history-substring-search - test -d {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-completions || git clone --depth 1 https://github.com/zsh-users/zsh-completions.git {{XDG_CONFIG_HOME}}/zsh/plugins/zsh-completions - -[linux] -flatpak: - flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo - -[linux] -swaylock: - mkdir -p {{XDG_CONFIG_HOME}}/swaylock - {{LN}} {{DOTFILES}}/platforms/linux/swaylock {{XDG_CONFIG_HOME}}/swaylock/config - -[linux] -dunst: - mkdir -p {{XDG_CONFIG_HOME}}/dunst - {{LN}} {{DOTFILES}}/platforms/linux/dunstrc {{XDG_CONFIG_HOME}}/dunst/dunstrc - -[linux] -hypr: - {{LN}} {{DOTFILES}}/platforms/linux/hypr {{XDG_CONFIG_HOME}}/hypr - -[linux] -rofi: - {{LN}} {{DOTFILES}}/platforms/linux/rofi {{XDG_CONFIG_HOME}}/rofi - -[linux] -hyprland: - @just hypr - @just dunst - @just swaylock - @just rofi - -[private] -pull: - git pull github master - - -[private] -[unix] -check_shell: - shellcheck -x -s sh --severity=error **/*.sh platforms/mac/yabairc - shellcheck -x -s bash --severity=error **/*.bash tools/bash/* **/*.bashrc - -[private] -[unix] -format_shell: - shfmt -w -i 2 -ci -bn -p **/*.sh - shfmt -w -i 2 -ci -bn -ln bash **/*.bash platforms/mac/sketchybar/sketchybarrc - # Ignore syntax errors in zsh files - shfmt -w -i 2 -ci -bn -ln bash **/*.zsh tools/zsh/**/* **/zshrc || true - -[private] -check_info: - shellcheck -x -s sh **/*.sh platforms/mac/yabairc - shellcheck -x -s bash **/*.bash tools/bash/* scripts/*.{sh,zsh,bash} **/*.bashrc +_default: + @just test + @just --list diff --git a/common/fzfrc b/common/fzfrc new file mode 100644 index 0000000..a2beb38 --- /dev/null +++ b/common/fzfrc @@ -0,0 +1,10 @@ +# --preview 'bat --color=always --style=numbers {}' +--bind alt-n:preview-down,alt-e:preview-up +--bind ctrl-e:up +--bind alt-p:toggle-preview +--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 +--color=fg:#cdd6f4,header:#f38ba8,info:#f5c2e7,pointer:#f5e0dc +--color=marker:#b4befe,fg+:#cdd6f4,prompt:#f5c2e7,hl+:#f38ba8 +--color=selected-bg:#45475a +--color=border:#313244,label:#cdd6f4 + diff --git a/platforms/linux/hypr/hyprland.conf b/platforms/linux/hypr/hyprland.conf index d440d50..12e9f70 100644 --- a/platforms/linux/hypr/hyprland.conf +++ b/platforms/linux/hypr/hyprland.conf @@ -15,6 +15,10 @@ # ####################################################################################### $mainMod = SUPER # Sets "Windows" key as main modifier +$terminal = kitty +$fileManager = dolphin +$menu = rofi +$iconTheme = Papirus source=~/.config/hypr/hyprland/dark.conf source=~/.config/hypr/hyprland/+colemak.conf @@ -53,10 +57,6 @@ monitor=DP-2,3840x2160@60,0x0,1.667 # See https://wiki.hyprland.org/Configuring/Keywords/ # Set programs that you use -$terminal = kitty -$fileManager = dolphin -$menu = rofi -$iconTheme = Papirus ################# diff --git a/readme.org b/readme.org index 8748069..66c7dea 100644 --- a/readme.org +++ b/readme.org @@ -8,12 +8,31 @@ Works for Windows, Linux and MacOS. ** Setup -*** GNU/Linux and macOS + +*** From Scratch (Linux/MacOS) #+begin_src shell curl https://raw.githubusercontent.com/js0ny/dotfiles/refs/heads/master/bootstrap/setup.sh -o setup.sh && chmod u+x setup.sh && ./setup.sh #+end_src +*** Via =just= script + +Make sure you have =just= installed + +#+begin_src shell +which just +#+end_src + +Then run + +#+begin_src shell +just +#+end_src + +This will list all available tasks. + +All the just scripts are in =Justfile= and under =.just.d/= directory. + ** Structure #+begin_src shell