From 2f81ad2e3b4eb931233c2c46f56b3528b32a67c5 Mon Sep 17 00:00:00 2001 From: Gregor Feierabend <23300469@sun.ac.za> Date: Sat, 28 Aug 2021 15:13:33 +0200 Subject: [PATCH] update --- .Xresources | 2 +- .compton.conf | 9 ++++++ .config/awesome/rc.lua | 57 ++++++++++++++++++++++++---------- .config/cmus/autosave | 2 +- .config/qpdfview/qpdfview.conf | 12 +++---- .tmux.conf | 12 +++++++ 6 files changed, 69 insertions(+), 25 deletions(-) diff --git a/.Xresources b/.Xresources index 730fa53..9ba6f63 100755 --- a/.Xresources +++ b/.Xresources @@ -25,7 +25,7 @@ urxvt.perl-ext-common: default,tabbedex,background,font-size,matcher urxvt.loginShell: true urxvt*dynamicColors: on -urxvt*font: xft:DejaVu Sans Mono:pixelsize=13:style=Regular,xft:Symbola +urxvt*font: xft:DejaVu Sans Mono:pixelsize=13:style=Regular,xft:Symbola,xft:DejaVu Sans Mono for Powerline,xft:Noto Mono for Powerline urxvt*italicFont: xft:Bitstream Vera Sans Mono:pixelsize=13:italic:autohint=true,xft:Symbola !*.font: xft:Iosevka:style=Regular:size=13 !*.boldFont: xft:Iosevka:style=Bold:size=13 diff --git a/.compton.conf b/.compton.conf index 2f35174..531eeab 100644 --- a/.compton.conf +++ b/.compton.conf @@ -1,16 +1,25 @@ shadow-opacity = 0.9; shadow = true; + shadow-radius = 0; shadow-offset-x = -2; shadow-offset-y = -2; shadow-ignore-shaped = true; +#shadow-radius = 3; +#shadow-offset-x = -5; +#shadow-offset-y = -5; +#shadow-red = 1.0 +#shadow-green = 1.0 +#shadow-blue = 1.0 + shadow-exclude = [ "class_g = 'TelegramDesktop'", "name = 'Notification'", "class_g = 'Conky'", "class_g ?= 'Notify-osd'", "class_g = 'Cairo-clock'", "class_g = 'Pqiv'", + "class_g = 'awesome'", "class_g = 'slop'", "class_g = 'Firefox'", "name = 'xfce4-notifyd'"]; diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index ddc7975..29d59c6 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -45,7 +45,7 @@ end -- {{{ Variable definitions -- Themes define colours, icons, font and wallpapers. -beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua") +beautiful.init(gears.filesystem.get_themes_dir() .. "zenburn/theme.lua") -- This is used later as the default terminal and editor to run. terminal = "urxvt" @@ -61,19 +61,25 @@ modkey = "Mod4" -- Table of layouts to cover with awful.layout.inc, order matters. awful.layout.layouts = { - awful.layout.suit.tile.bottom, - awful.layout.suit.floating, - awful.layout.suit.tile, - awful.layout.suit.tile.left, awful.layout.suit.tile.top, - awful.layout.suit.fair, - awful.layout.suit.fair.horizontal, - awful.layout.suit.spiral, - awful.layout.suit.spiral.dwindle, - awful.layout.suit.max, - awful.layout.suit.max.fullscreen, + awful.layout.suit.tile.right, awful.layout.suit.magnifier, - awful.layout.suit.corner.nw, + -- awful.layout.suit.fair, + -- awful.layout.suit.fair.horizontal, + -- awful.layout.suit.floating, + -- awful.layout.suit.tile.bottom, + -- awful.layout.suit.floating, + -- awful.layout.suit.tile, + -- awful.layout.suit.tile.left, + -- awful.layout.suit.tile.top, + -- awful.layout.suit.fair, + -- awful.layout.suit.fair.horizontal, + -- awful.layout.suit.spiral, + -- awful.layout.suit.spiral.dwindle, + -- awful.layout.suit.max, + -- awful.layout.suit.max.fullscreen, + -- awful.layout.suit.magnifier, + -- awful.layout.suit.corner.nw, -- awful.layout.suit.corner.ne, -- awful.layout.suit.corner.sw, -- awful.layout.suit.corner.se, @@ -98,6 +104,9 @@ mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesom mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, menu = mymainmenu }) +package.path = package.path .. ';/usr/lib/python3.8/site-packages/powerline/bindings/awesome/?.lua' +require('powerline') + -- Menubar configuration menubar.utils.terminal = terminal -- Set the terminal for applications that require it -- }}} @@ -170,7 +179,7 @@ awful.screen.connect_for_each_screen(function(s) gears.wallpaper.set("#00000f") -- Each screen has its own tag table. - awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1]) + awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9"}, s, awful.layout.layouts[1]) -- Create a promptbox for each screen s.mypromptbox = awful.widget.prompt() @@ -204,7 +213,7 @@ awful.screen.connect_for_each_screen(function(s) layout = wibox.layout.align.horizontal, { -- Left widgets layout = wibox.layout.fixed.horizontal, - mylauncher, + -- mylauncher, s.mytaglist, s.mypromptbox, }, @@ -212,8 +221,9 @@ awful.screen.connect_for_each_screen(function(s) { -- Right widgets layout = wibox.layout.fixed.horizontal, mykeyboardlayout, + powerline_widget, wibox.widget.systray(), - mytextclock, + -- mytextclock, s.mylayoutbox, }, } @@ -275,7 +285,7 @@ globalkeys = gears.table.join( {description = "go back", group = "client"}), -- Standard program - awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, + awful.key({ modkey, }, "Return", function () awful.spawn(terminal .. " -e tmux") end, {description = "open a terminal", group = "launcher"}), awful.key({ modkey, "Control" }, "r", awesome.restart, {description = "reload awesome", group = "awesome"}), @@ -299,6 +309,17 @@ globalkeys = gears.table.join( awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end, {description = "select previous", group = "layout"}), + -- TODO: change /home/x to ~ + awful.key({ modkey, "Shift" }, "x", + function () awful.spawn({"/home/x/.config/i3/scripts/lock.sh"}) end, + {description = "lock screen", group = "user"}), + awful.key({ modkey, "Shift" }, "p", + function () awful.spawn({"pqiv", "-c", "-c", "-i", "/home/x/ANNOTATIONS"}) end, + {description = "lock screen", group = "user"}), + awful.key({ modkey, "Shift" }, "o", + function () awful.spawn({"/home/x/.config/i3/scripts/screenshot.sh"}) end, + {description = "lock screen", group = "user"}), + awful.key({ modkey, "Control" }, "n", function () local c = awful.client.restore() @@ -447,7 +468,7 @@ root.keys(globalkeys) awful.rules.rules = { -- All clients will match this rule. { rule = { }, - properties = { border_width = beautiful.border_width, + properties = { --border_width = beautiful.border_width, border_color = beautiful.border_normal, focus = awful.client.focus.filter, raise = true, @@ -497,6 +518,8 @@ awful.rules.rules = { -- Set Firefox to always map on the tag named "2" on screen 1. -- { rule = { class = "Firefox" }, -- properties = { screen = 1, tag = "2" } }, + { rule = { class = "Telegram" }, + properties = { screen = 1, tag = "9" } }, } -- }}} diff --git a/.config/cmus/autosave b/.config/cmus/autosave index 58a21c5..289341f 100644 --- a/.config/cmus/autosave +++ b/.config/cmus/autosave @@ -46,7 +46,7 @@ set color_win_title_attr=default set color_win_title_bg=default set color_win_title_fg=white set confirm_run=true -set continue=true +set continue=false set continue_album=true set device=/dev/cdrom set display_artist_sort_name=false diff --git a/.config/qpdfview/qpdfview.conf b/.config/qpdfview/qpdfview.conf index 8181329..5558214 100644 --- a/.config/qpdfview/qpdfview.conf +++ b/.config/qpdfview/qpdfview.conf @@ -7,7 +7,7 @@ highlightAll=true highlightCurrentThumbnail=true highlightDuration=5000 invertColors=false -layoutMode=3 +layoutMode=1 limitThumbnailsToResults=false matchCase=false minimalScrolling=true @@ -19,7 +19,7 @@ prefetch=true prefetchDistance=10 rotateModifiers=33554432 rotation=0 -scaleFactor=1.3030002934272298 +scaleFactor=2.541535355028591 scaleMode=1 scrollModifiers=134217728 sourceEditor= @@ -40,11 +40,11 @@ exitAfterLastTab=false extendedSearchDock=true fileToolBar=openInNewTab, refresh fontsDialogSize=@Size(278 244) -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\x1\xcb\0\0\x5\x9f\0\0\x3\x83\0\0\0\x1\0\0\x1\xde\0\0\x5\x9e\0\0\x3\x82\0\0\0\0\0\0\0\0\x5\xa0\0\0\0\x1\0\0\x1\xde\0\0\x5\x9e\0\0\x3\x82) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0V\0\0\0G\0\0\x5I\0\0\x3O\0\0\0V\0\0\0G\0\0\x5I\0\0\x3O\0\0\0\0\0\0\0\0\x5\xa0\0\0\0V\0\0\0G\0\0\x5I\0\0\x3O) instanceNameInWindowTitle=false keepRecentlyClosed=false newTabNextToCurrentTab=true -openPath=/SHARED/academics/2021/pdf/M365/notes/week3 +openPath=/SHARED/academics/2021/pdf recentlyClosedCount=5 recentlyUsed=@Invalid() recentlyUsedCount=10 @@ -57,7 +57,7 @@ scrollableMenus=false searchableMenus=false settingsDialogSize=@Size(430 663) spreadTabs=true -state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\xb3\0\0\x3q\xfc\x2\0\0\0\x3\xfb\0\0\0\x16\0o\0u\0t\0l\0i\0n\0\x65\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3q\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0p\0r\0o\0p\0\x65\0r\0t\0i\0\x65\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3q\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0t\0h\0u\0m\0\x62\0n\0\x61\0i\0l\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3q\0\0\0\x91\0\xff\xff\xff\0\0\0\x3\0\0\x2\xcc\0\0\0~\xfc\x1\0\0\0\x2\xfb\0\0\0\x1a\0\x62\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x2\xcc\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x14\0s\0\x65\0\x61\0r\0\x63\0h\0\x44\0o\0\x63\0k\x2\0\0\0p\0\0\0\xb5\0\0\x2q\0\0\0\xfc\0\0\x5\x9e\0\0\x1\xa5\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0v\0i\0\x65\0w\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0) +state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\xb3\0\0\x3\t\xfc\x2\0\0\0\x3\xfb\0\0\0\x16\0o\0u\0t\0l\0i\0n\0\x65\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0p\0r\0o\0p\0\x65\0r\0t\0i\0\x65\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0t\0h\0u\0m\0\x62\0n\0\x61\0i\0l\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\0\0\0\x3\0\0\x4\xf4\0\0\0~\xfc\x1\0\0\0\x2\xfb\0\0\0\x1a\0\x62\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x4\xf4\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x14\0s\0\x65\0\x61\0r\0\x63\0h\0\x44\0o\0\x63\0k\x2\0\0\0p\0\0\0\xb5\0\0\x2q\0\0\0\xfc\0\0\x4\xf4\0\0\x2\xf6\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0v\0i\0\x65\0w\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0) styleSheet="\n\n/*-----QWidget-----*/\nQWidget\n{\n\tbackground-color: #232430;\n\tcolor: #EEEEEE;\n\tborder-color: #000000;\n\n}\n\n\n/*-----QLabel-----*/\nQLabel\n{\n\tbackground-color: #232430;\n\tcolor: #c1c1c1;\n\tborder-color: #000000;\n\n}\n\n/*-----QLineEdit-----*/\nQLineEdit\n{\n\tbackground-color: #38394e;\n\tcolor: #c1c1c1;\n\tborder-style: solid;\n\tborder-width: 1px;\n\tborder-color: #4a4c68;\n\n}\n\n\n/*-----QTableView-----*/\nQTableView, \nQHeaderView, \nQTableView::item \n{\n\tbackground-color: #232430;\n\tcolor: #c1c1c1;\n\tborder: none;\n\n}\n\n\nQTableView::item:selected \n{ \n background-color: #41424e;\n color: #c1c1c1;\n\n}\n\n\nQHeaderView::section:horizontal \n{\n background-color: #232430;\n\tborder: 1px solid #37384d;\n\tpadding: 5px;\n\n}\n\n\nQTableView::indicator{\n\tbackground-color: #1d1d28;\n\tborder: 1px solid #37384d;\n\n}\n\n\nQTableView::indicator:checked{\n\timage:url(./ressources/check.png); /*To replace*/\n\tbackground-color: #1d1d28;\n\n}\n\n/*-----QTabWidget-----*/\nQTabWidget::pane \n{ \n border: none;\n\n}\n\n\nQTabWidget::tab-bar \n{\n left: 5px; \n\n}\n\n\nQTabBar::tab \n{\n color: #c1c1c1;\n min-width: 1px;\n\tpadding-left: 25px;\n\tmargin-left:-22px;\n height: 28px;\n\tborder: none;\n\n}\n\n\nQTabBar::tab:selected \n{\n color: #c1c1c1;\n\tfont-weight: bold;\n height: 28px;\n\n}\n\n\nQTabBar::tab:!first \n{\n margin-left: -20px;\n\n}\n\n\nQTabBar::tab:hover \n{\n color: #DDD;\n\n}\n\n/*-----QTableView & QTableWidget-----*/\nQTableView\n{\n background-color: #202030;\n border: 1px solid #32414B;\n color: #f0f0f0;\n gridline-color: #8faaff;\n outline : 0;\n\n}\n\n\n/*-----QScrollBar-----*/\nQScrollBar:horizontal \n{\n background-color: transparent;\n height: 8px;\n margin: 0px;\n padding: 0px;\n\n}\n\n\nQScrollBar::handle:horizontal \n{\n border: none;\n\tmin-width: 100px;\n background-color: #56576c;\n\n}\n\n\nQScrollBar::add-line:horizontal, \nQScrollBar::sub-line:horizontal,\nQScrollBar::add-page:horizontal, \nQScrollBar::sub-page:horizontal \n{\n width: 0px;\n background-color: transparent;\n\n}\n\n\nQScrollBar:vertical \n{\n background-color: transparent;\n width: 8px;\n margin: 0;\n\n}\n\n\nQScrollBar::handle:vertical \n{\n border: none;\n\tmin-height: 100px;\n background-color: #56576c;\n\n}\n\n\nQScrollBar::add-line:vertical, \nQScrollBar::sub-line:vertical,\nQScrollBar::add-page:vertical, \nQScrollBar::sub-page:vertical \n{\n height: 0px;\n background-color: transparent;\n\n}\n" synchronizeOutlineView=false synchronizeSplitViews=false @@ -71,7 +71,7 @@ viewToolBar=scaleFactor, zoomIn, zoomOut [pageItem] addAnnotationModifiers=67108864 -annotationColor=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\0\0\0\0\0\0) +annotationColor=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\0\0\0\0) annotationOverlay=false backgroundColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\0\0\0\0) cacheSize=262144K diff --git a/.tmux.conf b/.tmux.conf index 4c3df8d..cfcdf18 100755 --- a/.tmux.conf +++ b/.tmux.conf @@ -201,3 +201,15 @@ bind -n C-k clear-history # use=xterm+256setaf, use=tmux, #EOF set -g default-terminal "tmux" + +# git clone https://github.com/erikw/tmux-powerline.git +set-option -g status on +set-option -g status-bg colour235 +set-option -g status-interval 2 +set-option -g status-justify "centre" +set-option -g status-left-length 60 +set-option -g status-right-length 90 +set-option -g status-left "#(~/tmux-powerline/powerline.sh left)" +set-option -g status-right "#(~/tmux-powerline/powerline.sh right)" +set-window-option -g window-status-current-format "#[fg=colour215,bg=colour235]⮀#[fg=colour255, bg=colour235] #I ⮁ #W #[fg=colour190, bg=colour235]⮀" +set-window-option -g window-status-format "#[fg=colour255, bg=colour235] (#I #W)"