diff --git a/roles/core/templates/.i3/config b/roles/core/templates/.i3/config index ab6af70..83128c7 100644 --- a/roles/core/templates/.i3/config +++ b/roles/core/templates/.i3/config @@ -42,8 +42,8 @@ bindsym $mod+z exec --no-startup-id morc_menu ## sound-section - DO NOT EDIT if you wish to automatically upgrade Alsa -> Pulseaudio later! ## ################################################################################################ -exec --no-startup-id volumeicon -##bindsym $mod+Ctrl+m exec terminal -e 'alsamixer' +#exec --no-startup-id volumeicon +#bindsym $mod+Ctrl+m exec terminal -e 'alsamixer' #exec --no-startup-id "pulseaudio --start" #exec --no-startup-id pa-applet bindsym $mod+Ctrl+m exec pavucontrol @@ -56,7 +56,7 @@ bindsym $mod+Ctrl+m exec pavucontrol # Start Applications bindsym $mod+Ctrl+b exec terminal -e 'bmenu' -bindsym $mod+F2 exec palemoon +bindsym $mod+F2 exec firefox bindsym $mod+F3 exec pcmanfm # bindsym $mod+F3 exec ranger bindsym $mod+Shift+F3 exec gksu pcmanfm @@ -70,7 +70,7 @@ bindsym $mod+Shift+Print --release exec --no-startup-id i3-scrot -s bindsym $mod+Shift+h exec xdg-open /usr/share/doc/manjaro/i3_help.pdf bindsym $mod+Ctrl+x --release exec --no-startup-id xkill -# focus_follows_mouse no +focus_follows_mouse no # change focus bindsym $mod+j focus left @@ -147,15 +147,15 @@ bindsym $mod+Shift+m move workspace to output down # to display names or symbols instead of plain workspace numbers you can use # something like: set $ws1 1:mail # set $ws2 2: -set $ws1 1 -set $ws2 2 -set $ws3 3 -set $ws4 4 -set $ws5 5 -set $ws6 6 -set $ws7 7 -set $ws8 8 -set $ws9 9 +set $ws1 "1:Mail:" +set $ws2 "2:Browser:" +set $ws3 "3:Dev:" +set $ws4 "4:Misc.1:" +set $ws5 "5:Misc.2:" +set $ws6 "6:Misc.3:" +set $ws7 "7:Misc.4:" +set $ws8 "8:Misc.5:" +set $ws9 "9:Spotify:" # switch to workspace bindsym $mod+1 workspace $ws1 @@ -185,15 +185,15 @@ bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2 bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3 bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4 bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5 -bindsym $mod+Shift+- move container to workspace $ws6; workspace $ws6 +bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6 bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7 bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8 bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 # Open applications on specific workspaces -# assign [class="Thunderbird"] $ws1 -# assign [class="Pale moon"] $ws2 -# assign [class="Pcmanfm"] $ws3 +assign [class="Thunderbird"] $ws1 +assign [class="firefox"] $ws2 +assign [class="Pcmanfm"] $ws9 # assign [class="Skype"] $ws5 # Open specific applications in floating mode @@ -219,7 +219,7 @@ for_window [class="qt5ct"] floating enable sticky enable border normal for_window [class="Qtconfig-qt4"] floating enable sticky enable border normal for_window [class="Simple-scan"] floating enable border normal for_window [class="(?i)System-config-printer.py"] floating enable border normal -for_window [class="Skype"] floating enable border normal +#for_window [class="Skype"] floating enable border normal for_window [class="Timeset-gui"] floating enable border normal for_window [class="Oracle VM Virtualbox Manager"] floating enable border normal for_window [class="Xfburn"] floating enable @@ -242,7 +242,7 @@ bindsym $mod+Shift+s exec "~/.bin/switch_mono_screen.sh; nitrogen --restore && i bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" # Set shut down, restart and locking features -bindsym $mod+0 mode "$mode_system" +bindsym $mod+Delete mode "$mode_system" set $mode_system (l)ock, (e)xit, switch_(u)ser, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown mode "$mode_system" { bindsym l exec --no-startup-id i3exit lock, mode "default" @@ -289,11 +289,11 @@ exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec --no-startup-id nitrogen --restore; #exec --no-startup-id nitrogen --restore; sleep 1; compton -b #exec --no-startup-id manjaro-hello -exec --no-startup-id nm-applet +#exec --no-startup-id nm-applet exec --no-startup-id xfce4-power-manager -exec --no-startup-id pamac-tray +# exec --no-startup-id pamac-tray # exec --no-startup-id blueman-applet -# exec_always --no-startup-id sbxkb +# exec_alwa#ys --no-startup-id sbxkb exec --no-startup-id start_conky_maia # exec --no-startup-id start_conky_green # exec --no-startup-id xautolock -time 10 -locker blurlock @@ -331,32 +331,48 @@ set_from_resource $term_color13 color13 set_from_resource $term_color14 color14 set_from_resource $term_color15 color15 -# Start i3bar to display a workspace bar (plus the system information i3status if available) -bar { - i3bar_command i3bar - status_command i3status - position bottom +# Use pactl to adjust volume in PulseAudio. +set $refresh_i3status killall -SIGUSR1 i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status +# Start i3bar to display a workspace bar (plus the system information i3status if available) +#bar { +# i3bar_command i3bar +# status_command i3status +# position bottom ## please set your primary output first. Example: 'xrandr --output eDP1 --primary' - tray_output primary +# tray_output primary # tray_output eDP1 +# bindsym button4 nop +# bindsym button5 nop +# font xft:URWGothic-Book, Icons 11 +# strip_workspace_numbers yes +# colors { +# background #222D31 +# statusline #F9FAF9 +# separator #454947 +# border backgr. text +# focused_workspace #3498db #3498db #292F34 +# active_workspace #595B5B #353836 #FDF6E3 +# inactive_workspace #595B5B #222D31 #EEE8D5 +# binding_mode #3498db #2C2C2C #F9FAF9 +# urgent_workspace #3498db #FDF6E3 #E5201D +# } +#} - bindsym button4 nop - bindsym button5 nop - font xft:URWGothic-Book, Icons 11 - strip_workspace_numbers yes - +bar { + font pango:Inconsolata, Font Awesome 6 Free 14px + position bottom + status_command i3status-rs ~/.i3/config.toml colors { - background #222D31 - statusline #F9FAF9 - separator #454947 - -# border backgr. text - focused_workspace {{ theme.color.normal.highlight }} {{ theme.color.normal.highlight }} #292F34 - active_workspace #595B5B #353836 #FDF6E3 - inactive_workspace #595B5B #222D31 #EEE8D5 - binding_mode {{ theme.color.normal.highlight }} #2C2C2C #F9FAF9 - urgent_workspace {{ theme.color.normal.highlight }} #FDF6E3 #E5201D + background #2e3440 + focused_workspace #0088CC #0088CC #ffffff + active_workspace #333333 #333333 #ffffff + inactive_workspace #333333 #2e3440 #888888 + urgent_workspace #2f343a #900000 #ffffff } } @@ -365,10 +381,10 @@ bar { # Theme colors # class border backgr. text indic. child_border - client.focused {{ theme.color.focus.background }} {{ theme.color.focus.background }} {{ theme.color.focus.highlight }} #FDF6E3 - client.focused_inactive {{ theme.color.normal.background }} {{ theme.color.normal.background }} {{ theme.color.normal.highlight }} #454948 - client.unfocused {{ theme.color.normal.background }} {{ theme.color.normal.background }} {{ theme.color.normal.highlight }} #454948 - client.urgent #CB4B16 #FDF6E3 {{ theme.color.normal.highlight }} #268BD2 + client.focused #496d86 #496d86 #FDF6E3 #FDF6E3 + client.focused_inactive #2F3D44 #2F3D44 #3498db #454948 + client.unfocused #2F3D44 #2F3D44 #3498db #454948 + client.urgent #CB4B16 #FDF6E3 #3498db #268BD2 client.placeholder #000000 #0c0c0c #ffffff #000000 client.background #2B2C2B @@ -428,4 +444,4 @@ mode "$mode_gaps_outer" { bindsym Return mode "default" bindsym Escape mode "default" -} +} \ No newline at end of file diff --git a/roles/core/templates/.i3/config.toml b/roles/core/templates/.i3/config.toml index 31e3fcd..2d436c9 100644 --- a/roles/core/templates/.i3/config.toml +++ b/roles/core/templates/.i3/config.toml @@ -1,10 +1,10 @@ -theme = "solarized-dark" +theme = "nord-dark" icons = "awesome5" [[block]] block = "memory" -format_mem = "{mem_used;M:6}/{mem_total;M:6}" -format_swap = "{swap_used;M:6}/{swap_total;M:6}" +format_mem = "{mem_used:6}/{mem_total:6}" +format_swap = "{swap_used:6}/{swap_total:6}" display_type = "memory" icons = true clickable = true @@ -19,25 +19,23 @@ block = "cpu" interval = 1 format = "{utilization}" -[[block]] -block = "nvidia_gpu" -label = "GPU" -show_memory = false -show_clocks = false -interval = 1 - [[block]] block = "temperature" collapsed = false interval = 10 format = "CPU {average}C" -chip = "dell_smm-virtual-0" -inputs = ["CPU"] +chip = "pch_cannonlake-virtual-0" + + +[[block]] +block = "weather" +format = "{weather} (Mende) {temp}C" +service = { name = "openweathermap", api_key = "1ee37fef2e1668e418c3cebd62e6ccd2", city_id = "2994617", units = "metric" } [[block]] block = "weather" format = "{weather} (Cocurès) {temp}C" -service = { name = "openweathermap", api_key = "APIKEY", city_id = "2997288", units = "metric" } +service = { name = "openweathermap", api_key = "1ee37fef2e1668e418c3cebd62e6ccd2", city_id = "2997288", units = "metric" } [[block]] block = "pacman" @@ -64,13 +62,13 @@ block = "networkmanager" device_format = "{icon}{ap} {ips}" on_click = "alacritty -e nmtui" interface_name_exclude = ["br\\-[0-9a-f]{12}", "docker\\d+"] -interface_name_include = ["wlp60s0","enp59s0","proton0"] +interface_name_include = ["wlo1","eno2","tun0"] ap_format = "{ssid^10}" [[block]] block = "time" -interval = 60 -format = "%d/%m %R" +interval = 1 +format = "%d/%m/%Y %T" timezone = "Europe/Paris" [[block]] diff --git a/roles/core/templates/.i3/mine_config b/roles/core/templates/.i3/template_config similarity index 92% rename from roles/core/templates/.i3/mine_config rename to roles/core/templates/.i3/template_config index d661e48..e25cf75 100644 --- a/roles/core/templates/.i3/mine_config +++ b/roles/core/templates/.i3/template_config @@ -56,7 +56,7 @@ bindsym $mod+Ctrl+m exec pavucontrol # Start Applications bindsym $mod+Ctrl+b exec terminal -e 'bmenu' -bindsym $mod+F2 exec firefox +bindsym $mod+F2 exec palemoon bindsym $mod+F3 exec pcmanfm # bindsym $mod+F3 exec ranger bindsym $mod+Shift+F3 exec gksu pcmanfm @@ -185,7 +185,7 @@ bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2 bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3 bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4 bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5 -bindsym $mod+Shift+62 move container to workspace $ws6; workspace $ws6 +bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6 bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7 bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8 bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9 @@ -219,7 +219,7 @@ for_window [class="qt5ct"] floating enable sticky enable border normal for_window [class="Qtconfig-qt4"] floating enable sticky enable border normal for_window [class="Simple-scan"] floating enable border normal for_window [class="(?i)System-config-printer.py"] floating enable border normal -#for_window [class="Skype"] floating enable border normal +for_window [class="Skype"] floating enable border normal for_window [class="Timeset-gui"] floating enable border normal for_window [class="Oracle VM Virtualbox Manager"] floating enable border normal for_window [class="Xfburn"] floating enable @@ -242,7 +242,7 @@ bindsym $mod+Shift+s exec "~/.bin/switch_mono_screen.sh; nitrogen --restore && i bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" # Set shut down, restart and locking features -bindsym $mod+0 mode "$mode_system" +bindsym $mod+Delete mode "$mode_system" set $mode_system (l)ock, (e)xit, switch_(u)ser, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown mode "$mode_system" { bindsym l exec --no-startup-id i3exit lock, mode "default" @@ -338,42 +338,15 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status -# Start i3bar to display a workspace bar (plus the system information i3status if available) -#bar { -# i3bar_command i3bar -# status_command i3status -# position bottom -## please set your primary output first. Example: 'xrandr --output eDP1 --primary' -# tray_output primary -# tray_output eDP1 -# bindsym button4 nop -# bindsym button5 nop -# font xft:URWGothic-Book, Icons 11 -# strip_workspace_numbers yes -# colors { -# background #222D31 -# statusline #F9FAF9 -# separator #454947 -# border backgr. text -# focused_workspace #3498db #3498db #292F34 -# active_workspace #595B5B #353836 #FDF6E3 -# inactive_workspace #595B5B #222D31 #EEE8D5 -# binding_mode #3498db #2C2C2C #F9FAF9 -# urgent_workspace #3498db #FDF6E3 #E5201D -# } -#} - bar { - font pango:DejaVu Sans Mono, Font Awesome 5 Free 13px + font pango:Inconsolata, Font Awesome 6 Free 14px position bottom status_command i3status-rs ~/.i3/config.toml colors { - separator #666666 - background #222222 - statusline #dddddd + background #2e3440 focused_workspace #0088CC #0088CC #ffffff active_workspace #333333 #333333 #ffffff - inactive_workspace #333333 #333333 #888888 + inactive_workspace #333333 #2e3440 #888888 urgent_workspace #2f343a #900000 #ffffff } } @@ -446,4 +419,4 @@ mode "$mode_gaps_outer" { bindsym Return mode "default" bindsym Escape mode "default" -} +} \ No newline at end of file