diff --git a/README.md b/README.md deleted file mode 100644 index e2fca81..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Marco's Dotfiles - -my dots diff --git a/README.org b/README.org new file mode 100644 index 0000000..203fa3c --- /dev/null +++ b/README.org @@ -0,0 +1,36 @@ +#+TITLE:my dots + +dots for my lenovo yoga slim 7i pro γ€Œitomori」 + +[[./screen.png]] + +* an incomplete list of dependencies: +** main environment ++ emacs πŸ’œ ++ i3-gaps ++ alacritty ++ zsh ++ dunst ++ picom ++ polybar ++ rofi ++ xlock +** main programs ++ discord ++ spotify ++ seafile-applet ++ keepassxc ++ okular / zathura +** control stuff ++ [[https://github.com/bulletmark/libinput-gestures][libinput-gestures]] ++ amixer ++ playerctl ++ light ++ feh ++ [[https://github.com/marcothms/enact/tree/new_primary][enact]] ++ nm-applet ++ xdotool ++ wmctrl +** special stuff ++ fcitx5 (with mozc) ++ hunspell DE diff --git a/files/.Xresources b/files/.Xresources index 8f6f118..3cad8e0 100644 --- a/files/.Xresources +++ b/files/.Xresources @@ -1,3 +1,5 @@ +Xft.dpi: 180 + ! Font XTerm.vt100.faceName: xft:SFMono Nerd Font Mono:antialias=true XTerm.vt100.faceSize: 10 diff --git a/files/.config/dunst/dunstrc b/files/.config/dunst/dunstrc index c10a97d..d5cabb8 100644 --- a/files/.config/dunst/dunstrc +++ b/files/.config/dunst/dunstrc @@ -4,23 +4,24 @@ monitor = 0 follow = mouse - geometry = "400x6-30+60" + width = 400 + origin = "top-center" + offset = "0x80" indicate_hidden = yes shrink = no - notification_height = 15 separator_height = 1 transparency = 0 - padding = 10 - horizontal_padding = 10 - frame_width = 0 - frame_color = "#aaaaaa" + padding = 8 + horizontal_padding = 8 + frame_width = 2 + frame_color = "#A6CC70" separator_color = frame sort = yes idle_threshold = 120 # Text - font = JuliaMono 12 + font = JuliaMono 10 line_height = 04 markup = full format = "%s %p\n%b" @@ -36,8 +37,8 @@ # Icons icon_position = left - min_icon_size = 48 - max_icon_size = 96 + min_icon_size = 16 + max_icon_size = 48 icon_path = /usr/share/icons/Papirus/48x48/status/:/usr/share/icons/Papirus/48x48/devices/:/usr/share/icons/Papirus/48x48/apps/ # History @@ -48,32 +49,22 @@ # Misc always_run_script = true - startup_notification = false - verbosity = mesg - corner_radius = 2 + corner_radius = 0 force_xinerama = false mouse_left_click = do_action mouse_middle_click = close_all mouse_right_click = close_current -[shortcuts] - close = ctrl+Escape - history = ctrl+shift+Escape - context = ctrl+shift+period - - [urgency_low] background="#ffffff" foreground="#050505" - timeout = 7 - + timeout = 3 [urgency_normal] background="#ffffff" foreground="#050505" - timeout = 10 - + timeout = 3 [urgency_critical] background="#ffffff" diff --git a/files/.config/i3/config b/files/.config/i3/config index 18d1865..5d99d39 100644 --- a/files/.config/i3/config +++ b/files/.config/i3/config @@ -1,11 +1,12 @@ set $mod Mod4 -font pango:JuliaMono 12 +font pango:JuliaMono 10 floating_modifier $mod # applications bindsym $mod+Return exec --no-startup-id alacritty -bindsym $mod+d exec --no-startup-id rofi -show drun +bindsym $mod+d exec --no-startup-id rofi -theme ~/.config/rofi/light.rasi -show drun bindsym $mod+Shift+s exec --no-startup-id flameshot gui +bindsym XF86Calculator exec --no-startup-id emacs # audio and brightness bindsym XF86AudioMute exec --no-startup-id amixer -q set Master toggle @@ -17,6 +18,10 @@ bindsym XF86AudioPrev exec --no-startup-id playerctl previous bindsym XF86MonBrightnessUp exec --no-startup-id light -A 5 bindsym XF86MonBrightnessDown exec --no-startup-id light -U 5 +# notifications +bindsym Ctrl+space exec --no-startup-id dunstctl close +bindsym Ctrl+Shift+space exec --no-startup-id dunstctl history-pop + # kill focused window bindsym $mod+Shift+BackSpace kill @@ -53,9 +58,6 @@ bindsym $mod+Shift+space floating toggle # workspace layout workspace_layout stacked -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - # workspaces set $ws1 "1" set $ws2 "2" @@ -92,6 +94,9 @@ bindsym $mod+Shift+8 move container to workspace $ws8 bindsym $mod+Shift+9 move container to workspace $ws9 bindsym $mod+Shift+0 move container to workspace $ws10 +bindsym $mod+Left workspace prev +bindsym $mod+Right workspace next + # reload the configuration file bindsym $mod+Shift+c reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) @@ -121,19 +126,20 @@ client.urgent $red $red $white $red $black for_window [class="Nautilus"] floating enable for_window [class="Pavucontrol"] floating enable for_window [title="Event Tester"] floating enable +for_window [class="flameshot"] floating enable # border hide_edge_borders smart for_window [class="^.*"] border pixel 0 # bar -exec_always --no-startup-id /home/marc/dots/scripts/polybar.sh +exec_always --no-startup-id ~/dots/scripts/polybar.sh # gaps gaps inner 10 # wallpaper -exec_always --no-startup-id feh --bg-fill /home/marc/data/Seafile/images/wallpaper/life_and_death.png +exec_always --no-startup-id feh --bg-fill ~/data/Seafile/images/wallpaper/wallpaper.png # startup exec --no-startup-id nm-applet @@ -141,6 +147,7 @@ exec --no-startup-id keepassxc exec --no-startup-id seafile-applet exec --no-startup-id fcitx5 exec --no-startup-id picom --backend glx --no-vsync -exec --no-startup-id enact --watch --pos top +exec --no-startup-id enact --watch --pos top -n 1 +exec --no-startup-id libinput-gestures-setup start -exec_always --no-startup-id notify-send -i ~/.emacs.d/dashboard.png "γ‚ˆγ‚γ—γγƒžγƒ«γ‚³γ•γ‚“οΌ" "γ€Œi3γ€γΈγ‚ˆγ†γ“γγ€‚" +exec_always --no-startup-id notify-send -i ~/data/Seafile/images/anime/dashboard.png "γ‚ˆγ‚γ—γγƒžγƒ«γ‚³γ•γ‚“οΌ" "γ€Œi3γ€γΈγ‚ˆγ†γ“γγ€‚" \ No newline at end of file diff --git a/files/.config/libinput-gestures.conf b/files/.config/libinput-gestures.conf new file mode 100644 index 0000000..ace1a44 --- /dev/null +++ b/files/.config/libinput-gestures.conf @@ -0,0 +1,7 @@ +gesture: swipe left 3 xdotool key super+Left +gesture: swipe right 3 xdotool key super+Right +gesture: swipe up 3 xdotool key super+f +gesture: swipe down 3 xdotool key super+f + +gesture: swipe left 4 xdotool key alt+Left +gesture: swipe right 4 xdotool key alt+Right \ No newline at end of file diff --git a/files/.config/picom/picom.conf b/files/.config/picom/picom.conf index 4451a82..511fcab 100644 --- a/files/.config/picom/picom.conf +++ b/files/.config/picom/picom.conf @@ -1,11 +1,11 @@ -corner-radius = 8; +# corner-radius = 40; -rounded-corners-exclude = [ - "class_g = 'i3bar'", - "class_g = 'Polybar'", -]; +# rounded-corners-exclude = [ +# "class_g = 'i3bar'", +# "class_g = 'Polybar'", +# ]; -detect-rounded-corners = true +# detect-rounded-corners = true shadow = true; shadow-radius = 15; diff --git a/files/.config/polybar/config b/files/.config/polybar/config index 3bed675..32a8191 100644 --- a/files/.config/polybar/config +++ b/files/.config/polybar/config @@ -6,9 +6,9 @@ red = #ff3333 [bar/bar] -font-0 = "JuliaMono:pixelsize=10;3" -font-1 = "Noto Sans Mono CJK JP:pixelsize=10;1" -font-2 = "FontAwesome:pixelsize=10;3" +font-0 = "JuliaMono:pixelsize=10;4" +font-1 = "Noto Sans Mono CJK JP:pixelsize=10;3" +font-2 = "FontAwesome:pixelsize=10;4" monitor = ${env:MON} @@ -18,7 +18,9 @@ scroll-down = i3wm-wsnext fixed-center = true width = 100% -height = 30 +height = 50 + +dpi = ${xrdb:Xft.dpi:-1} background = ${colors.white} foreground = ${colors.black} @@ -26,6 +28,8 @@ foreground = ${colors.black} bottom = false tray-position = right +tray-scale = 1.0 +tray-maxsize = 25 line-size = 4 @@ -34,8 +38,8 @@ padding-right = 1 module-margin = 1 modules-left = logo i3 polywins -modules-center = date time -modules-right = backlight pulseaudio battery +modules-center = +modules-right = time date backlight pulseaudio battery conservation [module/i3] strip-wsnumbers = true @@ -45,17 +49,28 @@ wrapping-scroll = false type = internal/i3 format = -label-focused = %index% +ws-icon-0 = 1;δΈ€ +ws-icon-1 = 2;二 +ws-icon-2 = 3;δΈ‰ +ws-icon-3 = 4;ε›› +ws-icon-4 = 5;δΊ” +ws-icon-5 = 6;ε…­ +ws-icon-6 = 7;δΈƒ +ws-icon-7 = 8;ε…« +ws-icon-8 = 9;九 +ws-icon-9 = 10;十 + +label-focused = %icon% label-focused-background = ${colors.green} label-focused-padding = 1 -label-unfocused = %index% +label-unfocused = %icon% label-unfocused-padding = 1 -label-visible = %index% +label-visible = %icon% label-visible-padding = 1 -label-urgent = %index% +label-urgent = %icon% label-urgent-overline = ${colors.red} label-urgent-padding = 1 @@ -67,7 +82,7 @@ date =  %a, %d %b [module/time] type = internal/date interval = 1.0 -date = ο€— %I:%M %p +date = ο€— %H:%M [module/pulseaudio] type = internal/pulseaudio @@ -93,23 +108,17 @@ content-padding = 1 [module/battery] type = internal/battery -battery = BAT0 +battery = BAT1 adapter = ADP1 time-format = %H:%M # charging -format-charging = -label-charging = %percentage% - %time% -animation-charging-0 =  -animation-charging-1 =  -animation-charging-2 =  -animation-charging-3 =  -animation-charging-4 =  -animation-charging-framerate = 750 +format-charging = +label-charging = %percentage%%  # discharging format-discharging = -label-discharging = %percentage% +label-discharging = %percentage%% - %time% ramp-capacity-0 =  ramp-capacity-1 =  ramp-capacity-2 =  @@ -117,11 +126,19 @@ ramp-capacity-3 =  ramp-capacity-4 =  # full -label-full =  100 +label-full =  100% + +[module/conservation] +type = custom/script +exec = cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004:00/conservation_mode +click-left = alacritty --command ~/dots/scripts/conservation_mode.sh +format =