diff --git a/awesome/init.fnl b/awesome/init.fnl index f5c0897..0768b41 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -64,12 +64,12 @@ (local alt "Mod1") ;; Set hostname so that we can utilize specific features on different machines +(global laptop true) (awful.spawn.easy_async "hostname" (fn [ stdout stderr reason exit_code ] (if (= "chris-linuxlaptop\n" stdout) (global laptop true) (naughty.notify {:text "didn't set"})))) -(if laptop (naughty.notify {:text "yayyayayayayayyay"})) -(naughty.notify {:text (tostring laptop)}) +(if laptop (naughty.notify {:text "laptop detected"})) ;; Table of layouts to cover with awful.layout.inc, order matters. (set awful.layout.layouts [ diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index c46d535..216e7b4 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -14,9 +14,10 @@ (let [cb (or ?callback (fn [] nil))] (awful.spawn.easy_async_with_shell "pamixer --get-volume-human" cb))) -(if (= "chris-linuxlaptop" (awful.spawn "hostname")) - (global bwmenu "bwmenu -- -config /home/chris/.dotfiles/rofi/launchers-git/laptop.rasi") - (global bwmenu "bwmenu -- -config /home/chris/.dotfiles/rofi/launchers-git/desktop.rasi")) +(awful.spawn.easy_async "cat /etc/hostname" (fn [ stdout stderr reason exit_code ] + (if (= "chris-linuxlaptop\n" stdout) + (global bwmenu "bwmenu -- -config /home/chris/.dotfiles/rofi/launchers-git/laptop.rasi") + (global bwmenu "bwmenu -- -config /home/chris/.dotfiles/rofi/launchers-git/desktop.rasi")))) (local keybindings { diff --git a/fish/config.fish b/fish/config.fish index 73f4339..4c927e9 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,6 +1,6 @@ #!/usr/bin/env fish -set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/.doom-emacs/bin +set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/.doom-emacs/bin $HOME/.emacs.d/bin set TERM "xterm-256color" set EDITOR "emacsclient -t -a" set VISUAL "emacsclient -c -a emacs" diff --git a/fish/fish_variables b/fish/fish_variables index 9a5fd6e..28e76eb 100644 --- a/fish/fish_variables +++ b/fish/fish_variables @@ -30,4 +30,4 @@ 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 -SETUVAR fish_user_paths:/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2edoom\x2demacs/bin +SETUVAR fish_user_paths:/home/chris/\x2elocal/bin\x1e/home/chris/scripts\x1e/home/chris/\x2edoom\x2demacs/bin\x1e/home/chris/\x2eemacs\x2ed/bin diff --git a/polybar/config b/polybar/config index 041cd9e..1ea5775 100644 --- a/polybar/config +++ b/polybar/config @@ -21,64 +21,56 @@ background = #282a36 background-alt = #34353e ;foreground = ${xrdb:color7:#222} -foreground = #e3e4e5 -foreground-alt = #a5a5a9 -primary = #ff9f43 -secondary = #57c7ff +foreground = #a5a5a9 +foreground-alt = #e2e4e5 +primary = #57c7ff +secondary = #f3f99d alert = #ff5c57 +green= #5af78e -[bar/main] +[bar/float] ;monitor = ${env:MONITOR:HDMI-1} width = 100% -height = 27 -; offset-x = 6% -offset-y = 0.5% -radius = 12.0 +height = 60 +;offset-x = 1% +;offset-y = 1% +radius = 28.0 fixed-center = true bottom = true background = ${colors.background} foreground = ${colors.foreground} -line-size = 2 -line-color = ${colors.secondary} +line-size = 3 +line-color = #f00 -border-size = 4 +border-size = 15 border-color = #00000000 -padding-left = 0 +padding-left = 13 padding-right = 2 module-margin-left = 1 -module-margin-right = 2 +module-margin-right = 1 -font-0 = "fixed:pixelsize=12;1" -font-1 = "Unifont:style=Sans-Serif:size=12:antialias=false;0" -font-2 = "Wuncon Siji:pixelsize=12;1" -font-3 = "Recursive Sans Linear Light:size=10;1" -font-4 = "Noto Sans:size=10;1" -font-5 = "Noto Color Emoji:style=Regular:size=10;1" +font-0 = VictorMono Nerd Font Mono:size=20;1 +font-1 = unifont:fontformat=truetype:size=19:antialias=false;0 +font-2 = siji:pixelsize=30;1 +font-3 = all-the-icons:size=40;1 -modules-left = xwindow -modules-center = date -modules-right = filesystem pulseaudio memory cpu eth temperature powermenu +modules-left = exwm-buffer-name +modules-center = date +modules-right = filesystem exwm-mail xbacklight pulseaudio memory cpu wlan battery powermenu tray-position = center -tray-detatched = false -tray-padding = 4 -tray-maxsize = 16 -tray-scale = 1 -tray-offset-x = 200 -tray-offset-y = 1 -tray-background = ${colors.background} -tray-radius = 12.0 - -enable-ipc = true +tray-padding = 5 +tray-maxsize = 30 +tray-offset-x = -1400 ;wm-restack = bspwm ;wm-restack = i3 -override-redirect = false +;override-redirect = true ;scroll-up = bspwm-desknext ;scroll-down = bspwm-deskprev @@ -89,30 +81,24 @@ override-redirect = false cursor-click = pointer cursor-scroll = ns-resize -[settings] +enable-ipc = true -throttle-output = 5 -throttle-output-for = 10 -throttle-input-for = 30 +[module/exwm-buffer-name] +type = custom/ipc +hook-0 = emacsclient -e "(buffer-name)" +initial = 1 +format-foreground = ${colors.primary} -screenchange-reload = false - -compositing-background = source -compositing-foreground = over -compositing-overline = over -compositing-underline = over -compositing-border = over - -;compositing-background = xor -;compositing-background = screen -;compositing-foreground = source -;compositing-border = over - -pseudo-transparency = false +[module/exwm-mail] +type = custom/ipc +hook-0 = emacsclient -e "mu4e-alert-mode-line" +initial = 1 +format-prefix = " " +format-prefix-foreground = ${colors.secondary} [module/xwindow] type = internal/xwindow -label = " %title:0:30:...%" +label = %title:0:30:...% [module/xkeyboard] type = internal/xkeyboard @@ -140,86 +126,13 @@ label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%% label-unmounted = %mountpoint% not mounted label-unmounted-foreground = ${colors.foreground-alt} -; [module/bspwm] -; type = internal/bspwm - -; label-focused = %index% -; label-focused-background = ${colors.background-alt} -; label-focused-underline= ${colors.primary} -; label-focused-padding = 2 - -; label-occupied = %index% -; label-occupied-padding = 2 - -; label-urgent = %index%! -; label-urgent-background = ${colors.alert} -; label-urgent-padding = 2 - -; label-empty = %index% -; label-empty-foreground = ${colors.foreground-alt} -; label-empty-padding = 2 - -; Separator in between workspaces -; label-separator = | - -; [module/i3] -; type = internal/i3 -; format = -; index-sort = true -; wrapping-scroll = false - -; ; Only show workspaces on the same output as the bar -; ;pin-workspaces = true - -; label-mode-padding = 2 -; label-mode-foreground = #000 -; label-mode-background = ${colors.primary} - -; ; focused = Active workspace on focused monitor -; label-focused = %index% -; label-focused-background = ${colors.background-alt} -; label-focused-underline= ${colors.primary} -; label-focused-padding = 2 - -; ; unfocused = Inactive workspace on any monitor -; label-unfocused = %index% -; label-unfocused-padding = 2 - -; ; visible = Active workspace on unfocused monitor -; label-visible = %index% -; label-visible-background = ${self.label-focused-background} -; label-visible-underline = ${self.label-focused-underline} -; label-visible-padding = ${self.label-focused-padding} - -; ; urgent = Workspace with urgency hint set -; label-urgent = %index% -; label-urgent-background = ${colors.alert} -; label-urgent-padding = 2 - -; ; Separator in between workspaces -; ; label-separator = | - - -; [module/mpd] -; type = internal/mpd -; format-online = - -; icon-prev =  -; icon-stop =  -; icon-play =  -; icon-pause =  -; icon-next =  - -; label-song-maxlen = 24 -; label-song-ellipsis = true - [module/xbacklight] type = internal/xbacklight format =