diff --git a/config/X11/xinitrc b/config/X11/xinitrc index 1ed2bcf7..3bf1e909 100755 --- a/config/X11/xinitrc +++ b/config/X11/xinitrc @@ -5,7 +5,7 @@ xwallpaper --zoom ~/.local/share/dotfiles/images/wallpaper.jpg & picom --config ~/.config/picom/picom.conf & # libinput-gestures & #discord --start-minimized & -xrandr --output HDMI-2 --mode 2560x1440 --refresh 120 +xrandr --output DP-2 --mode 2560x1440 --refresh 170 export _JAVA_AWT_WM_NONREPARENTING=1 conky & unclutter & diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index b134de74..8ba4ad19 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -6,7 +6,7 @@ xsetroot -cursor_name left_ptr & # bspc monitor eDP1 -d I II III IV V VI VII VIII IX X # bspc monitor HDMI1 -d XI XII XIII XIV XV XVI XVII XVIII XIX XX -bspc monitor HDMI-2 -d I II III IV V VI VII VIII IX X +bspc monitor DP-2 -d I II III IV V VI VII VIII IX X bspc config border_width 2 diff --git a/config/fish/config.fish b/config/fish/config.fish index 03e658f2..a9a6f175 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -11,3 +11,5 @@ export CARGO_TARGET_DIR="$HOME/.local/share/cargo-target" # The next line updates PATH for the Google Cloud SDK. if [ -f '/Users/fs0c131y/Projects/gcloud/google-cloud-sdk/path.fish.inc' ]; . '/Users/fs0c131y/Projects/gcloud/google-cloud-sdk/path.fish.inc'; end + +macchina diff --git a/config/fish/fish_variables b/config/fish/fish_variables index d3a692ff..4bcc1c89 100644 --- a/config/fish/fish_variables +++ b/config/fish/fish_variables @@ -50,6 +50,7 @@ SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrbl SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_greeting: SETUVAR fish_key_bindings:fish_default_key_bindings SETUVAR fish_pager_color_completion:\x1d SETUVAR fish_pager_color_description:B3A06D\x1eyellow diff --git a/config/macchina/archlinux.ascii b/config/macchina/archlinux.ascii new file mode 100644 index 00000000..3032e570 --- /dev/null +++ b/config/macchina/archlinux.ascii @@ -0,0 +1,15 @@ +              ..              +              cl              +             :ooc             +            ;oooo:            +           .looooo:           +          ;c;:looooc          +         :ooooooooooc         +        :ooooooooooool        +       coooool;;loooool.      +     .looooo'    .oooooo.     +    .ooooooc      ;oooocl'    +   'ooooooo:      'ooooo:,    +  ,oool:,..        ..,:looo;  + :c,.                    .,c: +..                          .' diff --git a/config/macchina/art.ascii b/config/macchina/art.ascii new file mode 100644 index 00000000..53f04b2d --- /dev/null +++ b/config/macchina/art.ascii @@ -0,0 +1,29 @@ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣀⣠⠤⡤⣄⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⣴⣶⣶⠞⠋⢡⠀⠀⠀⢠⡀⠀⠉⠙⠲⢤⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⢞⣉⡴⢁⡾⠁⠀⠀⢸⡆⠀⠀⠀⠉⠳⣦⡀⠀⠈⠋⠳⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⢀⡴⢟⡿⠋⠈⠀⣼⠁⠀⠀⠀⠈⢳⡀⠀⠀⠀⠀⠀⠙⢶⣄⠀⠀⠀⠙⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⣠⠟⢄⡞⠀⠀⠀⢨⡏⠀⠀⠀⠀⠀⠈⢷⠀⠀⠀⠀⠀⠀⠀⠙⢦⡀⠀⠂⠈⢳⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⣠⠿⢀⡞⠀⠀⠀⠀⢻⡇⠀⠀⠀⣀⣀⢀⡈⣇⠀⠀⠀⠀⠀⠀⠀⠀⠳⡄⠀⠀⠀⢻⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⢠⠟⠀⣾⠀⠀⠀⠐⠲⣼⡇⢀⠀⣾⡏⢹⣷⡀⢹⡄⠀⠀⠀⠀⠀⠀⠀⠀⠹⡆⠀⠀⠀⢷⡀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⣾⠀⢸⠇⠀⢀⣀⣀⣠⠿⠿⠾⠷⢾⡇⢸⡟⠋⠛⠋⠉⠉⠙⠓⠒⠲⠶⠦⣼⢽⡄⠀⠀⠘⣇⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⣼⠋⠀⣿⠛⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠛⠛⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⠠⢿⡀⠀⠀⢻⡀⠀⠀⠀⠀⠀⠀⠀ +⠀⢀⣿⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⠀⠈⡷⢄⠀⢸⣇⠀⠀⠀⠀⠀⠀⠀ +⠀⢸⠁⠸⢹⢹⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣶⠀⢹⡀⠀⠈⣿⠀⠀⠀⠀⠀⠀⠀ +⠀⣼⠀⠀⣿⣽⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠨⣿⢦⡜⢷⠄⠀⣿⡄⠀⠀⠀⠀⠀⠀ +⢀⡏⠀⠀⣿⢺⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⡿⠀⠀⠀⠀⠀⢻⡇⠀⠀⠀⠀⠀⠀ +⢸⡇⠀⠀⣿⢼⡇⠀⠀⠀⠀⠀⢀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡀⠀⠀⠀⠀⠀⠀⠀⣇⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ +⣾⣿⠀⡀⢹⣼⡇⠀⠀⠀⠀⠀⣿⣿⠆⠀⠀⠐⠒⠒⠒⠀⠀⢼⣿⡷⠀⠀⠀⠀⠀⠀⡇⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ +⣿⣿⣄⢣⠸⣿⡇⠀⠀⠀⠀⠀⠈⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠁⠀⠀⠀⠀⠀⠀⡇⠀⠈⢳⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ +⣿⡇⣏⡄⣧⢺⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⠀⠀⢸⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀ +⣿⣿⣿⡃⠈⠈⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⢰⠀⢸⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀ +⢹⣧⢻⡆⠀⠀⢻⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⢸⠀⢸⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ +⢸⣿⢸⡇⢠⣀⠻⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⡿⠀⢸⠀⠀⢺⣷⠀⠀⠀⠀⠀⠀ +⠈⣿⣆⡇⠀⢹⠀⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣧⡇⠀⢸⠀⠀⢸⢸⠀⠀⠀⠀⠀⠀ +⠀⠸⣿⣧⠀⣾⡟⡷⢤⣤⣤⠴⣶⣶⣶⠶⣶⣶⣖⣲⠒⢒⣒⣶⣶⣷⣾⠒⣶⢲⠒⠲⣿⠇⠀⢸⠀⠄⣾⢸⠀⠀⠀⠀⠀⠀ +⠀⠀⠹⣿⡄⢸⡇⢹⡄⠀⢹⠀⢸⡀⢾⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⡿⢻⠀⣿⢸⡄⠀⡞⠀⠀⢸⢀⡄⣿⢺⡆⠀⠀⠀⠀⠀ +⠀⠀⠀⠙⣿⠀⡇⠐⣇⠀⢸⠀⠈⣇⢸⣇⣬⣿⣿⣹⣿⣿⣿⣿⠟⠀⢸⣤⣏⢸⠆⢠⡇⠀⠀⢸⠀⠁⢯⢸⣷⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⣿⡆⣧⠀⠹⡄⠘⡇⠀⣿⣿⣿⣿⡟⢿⣿⣿⠿⠟⠁⠀⠀⠸⣿⣿⣿⣀⣾⠀⠀⠀⠸⠀⠀⠸⡖⢹⡀⠀⠀⠀⠀ +⠀⠀⠀⠀⢻⠀⣿⠀⠀⢧⢠⣧⣼⣿⣿⣿⠛⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⢹⣿⢹⣿⣶⣶⣤⣀⡀⠀⠀⢻⠘⡇⠀⠀⠀⠀ +⠀⠀⠀⠀⢸⠀⣹⣠⣴⣾⣾⣿⣿⣿⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⡿⣸⣿⣿⣿⣿⣿⣿⣿⣶⣾⣤⣷⠀⠀⠀⠀ +⠀⠀⣀⣠⠾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣇⠀⢀⣀⣀⣤⣄⣀⠀⠀⣾⣿⣷⣿⣿⣿⣿⠿⢿⣿⣿⣿⣿⣽⣿⣿⣷⣤⡀ +⣴⣿⣿⣿⣷⣶⣤⣤⣌⣙⣛⡻⠿⣿⣿⣿⣿⣿⡟⢛⣋⣉⣁⣈⡛⡿⣾⣿⣿⣿⣿⠟⣋⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇ diff --git a/config/macchina/art.ascii.bak b/config/macchina/art.ascii.bak new file mode 100644 index 00000000..c789c6c5 --- /dev/null +++ b/config/macchina/art.ascii.bak @@ -0,0 +1,8 @@ +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNWMMMMMMMMMMMMMM +MMMMMMMMMMMWX0kOOO0XMMMMMMMMMM +MMMMMMMMMMMKk0OO0kOk0MMMMMMMMM +MMMMMMMMMMXkOXNXX00xOMMMMMMMMM +MMMMMMMMMM0kXMWXN0OKXMMMMMMMMM diff --git a/config/macchina/image.png b/config/macchina/image.png new file mode 100644 index 00000000..cd221f53 Binary files /dev/null and b/config/macchina/image.png differ diff --git a/config/macchina/macchina.toml b/config/macchina/macchina.toml new file mode 100644 index 00000000..d9188712 --- /dev/null +++ b/config/macchina/macchina.toml @@ -0,0 +1,5 @@ +long_shell = true +long_uptime = true +current_shell = true +physical_cores = true +theme = "Beryllium" diff --git a/config/macchina/themes/Beryllium.toml b/config/macchina/themes/Beryllium.toml new file mode 100644 index 00000000..cada9749 --- /dev/null +++ b/config/macchina/themes/Beryllium.toml @@ -0,0 +1,47 @@ +# Beryllium +spacing = 1 +# hide_ascii = true +key_color = "#FB6B90" +separator = "" + +[box] +border = "double" +visible = true + +[palette] +glyph = "○ " +visible = true + +# [bar] +# glyph = "○" +# hide_delimiters = false +# visible = true + +[box.inner_margin] +x = 2 +y = 1 + +[custom_ascii] +# color = "#FF7001" +# path = "~/.config/macchina/image.png" +path = "~/.config/macchina/archlinux.ascii" + +[keys] +host = "Host" +kernel = "Kernel" +battery = "Battery" +os = "OS" +de = "DE" +wm = "WM" +distro = "Distro" +terminal = "Terminal" +shell = "Shell" +packages = "Packages" +uptime = "Uptime" +memory = "Memory" +machine = "Machine" +local_ip = "Local IP" +backlight = "Brightness" +resolution = "Resolution" +cpu_load = "CPU Load" +cpu = "CPU" diff --git a/config/macchina/themes/Hydrogen.toml b/config/macchina/themes/Hydrogen.toml new file mode 100644 index 00000000..5280ec20 --- /dev/null +++ b/config/macchina/themes/Hydrogen.toml @@ -0,0 +1,51 @@ +# Hydrogen + +spacing = 2 +padding = 0 +hide_ascii = true +separator = ">" +key_color = "Cyan" +separator_color = "White" + +[palette] +type = "Full" +visible = false + +[bar] +glyph = "ߋ" +symbol_open = '[' +symbol_close = ']' +hide_delimiters = true +visible = true + +[box] +border = "plain" +visible = true + +[box.inner_margin] +x = 1 +y = 0 + +[randomize] +key_color = false +separator_color = false + +[keys] +host = "Host" +kernel = "Kernel" +battery = "Battery" +os = "OS" +de = "DE" +wm = "WM" +distro = "Distro" +terminal = "Terminal" +shell = "Shell" +packages = "Packages" +uptime = "Uptime" +memory = "Memory" +machine = "Machine" +local_ip = "Local IP" +backlight = "Brightness" +resolution = "Resolution" +cpu_load = "CPU Load" +cpu = "CPU" diff --git a/config/picom/picom.conf b/config/picom/picom.conf index 34051d86..7382f164 100644 --- a/config/picom/picom.conf +++ b/config/picom/picom.conf @@ -168,10 +168,8 @@ detect-client-opacity = true; # Specify refresh rate of the screen. # If not specified or 0, picom will try detecting this with X RandR extension. -refresh-rate = 0; # Vertical synchronization: match the refresh rate of the monitor -vsync = true; # Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing. # Reported to have no effect, though. diff --git a/config/tmux/start-tmux b/config/tmux/start-tmux index 6e742a89..ed7cce6b 100755 --- a/config/tmux/start-tmux +++ b/config/tmux/start-tmux @@ -1,7 +1,7 @@ #!/bin/sh live_sessions=$(tmux list-sessions 2>/dev/null) -all_sessions=$(gfind ~/.config/tmux/sessions -type f -executable -printf '%f\n'| sort) +all_sessions=$(find ~/.config/tmux/sessions -type f -executable -printf '%f\n'| sort) TMUX_SESSIONS="$HOME/.config/tmux/sessions" # for some reason ~/.config/tmux/session doesn't work if made with quotes # TMUX_SESSIONS=$XDG_CONFIG_HOME/tmux/sessions diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index 10ae2a61..954cc7f3 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -18,7 +18,7 @@ set -g @plugin 'dracula/tmux' # load plugin manager run -b '~/.config/tmux/plugins/tpm/tpm' -set -g default-shell '/opt/homebrew/bin/fish' +set -g default-shell 'fish' set -g default-terminal 'tmux-256color' set -ga terminal-overrides ',*256col*:Tc' set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' diff --git a/config/wezterm/wezterm.lua b/config/wezterm/wezterm.lua index 8e8c7af5..1af18159 100644 --- a/config/wezterm/wezterm.lua +++ b/config/wezterm/wezterm.lua @@ -1,7 +1,7 @@ local wezterm = require 'wezterm'; return { - font = wezterm.font_with_fallback {"Hasklug Nerd Font", "Hasklug Nerd Font Mono"}, + font = wezterm.font_with_fallback { "Hasklug Nerd Font", "Hasklug Nerd Font Mono" }, font_size = 16, colors = { -- The default text color @@ -35,13 +35,14 @@ return { -- to this color to give a visual cue about the compose state. compose_cursor = "orange", }, + initial_cols = 120, hide_tab_bar_if_only_one_tab = true, window_background_opacity = 0.8, cursor_blink_rate = 880, default_cursor_style = "BlinkingBlock", default_prog = { "fish", "-l" }, window_padding = { - left = 0, + left = 2, right = 0, top = 2, bottom = 0, diff --git a/setup/setup-linux.sh b/setup/setup-linux.sh new file mode 100644 index 00000000..19831e94 --- /dev/null +++ b/setup/setup-linux.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +## I mostly use archlinux so this will be for archlinux + +pacman -S base-devel zoxide fd bat exa fish neovim unzip p7zip # will add more later + +## Install paru +git clone https://aur.archlinux.org/paru ~/.cache/paru/clone/paru +pushd ~/.cache/paru/clone/paru +makepkg -si +popd + +## Install plymouth +paru -S plymouth-git + +## Install a plymouth theme +git clone https://github.com/uttarayan21/plymouth-theme-archmac +pushd plymouth-theme-archmac +makepkg -si +popd + +## Install some few more things +