Fixed awesome configuration so that there is only one screen with important widgets

nixos
lanxu 2018-04-26 21:53:31 +03:00
parent e785e25e24
commit 5fbcd20084
4 changed files with 54 additions and 44 deletions

View File

@ -11,12 +11,12 @@ Xft.rgba: rgb
! rxvt-unicode ! rxvt-unicode
URxvt.perl-ext-common: default,matcher,clipboard URxvt.perl-ext-common: default,matcher,clipboard
URxvt*font: xft:Noto Emoji,xft:Fura Code Nerd Font:size=10:style=Regular !URxvt*font: xft:xft:Fura Code Nerd Font:size=10:style=Regular
URxvt*boldFont: xft:Noto Emoji,xft:Fura Code Nerd Font:size=10:style=Bold !URxvt*boldFont: xft:xft:Fura Code Nerd Font:size=10:style=Bold
!URxvt.font: xft:Fira Code:size=10:style=Regular !URxvt.font: xft:Fira Code:size=10:style=Regular
!URxvt.boldFont: xft:Fira Code:size=10:style=Bold !URxvt.boldFont: xft:Fira Code:size=10:style=Bold
!URxvt.font: xft:DejaVu Sans Mono:size=10:style=Regular URxvt.font: xft:DejaVu Sans Mono:size=10:style=Regular
!URxvt.boldFont: xft:DejaVu Sans Mono:size=10:style=Bold URxvt.boldFont: xft:DejaVu Sans Mono:size=10:style=Bold
URxvt.url-launcher: firefox URxvt.url-launcher: firefox
URxvt.matcher.button: 1 URxvt.matcher.button: 1
URxvt*scrollBar: false URxvt*scrollBar: false
@ -26,15 +26,16 @@ URxvt.letterSpace: 0
URxvt.keysym.M-c: perl:clipboard:copy URxvt.keysym.M-c: perl:clipboard:copy
URxvt.keysym.M-v: perl:clipboard:paste URxvt.keysym.M-v: perl:clipboard:paste
URxvt.keysym.M-C-v: perl:clipboard:paste_escaped URxvt.keysym.M-C-v: perl:clipboard:paste_escaped
URxvt.iso14755: false URxvt.iso14755: false
URxvt.iso14755_52: false URxvt.iso14755_52: false
URxvt*termName: rxvt-unicode-256color URxvt*termName: rxvt-unicode-256color
! xterm ! xterm
XTerm.vt100.faceName: xft:Fura Code Nerd Font:style=Regular !XTerm.vt100.faceName: xft:Fura Code Nerd Font:style=Regular
!XTerm*faceName: xft:DejaVu Sans Mono:size=10:style=Regular XTerm*faceName: xft:DejaVu Sans Mono:size=10:style=Regular
!XTerm*faceName: xft:Fira Code:size=10:style=Regular !XTerm*faceName: xft:Bitstream Vera Sans Mono:size=10:style=Regular
XTerm.vt100.faceSize: 10 !XTerm*faceName: xft:Fira Code:size=10:style=Regular
XTerm.scaleHeight: 1.0 !xterm*faceName: xft:Bitstream Vera Sans Mono:size=10:style=Regular
XTerm*renderFont: true xterm.vt100.faceSize: 10
XTerm.termName: xterm-256color xterm*renderFont: true
xterm.termName: xterm

View File

@ -199,7 +199,7 @@ screen.connect_signal("property::geometry", set_wallpaper)
-- Tags -- Tags
-- Define a tag table which hold all screen tags. -- Define a tag table which hold all screen tags.
primary_screen = 1 primary_screen = 1
secondary_screen = awful.screen.count secondary_screen = screen:count()
tags = { tags = {
names = { names = {
@ -245,6 +245,39 @@ awful.screen.connect_for_each_screen(function(s)
-- Create the wibox -- Create the wibox
s.mywibox = awful.wibar({ position = "top", screen = s }) s.mywibox = awful.wibar({ position = "top", screen = s })
local right_widgets = {
layout = wibox.layout.fixed.horizontal,
--mykeyboardlayout,
wibox.widget.systray(),
spacer,
myserverstatus,
spacer,
volume,
spacer,
mydpmsstatus,
spacer,
mycpu,
spacer,
mymem,
spacer,
myweather,
spacer,
mycputemp,
spacer,
mygputemp,
spacer,
mytextclock,
spacer,
s.mylayoutbox,
}
-- Only show everything on the first screen
if s.index > 1 then
right_widgets = {
layout = wibox.layout.fixed.horizontal,
s.mylayoutbox,
}
end
-- Add widgets to the wibox -- Add widgets to the wibox
s.mywibox:setup { s.mywibox:setup {
layout = wibox.layout.align.horizontal, layout = wibox.layout.align.horizontal,
@ -255,31 +288,7 @@ awful.screen.connect_for_each_screen(function(s)
s.mypromptbox, s.mypromptbox,
}, },
s.mytasklist, -- Middle widget s.mytasklist, -- Middle widget
{ -- Right widgets right_widgets,
layout = wibox.layout.fixed.horizontal,
--mykeyboardlayout,
wibox.widget.systray(),
spacer,
myserverstatus,
spacer,
volume,
spacer,
mydpmsstatus,
spacer,
mycpu,
spacer,
mymem,
spacer,
myweather,
spacer,
mycputemp,
spacer,
mygputemp,
spacer,
mytextclock,
spacer,
s.mylayoutbox,
},
} }
end) end)
-- }}} -- }}}
@ -583,10 +592,10 @@ awful.rules.rules = {
properties = { screen = primary_screen, tag = "GFX" } }, properties = { screen = primary_screen, tag = "GFX" } },
{ rule = { class = "Blender" }, { rule = { class = "Blender" },
properties = { screen = primary_screen, tag = "GFX" } }, properties = { screen = primary_screen, tag = "GFX" } },
{ rule = { class = "Steam" },
properties = { screen = secondary_screen, tag = "Other" } },
{ rule = { class = "Steam", name = "Friends" }, { rule = { class = "Steam", name = "Friends" },
properties = { screen = secondary_screen, tag = "Other", width = 200 } }, properties = { screen = secondary_screen, tag = "Other", width = 200 } },
{ rule = { class = "Steam" },
properties = { screen = secondary_screen, tag = "Other" } },
} }
-- }}} -- }}}

View File

@ -85,7 +85,7 @@ myweather = lain.widget.weather({
settings = function() settings = function()
widget.markup = create_markup("Tampere", weather_now.main.temp, "", valuecolor) widget.markup = create_markup("Tampere", weather_now.main.temp, "", valuecolor)
end end
}); })
-- DPMS -- DPMS
mydpmsstatus = wibox.widget.textbox() mydpmsstatus = wibox.widget.textbox()

2
.zshrc
View File

@ -60,6 +60,6 @@ source $HOME/.config/base16-shell/scripts/base16-default-dark.sh
# Emscripten # Emscripten
#source /home/lanxu/Koodit/github/emsdk/emsdk_env.sh #source /home/lanxu/Koodit/github/emsdk/emsdk_env.sh
TERM=xterm-256color # TERM=xterm-256color
#bindkey "${terminfo[khome]}" beginning-of-line #bindkey "${terminfo[khome]}" beginning-of-line
#bindkey "${terminfo[kend]}" end-of-line #bindkey "${terminfo[kend]}" end-of-line