diff --git a/.bashrc b/.bashrc new file mode 100644 index 0000000..361d5f4 --- /dev/null +++ b/.bashrc @@ -0,0 +1,14 @@ +if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then + XDG_CURRENT_DESKTOP=sway dbus-run-session sway +fi + +HISTFILE=~/.bash_history +HISTSIZE=100 +SAVEHIST=200 + +eval "$(zoxide init --cmd cd bash)" + +export PATH="$HOME/.local/bin:$PATH" +alias ls="ls -a --color" +alias update_world='doas emerge --ask --update --newuse --deep @world' +alias senv="sh /home/andrew/personal/dotfiles/env_linux.sh" diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini new file mode 100644 index 0000000..bf49c58 --- /dev/null +++ b/.config/foot/foot.ini @@ -0,0 +1,50 @@ +# -*- conf -*- +# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) +# term=foot (or xterm-256color if built with -Dterminfo=disabled) +app-id=foot +title=foot +# font=Maple Mono Semibold:size=10 +font=Iosevka NF Semibold:size=11 +pad=6x6 center-when-maximized-and-fullscreen + +[cursor] +# style=block +# blink=no +# blink-rate=500 +# beam-thickness=1.5 +# underline-thickness= + +[mouse] +hide-when-typing=yes + +[touch] +# long-press-delay=400 + +[colors] +background=222436 +foreground=c8d3f5 +cursor=c8d3f5 + +regular0=1b1d2b # black +regular1=ff757f # red +regular2=c3e88d # green +regular3=ffc777 # yellow +regular4=82aaff # blue +regular5=c099ff # magenta +regular6=86e1fc # cyan +regular7=828bb8 # white + +bright0=444a73 # bright black +bright1=ff757f # bright red +bright2=c3e88d # bright green +bright3=ffc777 # bright yellow +bright4=82aaff # bright blue +bright5=c099ff # bright magenta +bright6=86e1fc # bright cyan +bright7=c8d3f5 # bright white + +selection-foreground=c8d3f5 +selection-background=2d3f76 +select-row=BTN_LEFT-4 + +# vim: ft=dosini diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index c9f98a8..6fd292f 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -16,14 +16,13 @@ require("lazy").setup({ { "echasnovski/mini.pairs", version = '*' }, { "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } }, { "saghen/blink.cmp", version = "v1.*", opts = {} }, - { "DarthMooMancer/Polydev", - url = "git@100.106.127.109:DarthMooMancer/polydev.git", + { dir = "/home/andrew/personal/polydev/", opts = { terminal = { - mode = "floating", + mode = "split", } } }, - { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", + { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", branch = "master", config = function() require("nvim-treesitter.configs").setup({ highlight = { enable = true }, @@ -91,7 +90,7 @@ vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" }) vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") -vim.keymap.set("n", "ff", "ggVG=") +vim.keymap.set("n", "ff", vim.lsp.buf.format) vim.keymap.set("n", "", "zz") vim.keymap.set("n", "", "zz") vim.keymap.set("x", "p", [["_dP]]) diff --git a/.config/starship.toml b/.config/starship.toml index 02097e4..14d91b3 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -1,3 +1,5 @@ +"$schema" = 'https://starship.rs/config-schema.json' + format = """ $username\ $hostname\ @@ -7,14 +9,15 @@ $git_state\ $git_status\ $cmd_duration\ $line_break\ +$python\ $character""" [directory] style = "blue" [character] -success_symbol = "[>](purple)" -error_symbol = "[?](red)" +success_symbol = "[❯](purple)" +error_symbol = "[❯](red)" vimcmd_symbol = "[❮](green)" [git_branch] @@ -24,13 +27,13 @@ style = "bright-black" [git_status] format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)" style = "cyan" -conflicted = "!" -untracked = "?" -modified = "*" -staged = "+" -renamed = ">" -deleted = "-" -stashed = "~" +conflicted = "​" +untracked = "​" +modified = "​" +staged = "​" +renamed = "​" +deleted = "​" +stashed = "≡" [git_state] format = '\([$state( $progress_current/$progress_total)]($style)\) ' @@ -39,3 +42,9 @@ style = "bright-black" [cmd_duration] format = "[$duration]($style) " style = "yellow" + +[python] +format = "[$virtualenv]($style) " +style = "bright-black" +detect_extensions = [] +detect_files = [] diff --git a/.config/sway/bgs/samurai/Ice-River.png b/.config/sway/bgs/samurai/Ice-River.png new file mode 100644 index 0000000..f82c877 Binary files /dev/null and b/.config/sway/bgs/samurai/Ice-River.png differ diff --git a/.config/sway/bgs/samurai/cliff_with_tree.png b/.config/sway/bgs/samurai/cliff_with_tree.png deleted file mode 100644 index 41fefef..0000000 Binary files a/.config/sway/bgs/samurai/cliff_with_tree.png and /dev/null differ diff --git a/.config/sway/bgs/samurai/orange_and_red_fire.png b/.config/sway/bgs/samurai/orange_and_red_fire.png deleted file mode 100644 index 22d5269..0000000 Binary files a/.config/sway/bgs/samurai/orange_and_red_fire.png and /dev/null differ diff --git a/.config/sway/config b/.config/sway/config index c28163b..2810bc5 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -1,8 +1,9 @@ -for_window [app_id="com.mitchellh.ghostty"] move container to workspace 1 -for_window [app_id="librewolf"] move container to workspace 2 +exec --no-startup-id dbus-update-activation-environment --all + +for_window [app_id="foot"] move container to workspace 1 +for_window [app_id="chromium"] move container to workspace 2 for_window [class="steam"] move container to workspace 3 for_window [app_id="org.prismlauncher.PrismLauncher"] move container to workspace 3 -for_window [app_id="thunar"] move container to workspace 4 for_window [instance="engine"] floating enable font pango: Maple Mono SemiBold 10 @@ -10,7 +11,9 @@ default_border pixel 0 gaps inner 5 gaps outer 2 -exec_always gentoo-pipewire-launcher +exec_always pipewire & +exec_always wireplumber & +exec_always pipewire-pulse & exec_always sh -c 'if ! tmux has-session -t Home 2>/dev/null; then tmux new-session -d -s Home; fi' exec_always sh -c 'pkill swaybg && img="$(find /home/andrew/.config/sway/bgs/samurai -type f | shuf -n1)" && swaybg -m fill -i "$img" &' @@ -24,11 +27,10 @@ input "1133:50504:Logitech_USB_Receiver_Mouse" { set $mod Mod1 floating_modifier $mod normal -bindsym $mod+Return exec ghostty -e tmux a +bindsym $mod+Return exec foot -e tmux a bindsym $mod+Shift+s exec steam -bindsym $mod+f exec librewolf +bindsym $mod+f exec firefox-bin bindsym $mod+p exec prismlauncher -bindsym $mod+t exec thunar bindsym $mod+k kill bindsym $mod+Shift+c reload bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' @@ -36,15 +38,13 @@ bindsym $mod+1 workspace number 1 bindsym $mod+2 workspace number 2 bindsym $mod+3 workspace number 3 bindsym $mod+4 workspace number 4 -bindsym $mod+5 workspace number 5 bindsym $mod+Shift+1 move container to workspace number 1 bindsym $mod+Shift+2 move container to workspace number 2 bindsym $mod+Shift+3 move container to workspace number 3 bindsym $mod+Shift+4 move container to workspace number 4 -bindsym $mod+Shift+5 move container to workspace number 5 -bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle -bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% -bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% +bindsym --locked XF86AudioMute exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindsym --locked XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bindsym --locked XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ include /etc/sway/config.d/* diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index de6dc75..af39292 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -3,8 +3,8 @@ set -g prefix M-, bind M-, send-prefix set -g focus-events on -set-option -g default-terminal "tmux-256color" -set-option -as terminal-features ',xterm-ghostty:RGB' +set -g default-terminal "screen-256color" +set -ga terminal-features ',foot:RGB' set-option -g default-shell $SHELL set -g status-style 'fg=#ff757f bg=default' diff --git a/.zshrc b/.zshrc index 8c3fe5a..f73b5a6 100644 --- a/.zshrc +++ b/.zshrc @@ -1,6 +1,6 @@ if [[ $(uname) != "Darwin" ]]; then if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then - dbus-run-session sway + XDG_CURRENT_DESKTOP=sway dbus-run-session sway fi bindkey "^[[1;5C" forward-word bindkey "^[[1;5D" backward-word @@ -30,19 +30,17 @@ autoload -Uz _zinit export PATH="$HOME/.local/bin:$PATH" alias ls="ls -a --color" -alias grep="rg" +# alias grep="rg" if [[ $(uname) != "Darwin" ]]; then alias update_world='doas emerge --ask --update --newuse --deep @world' alias env="sh /home/andrew/personal/dotfiles/env_linux.sh" - myfetch.sh +else + alias env='sh ~/personal/dotfiles/env_mac.sh' + export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" + export PATH="$(brew --prefix llvm)/bin:$PATH" export HOMEBREW_NO_AUTO_UPDATE=1 export HOMEBREW_NO_ENV_HINTS=1 export HOMEBREW_DISPLAY_INSTALL_TIMES=0 export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=1 export HOMEBREW_NO_EMOJI=1 -else - alias env='sh ~/personal/dotfiles/env_mac.sh' - export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" - export PATH="$(brew --prefix llvm)/bin:$PATH" - export GOOGLE_CLOUD_PROJECT="development-477121" fi diff --git a/env_linux.sh b/env_linux.sh index a41f031..058a3a4 100755 --- a/env_linux.sh +++ b/env_linux.sh @@ -17,6 +17,7 @@ ORIGINAL_DOTS=( "${DOTFILES_CONFIG}sway/" "${DOTFILES_CONFIG}tmux/" "${DOTFILES_CONFIG}ghostty/" + "${DOTFILES_CONFIG}foot/" "${DOTFILES_CONFIG}starship.toml" "${DOTFILES_LOCAL}share/fonts/" "${DOTFILES_LOCAL}bin/" @@ -27,6 +28,7 @@ COPY_DOTS=( "${CONFIG}sway/" "${CONFIG}tmux/" "${CONFIG}ghostty/" + "${CONFIG}foot/" "${CONFIG}starship.toml" "${LOCAL}share/fonts/" "${LOCAL}bin/"