diff --git a/.Xdefaults b/.Xdefaults index baf191f..4a195ef 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -3,7 +3,7 @@ URxvt.termName: rxvt-unicode URxvt.scrollBar: false URxvt.perl-lib: /usr/lib/urxvt/perl/ URxvt.perl-ext-common: default,matcher -URxvt.urlLauncher: firefox +URxvt.urlLauncher: firefox-developer-edition URxvt.matcher.button: 1 URxvt.letterSpace: -1 URxvt.internalBorder: 6 @@ -19,7 +19,7 @@ URxvt.depth: 32 ! special URxvt.foreground: #eceff1 -URxvt.background: [80]#161616 +URxvt.background: [90]#161616 URxvt.cursorColor: #eceff1 ! black @@ -51,5 +51,5 @@ URxvt.color6: #009688 URxvt.color14: #26a69a ! white -URxvt.color7: #cfd8dc +URxvt.color7: #efd8dc URxvt.color15: #eceff1 diff --git a/.gitconfig b/.gitconfig index d867938..52b3b3d 100644 --- a/.gitconfig +++ b/.gitconfig @@ -22,3 +22,4 @@ [core] excludesfile = ~/.gitignore + autocrlf = input diff --git a/.ideavimrc b/.ideavimrc index b69c02a..58d710a 100644 --- a/.ideavimrc +++ b/.ideavimrc @@ -9,32 +9,33 @@ vnoremap < >gv " Select all text -map a ggVG +map a ggVG " reload -nnoremap vs :source ~/.ideavimrc +nnoremap vs :source ~/.ideavimrc " Copy until the end of the line noremap Y y$ " clipboard -noremap y "*y -noremap Y "*Y -noremap p "*p -noremap P "*P +noremap y "*y +noremap Y "*Y +noremap p "*p +noremap P "*P " refactoring -nnoremap rf :action RenameFile -nnoremap rr :action RenameElement -nnoremap ll :action ReformatCode +nnoremap rf :action RenameFile +nnoremap rr :action RenameElement +nnoremap ll :action ReformatCode " actions -nnoremap ;; :action CommentByLineComment -nnoremap b :action ToggleLineBreakpoint -nnoremap oi :action OptimizeImports +nnoremap / :action CommentByLineComment +nnoremap b :action ToggleLineBreakpoint +nnoremap oi :action OptimizeImports nnoremap ee :action SearchEverywhere -nnoremap \\\\ :action SearchEverywhere +nnoremap e :action ExpandSelection +nnoremap :action SearchEverywhere nnoremap :action Switcher " gotos @@ -43,17 +44,11 @@ nnoremap gs :action GotoSuperMethod nnoremap gu :action ShowUsages " unimpaired mappings -nnoremap [ Oj -nnoremap ] ok +nnoremap [ Oj +nnoremap ] ok nnoremap q[ :action PreviousOccurence nnoremap q] :action NextOccurence nnoremap m[ :action MethodUp nnoremap m] :action MethodDown nnoremap c[ :action VcsShowPrevChangeMarker nnoremap c] :action VcsShowNextChangeMarker - -" blank lines -nnoremap j :set pastem`o``:set nopaste -nnoremap k :set pastem`O``:set nopaste -nnoremap space j -nnoremap space k diff --git a/.vimrc b/.vimrc index efc38d3..11d3c47 100644 --- a/.vimrc +++ b/.vimrc @@ -9,6 +9,12 @@ else let $VIMHOME = $HOME."/.vim" endif +let g:vimtex_view_method = 'mupdf' +let g:vimtex_latexmk_options = '-pdf -pdflatex="xelatex -synctex=1 \%S \%O" -verbose -file-line-error -interaction=nonstopmode' +set mouse=a + +let g:tmpl_search_paths = [ $VIMHOME.'/templates' ] + call plug#begin($VIMHOME.'/plugged') Plug 'terryma/vim-multiple-cursors' Plug 'thinca/vim-localrc' @@ -19,8 +25,11 @@ call plug#begin($VIMHOME.'/plugged') Plug 'ctrlpvim/ctrlp.vim' Plug 'tpope/vim-surround' Plug 'airblade/vim-gitgutter' - Plug 'Valloric/YouCompleteMe' Plug 'tpope/vim-commentary' + Plug 'tibabit/vim-templates' + Plug 'Shougo/deoplete.nvim' + Plug 'roxma/nvim-yarp' + Plug 'roxma/vim-hug-neovim-rpc' " load local plugins if filereadable("~/.local-plugins.vimrc") @@ -36,7 +45,7 @@ set t_Co=256 " " one time settings -" if !exists("g:running") +if !exists("g:running") " " Conemu specific settings " if !has('gui_running') && !has('nvim') " set term=xterm @@ -53,16 +62,16 @@ set t_Co=256 " nnoremap [63~ " endif -" if has('gui_running') -" set guifont=Fira_Code_Medium:h9:cANSI:qDRAFT -" set guioptions= + if has('gui_running') + set guifont=Fira_Code_Medium:h9:cANSI:qDRAFT + set guioptions= -" set columns=200 -" set lines=58 + set columns=200 + set lines=58 -" colorscheme tender -" endif -" endif + colorscheme tender + endif +endif let g:running = 1 @@ -108,6 +117,7 @@ let &t_EI = "\[2 q" " filetypes " autocmd FileType c,cpp :compiler cl au FileType asm :set ft=masm +au FileType tex :set tw=120 " airline let g:airline_powerline_fonts = 1 @@ -117,11 +127,6 @@ let g:airline#extensions#tabline#enabled = 1 " ctrlp let g:ctrlp_switch_buffer = 'Et' -" latex -let g:vimtex_view_general_viewer = 'SumatraPDF' -let g:vimtex_view_general_options - \ = '-reuse-instance -forward-search @tex @line @pdf' - " ycm config let g:ycm_confirm_extra_conf = 0 diff --git a/.zshrc b/.zshrc index 381cb56..4089205 100644 --- a/.zshrc +++ b/.zshrc @@ -65,11 +65,8 @@ unsetopt share_history # export LANG=en_US.UTF-8 # Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi +export EDITOR='vim' +export PATH=$PATH:$HOME/bin/ # Compilation flags # export ARCHFLAGS="-arch x86_64" diff --git a/awesome/rc.lua b/awesome/rc.lua index f08a407..aa57fa4 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -60,8 +60,8 @@ end -- Autostart programs run_once({ - "xcompmgr", - "/home/kadet/.local/share/JetBrains/Toolbox/bin/jetbrains-toolbox" + "xcompmgr", + "sleep 0.25 && xrandr --output DP-1 --primary --auto --pos 0x0 --output HDMI-0 --auto --pos 2560x180" }) -- Choose the theme @@ -73,7 +73,7 @@ local modkey = "Mod4" local altkey = "Mod1" local terminal = "urxvt" local editor = os.getenv("EDITOR") or "vim" -local browser = "firefox" +local browser = "firefox-developer-edition" local gui_editor = "code" -- Naughty presets @@ -368,14 +368,17 @@ globalkeys = awful.util.table.join( awful.key({ modkey }, "v", function () awful.spawn("xsel -b | xsel") end), -- User programs - awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end, { group = "launcher", description = "Open GUI editor" }), + awful.key({ modkey }, "c", function () awful.spawn(gui_editor) end, { group = "launcher", description = "Open GUI editor" }), + awful.key({ modkey }, "c", function () awful.spawn("xdg-open .") end, { group = "launcher", description = "Open File Explorer" }), awful.key({ modkey }, "q", function () awful.spawn(browser) end, { group = "launcher", description = "Open browser window" }), awful.key({ modkey }, "Return", function () awful.spawn(terminal) end, { group = "launcher", description = "Open terminal" }), + awful.key({ }, "Pause", function () awful.spawn("playerctl play-pause") end, { group = "launcher", description = "Play/Pause" }), -- Dropdown application awful.key({ modkey }, "`", function () awful.screen.focused().quake:toggle() end, { group = "launcher", description = "Open quake style terminal" }), -- Prompt - awful.key({ modkey }, "r", function () awful.spawn("rofi -show run") end, { description = "program launcher", group = "launcher" }) + awful.key({ modkey }, "r", function () awful.spawn("rofi -show run") end, { description = "program launcher", group = "launcher" }), + awful.key({ modkey, "Control" }, "s", function () awful.spawn("rofi -show ssh") end, { description = "ssh to ...", group = "launcher" }) ) clientkeys = awful.util.table.join( @@ -390,6 +393,8 @@ clientkeys = awful.util.table.join( {description = "close", group = "client"}), awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle , {description = "toggle floating", group = "client"}), + awful.key({ modkey, altkey } , "space", awful.titlebar.toggle, + {description = "toggle titlebar", group = "client"}), awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end, {description = "move to master", group = "client"}), awful.key({ modkey, }, "o", function (c) c:move_to_screen() end, @@ -464,7 +469,8 @@ end clientbuttons = awful.util.table.join( awful.button({ }, 1, function (c) client.focus = c; c:raise() end), awful.button({ modkey }, 1, awful.mouse.client.move), - awful.button({ modkey }, 3, awful.mouse.client.resize)) + awful.button({ modkey }, 3, awful.mouse.client.resize) +) -- Set keys root.keys(globalkeys) @@ -485,6 +491,7 @@ awful.rules.rules = { placement = awful.placement.no_overlap+awful.placement.no_offscreen, size_hints_honor = false, floating = false, + allow_titlebars = true, } }, @@ -492,23 +499,13 @@ awful.rules.rules = { { rule_any = { type = { "dialog", "normal" } }, properties = { titlebars_enabled = window_titlebar } }, - { rule = { class = "jetbrains-toolbox" }, - properties = { tag = awful.util.tagnames[4], floating = false } }, - - { rule = { class = "telegram-desktop" }, - properties = { tag = awful.util.tagnames[4], floating = false } }, - -- Set Firefox to always map on the first tag on screen 1. { rule = { class = "Firefox" }, - properties = { screen = 1, maximized = true, titlebars_enabled = false, switchtotag = true, tag = awful.util.tagnames[3] } }, + properties = { maximized = true, titlebars_enabled = false, tag = awful.util.tagnames[3] } }, -- Jetbrains stuff - { rule = { class = "jetbrains-phpstorm" }, - properties = { screen = 1, tag = awful.util.tagnames[1], floating = false } }, - { rule = { class = "jetbrains-idea" }, - properties = { screen = 1, maximized = true, tag = awful.util.tagnames[1] } }, - { rule = { class = "jetbrains-pycharm" }, - properties = { screen = 1, maximized = true, tag = awful.util.tagnames[1] } }, + { rule_any = { class = { "jetbrains-phpstorm", "jetbrains-idea", "jetbrains-pycharm" } }, + properties = { titlebars_enabled = false, tag = awful.util.tagnames[1], maximized = false } }, -- dialogs { rule = { type = "dialog" }, @@ -516,7 +513,23 @@ awful.rules.rules = { -- jetbrains bugs { rule = { class = "jetbrains-.*", name = "win.*" }, - properties = { titlebars_enabled = false, focusable = false, focus = true, floating = true, placement = awful.placement.restore } }, + properties = { titlebars_enabled = false, focusable = false, focus = true, floating = true, placement = awful.placement.restore }, no_titlebars = true }, + + -- flameshot + { rule = { class = "flameshot" }, + properties = { titlebars_enabled = true, floating = true, focus = true } }, + + -- keepassxc + { rule = { class = "keepassxc" }, + properties = { titlebars_enabled = true, floating = true } }, + + -- messaging + { rule_any = { class = { "telegram-desktop", "Thunderbird", "jetbrains-toolbox" } }, + properties = { screen = 2, tag = awful.util.tagnames[4] } }, + + -- quake + { rule = { class = "QuakeDD" }, + properties = { allow_titlebars = false } }, } -- Signals @@ -524,7 +537,7 @@ awful.rules.rules = { client.connect_signal("manage", function (c) -- Set the windows at the slave, -- i.e. put it at the end of others instead of setting it master. - -- if not awesome.startup then awful.client.setslave(c) end + if not awesome.startup then awful.client.setslave(c) end if awesome.startup and not c.size_hints.user_position @@ -560,18 +573,18 @@ client.connect_signal("request::titlebars", function(c) local title = awful.titlebar.widget.titlewidget(c) title.font = "Fira Code Regular 7" - awful.titlebar(c, { size = 16 }) : setup { + awful.titlebar(c, { size = 20, fg_focus = "#ffffff" }) : setup { { -- Left --awful.titlebar.widget.iconwidget(c), -- Title { align = "left", widget = title, - left = 2 + left = 20 }, buttons = buttons, layout = wibox.container.margin, - left = 4 + left = 8 }, { -- Middle buttons = buttons, @@ -585,23 +598,35 @@ client.connect_signal("request::titlebars", function(c) awful.titlebar.widget.maximizedbutton(c), awful.titlebar.widget.closebutton (c), layout = wibox.layout.fixed.horizontal(), - spacing = 2 + spacing = 6 }, layout = wibox.layout.margin, - top = 2, bottom = 2, left = 2, right = 2 + top = 5, bottom = 4, left = 4, right = 8 }, layout = wibox.layout.align.horizontal } end) --- Enable sloppy focus, so that focus follows mouse. -client.connect_signal("mouse::enter", function(c) - if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier - and awful.client.focus.filter(c) then - client.focus = c +client.connect_signal("property::floating", function (c) + if c.floating and not awful.rules.match(c, { name = "win.*" }) and c.allow_titlebars then + if c.titlebar == nil then + c:emit_signal("request::titlebars", "rules", { }) + end + + awful.titlebar.show(c) + else + awful.titlebar.hide(c) end end) +-- Enable sloppy focus, so that focus follows mouse. +-- client.connect_signal("mouse::enter", function(c) +-- if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier +-- and awful.client.focus.filter(c) then +-- client.focus = c +-- end +-- end) + -- No border for maximized clients client.connect_signal("focus", function(c) @@ -612,4 +637,5 @@ client.connect_signal("focus", c.border_color = beautiful.border_focus end end) + client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) diff --git a/awesome/themes/kadet/theme.lua b/awesome/themes/kadet/theme.lua index dbb1b6f..41d7391 100644 --- a/awesome/themes/kadet/theme.lua +++ b/awesome/themes/kadet/theme.lua @@ -22,12 +22,12 @@ local colors = { } colors.background = colors.dark .. colors.transparency -colors.foreground = colors.light -colors.widget_bg = colors.transparent +colors.foreground = colors.dark +colors.widget_bg = colors.dark local theme = {} theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/kadet" -theme.wallpaper = theme.dir .. "/wallpapers/wall_0.png" +theme.wallpaper = theme.dir .. "/wallpapers/kadet.png" theme.font = fonts.mono_regular theme.taglist_font = fonts.mono_bold theme.tasklist_font = fonts.mono_regular @@ -36,22 +36,21 @@ theme.bg_systray = "#000000" theme.systray_icon_spacing = 3 theme.fg_normal = colors.light theme.bg_normal = colors.dark .. "dd" -theme.fg_wibar = colors.light +theme.fg_wibar = colors.dark theme.bg_wibar = colors.background -theme.fg_normal = colors.light theme.bg_focus = colors.dark -theme.fg_focus = colors.light +theme.fg_focus = colors.accent theme.bg_urgent = colors.attention -theme.fg_urgent = colors.light +theme.fg_urgent = colors.dark theme.fg_widget = colors.light -theme.taglist_bg_focus = colors.accent -theme.taglist_fg_focus = colors.dark +theme.taglist_bg_focus = colors.dark +theme.taglist_fg_focus = colors.accent theme.taglist_bg_occupied = colors.dark .. "66" -theme.taglist_fg_occupied = colors.light +theme.taglist_fg_occupied = colors.dark theme.taglist_bg_empty = colors.tramsparent -theme.taglist_fg_empty = colors.light +theme.taglist_fg_empty = colors.dark theme.taglist_bg_urgent = "#C92132" theme.taglist_fg_urgent = "#282828" @@ -67,8 +66,10 @@ theme.border_normal = "#32302f" theme.border_focus = "#3f3f3f" theme.border_marked = "#CC9393" -theme.titlebar_bg_normal = "#161616" +theme.titlebar_bg_normal = "#313742" +theme.titlebar_bg_focus = "#313742" theme.titlebar_fg_normal = colors.white +theme.titlebar_fg_focus = colors.white theme.menu_height = 16 theme.menu_width = 140 @@ -78,11 +79,12 @@ theme.notification_bg = colors.dark .. "dd" theme.notification_fg = theme.fg_normal theme.notification_border_width = 1 theme.notification_border_color = colors.dark -theme.notification_shape = gears.shape.infobubble +theme.notification_shape = gears.shape.rectangle theme.notification_opacity = 1 theme.notification_margin = 30 --theme.warning = theme.dir .. "/icons/status/warning.png" ---theme.notification_width = 300 +theme.notification_max_width = 500 +theme.notification_icon_size = 64 --theme.notification_height = 200 theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" @@ -214,9 +216,9 @@ local fs_widget = wibox.container.background(wibox.container.margin(wibox.widge function theme.connect(s) -- Quake application s.quake = lain.util.quake({ - app = awful.util.terminal, + app = "ghostwriter", followtag = true, - width = 0.333, + width = 0.5, height = 1, }) @@ -225,7 +227,8 @@ function theme.connect(s) if type(wallpaper) == "function" then wallpaper = wallpaper(s) end - gears.wallpaper.maximized(wallpaper, 1, true) + + gears.wallpaper.maximized(wallpaper, s, true) -- Tags --awful.tag(awful.util.tagnames, s, awful.layout.layouts[1]) @@ -233,7 +236,7 @@ function theme.connect(s) awful.layout.layouts[3], awful.layout.layouts[10], awful.layout.layouts[8], - awful.layout.layouts[6], + awful.layout.layouts[7], awful.layout.layouts[10], awful.layout.layouts[10], } @@ -272,6 +275,7 @@ function theme.connect(s) nil, { -- Right widgets layout = wibox.layout.fixed.horizontal, + image.systray_start, -- Fs widget fs_widget, -- Temp @@ -283,7 +287,6 @@ function theme.connect(s) -- Clock clock_widget, -- tray - image.systray_start, { s.tray, layout = wibox.layout.margin, diff --git a/awesome/themes/kadet/wallpapers/kadet.png b/awesome/themes/kadet/wallpapers/kadet.png new file mode 100644 index 0000000..1ebaa2c Binary files /dev/null and b/awesome/themes/kadet/wallpapers/kadet.png differ