From 799d7f392561c385a2810c04f7c841c7b84dc41a Mon Sep 17 00:00:00 2001 From: Benjamin Morrison Date: Tue, 25 Jan 2022 14:32:50 -0500 Subject: changes for new machine --- .config/alacritty/alacritty.yml | 6 ++++-- .config/fish/config.fish | 13 ++----------- .config/fish/fish_variables | 18 +++++++++--------- .config/git/config | 4 ++-- .config/i3/config | 11 ++++++----- .config/polybar/config | 4 ++-- .config/sway/config | 16 +++++++++------- 7 files changed, 34 insertions(+), 38 deletions(-) (limited to '.config') diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 1769e0a..5e10e1d 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -43,6 +43,8 @@ window: # When true, alacritty starts maximized. startup_mode: Maximized + opacity: 0.90 + scrolling: # Maximum number of lines in the scrollback buffer. # Specifying '0' will disable scrolling. @@ -110,7 +112,7 @@ font: style: Italic # Point size - size: 8.5 + size: 5.0 # Offset is the extra space around each character. `offset.y` can be thought of # as modifying the line spacing, and `offset.x` as modifying the letter spacing. @@ -205,7 +207,7 @@ bell: # # Window opacity as a floating point number from `0.0` to `1.0`. # The value `0.0` is completely transparent and `1.0` is opaque. -background_opacity: 0.90 +#background_opacity: 0.90 # Mouse bindings # diff --git a/.config/fish/config.fish b/.config/fish/config.fish index b41f51b..78b2ab5 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -16,12 +16,6 @@ ulimit -n 8096 function ls command /usr/bin/ls --color=auto $argv end -function less - command ~/.cargo/bin/bat -p $argv -end -function more - command ~/.cargo/bin/bat -p $argv -end function pip command /usr/bin/pip3 $argv end @@ -31,9 +25,6 @@ end function pkgs command /usr/bin/apt search --names-only $argv end -function cat - command bat $argv -end # misc dev commandes function rebase @@ -116,8 +107,8 @@ set -x HUB_CONFIG $HOME/.config/hub set -x HUB_PROTOCOL ssh # pyenv -status is-login; and pyenv init --path | source -status is-interactive; and pyenv init - | source +#status is-login; and pyenv init --path | source +#status is-interactive; and pyenv init - | source # rust env #set -x RUST_SRC_PATH ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 4f9f771..8fec0ec 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,14 +1,14 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:3100 -SETUVAR fish_color_autosuggestion:777777 +SETUVAR fish_color_autosuggestion:555\x1ebrblack SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:00FF00 -SETUVAR fish_color_comment:30BE30 +SETUVAR fish_color_command:005fd7 +SETUVAR fish_color_comment:990000 SETUVAR fish_color_cwd:green SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:FF7B7B -SETUVAR fish_color_error:A40000 +SETUVAR fish_color_end:009900 +SETUVAR fish_color_error:ff0000 SETUVAR fish_color_escape:00a6b2 SETUVAR fish_color_history_current:\x2d\x2dbold SETUVAR fish_color_host:normal @@ -16,9 +16,9 @@ SETUVAR fish_color_host_remote:yellow SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue SETUVAR fish_color_normal:normal SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:30BE30 -SETUVAR fish_color_quote:44FF44 -SETUVAR fish_color_redirection:7BFF7B +SETUVAR fish_color_param:00afff +SETUVAR fish_color_quote:999900 +SETUVAR fish_color_redirection:00afff SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red @@ -26,7 +26,7 @@ SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_greeting:\x1d SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_completion:\x1d SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/.config/git/config b/.config/git/config index 712cd8e..625c842 100644 --- a/.config/git/config +++ b/.config/git/config @@ -21,5 +21,5 @@ [pull] rebase = false [core] - attributesFile = ~/.gitattributes - excludesFile = ~/.gitignore + attributesFile = ~/.gitattributes_global + excludesFile = ~/.gitignore_global diff --git a/.config/i3/config b/.config/i3/config index d999797..6966a85 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -15,6 +15,7 @@ exec_always "sh $HOME/.fehbg" exec_always --no-startup-id $HOME/.config/polybar/launch.sh exec "xcompmgr &" exec "xscreensaver &" +exec "blueman-applet" exec "pactl upload-sample /usr/share/sounds/freedesktop/stereo/bell.oga x11-bell" exec "pactl load-module module-x11-bell sample=x11-bell display=$DISPLAY" exec "xset b 100" @@ -53,7 +54,7 @@ floating_modifier $mod bindsym $mod+m bar mode toggle # start a terminal -bindsym $mod+Shift+Return exec st +bindsym $mod+Shift+Return exec xterm bindsym $mod+Return exec alacritty bindsym XF86AudioMute exec "amixer -D pulse sset Master toggle" @@ -61,8 +62,8 @@ bindsym XF86AudioLowerVolume exec "amixer -D pulse sset Master 5%-" bindsym XF86AudioRaiseVolume exec "amixer -D pulse sset Master 5%+" bindsym XF86AudioMicMute exec "amixer -D pulse sset Mic toggle" #bindsym XF86Sleep exec dmenu_run -bindsym XF86MonBrightnessDown exec "xbacklight -dec 5" -bindsym XF86MonBrightnessUp exec "xbacklight -inc 5" +bindsym XF86MonBrightnessDown exec "brightnessctl s 15-" +bindsym XF86MonBrightnessUp exec "brightnessctl s +15" bindsym Print exec "scrot ~/screens/$(date +%Y-%m-%d-%H:%M:%S).png" #bindsym $mod+c exec "xterm -e cataclysm" @@ -172,9 +173,9 @@ bindsym $mod+Shift+e exec "i3-msg exit" #lock screen #bindsym $mod+Shift+Delete exec "i3lock -c 000000 -i img/freebsd-green.jpg" -bindsym $mod+Shift+Delete exec "i3lock -c 000000 -i img/locked.png" +bindsym $mod+Shift+Delete exec "xscreensaver-command -lock" #sleep -bindsym $mod+Shift+End exec "sudo zzz" +bindsym $mod+Shift+End exec "systemctl suspend" # resize window (you can also use the mouse for that) mode "resize" { diff --git a/.config/polybar/config b/.config/polybar/config index 65cf220..4228df7 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -19,7 +19,7 @@ padding-right = 0 module-margin-left = 1 module-margin-right = 2 -font-0 = "Source Code Pro Semibold:size=10;1" +font-0 = "Fira Code:size=10;1" font-1 = "Font Awesome 5 Free:style=Solid:size=10;1" font-2 = "Font Awesome 5 Brands:size=10;1" @@ -28,7 +28,7 @@ modules-center = modules-right = cpu memory rootfs cputemp batt1 batt0 wlan eth date tray-position = right -tray-padding = 1 +tray-padding = 2 ;wm-restack = i3 ;override-redirect = true diff --git a/.config/sway/config b/.config/sway/config index d5354b5..779fc76 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -14,11 +14,12 @@ set $down j set $up k set $right l # Your preferred terminal emulator -set $term alacritty +set $term $HOME/.nix-profile/bin/alacritty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. set $menu dmenu_path | dmenu | xargs swaymsg exec -- +#set $menu /usr/bin/wofi | xargs swaymsg exec -- ### Output configuration # @@ -202,17 +203,18 @@ bindsym $mod+r mode "resize" # # Read `man 5 sway-bar` for more information about this section. bar { + swaybar_command waybar position top # When the status_command prints a new line to stdout, swaybar updates. # The default just shows the current date and time. - status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done + #status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done - colors { - statusline #ffffff - background #323232 - inactive_workspace #32323200 #32323200 #5c5c5c - } + #colors { + # statusline #ffffff + # background #323232 + # inactive_workspace #32323200 #32323200 #5c5c5c + #} } include /etc/sway/config.d/* -- cgit 1.4.1