less bloat for vim, fixed awesome configuration

This commit is contained in:
lanxu 2017-10-31 20:42:47 +02:00
parent 4f0b14dbf0
commit c02e3dda18
5 changed files with 47 additions and 54 deletions

View File

@ -25,6 +25,7 @@ URxvt.iso14755: false
URxvt.iso14755_52: false
URxvt*termName: rxvt-unicode
XTerm*faceName: Fira Code
XTerm*faceName: xft:Fira Code:size=10:style=Regular
XTerm*faceSize: 10
XTerm.scaleHeight: 0.90
XTerm*termName: xterm-256color

View File

@ -7,7 +7,7 @@ local gears = require("gears")
local function factory(args)
local args = args or {}
local timeout = args.timeout or 120
local calluri = args.uri or "https://masa.dy.fi/~masa/testailu/mc_stats_dev/dev_json.php?type=server_status"
local calluri = args.uri or "https://masa.dy.fi/api/games/stats/minecraft/?type=server_status"
local minecraft = { widget = wibox.widget.textbox() }
local settings = args.settings or function() end
local hideempty = args.hideempty or false

View File

@ -472,41 +472,44 @@ for i = 1, 9 do
end
end
end,
{description = "toggle focused client on tag #" .. i, group = "tag"}),
-- Pulseaudio
awful.key({ any }, "XF86AudioRaiseVolume",
function()
awful.spawn(string.format("pactl set-sink-volume %s +1%%", volume.device))
volume.update()
end,
{description = "Raise audio volume", group = "audio"}),
awful.key({ any }, "XF86AudioLowerVolume",
function()
awful.spawn(string.format("pactl set-sink-volume %s -1%%", volume.device))
volume.update()
end,
{description = "Lower audio volume", group = "audio"}),
awful.key({ any }, "XF86AudioMute",
function()
awful.spawn(string.format("pactl set-sink-mute %s 1", volume.device))
volume.update()
end,
{description = "mute audio", group = "audio"}),
awful.key({ 'Shift' }, "XF86AudioMute",
function()
awful.spawn(string.format("pactl set-sink-mute %s 0", volume.device))
volume.update()
end,
{description = "unmute audio", group = "audio"}),
awful.key({ modkey }, "Print",
function ()
awful.spawn("escrotum \"$(xdg-user-dir PICTURES)/%Y-%m-%d_screenshot.png\"")
end,
function ()
end,
{description = "Take screenshot", group = "audio"})
)
end
{description = "toggle focused client on tag #" .. i, group = "tag"})
)
end
globalkeys = awful.util.table.join(globalkeys,
-- Pulseaudio
awful.key({ any }, "XF86AudioRaiseVolume", function()
awful.spawn(string.format("pactl set-sink-volume %s +1%%", volume.device))
volume.update()
end,
{description = "Raise audio volume", group = "audio"}), awful.key({ any }, "XF86AudioLowerVolume", function()
awful.spawn(string.format("pactl set-sink-volume %s -1%%", volume.device))
volume.update()
end,
{description = "Lower audio volume", group = "audio"}),
awful.key({ any }, "XF86AudioMute",
function()
awful.spawn(string.format("pactl set-sink-mute %s 1", volume.device))
volume.update()
end,
{description = "mute audio", group = "audio"}),
awful.key({ 'Shift' }, "XF86AudioMute",
function()
awful.spawn(string.format("pactl set-sink-mute %s 0", volume.device))
volume.update()
end,
{description = "unmute audio", group = "audio"}),
awful.key({ modkey }, "Print",
function ()
naughty.notify({ preset = naughty.config.presets.info,
title = "Screenshot saved!",
text = "Nice"})
awful.spawn("escrotum \"$(xdg-user-dir PICTURES)/%Y-%m-%d_screenshot.png\"")
end,
{description = "Take screenshot", group = "audio"})
)
clientbuttons = awful.util.table.join(
awful.button({ }, 1, function (c) client.focus = c; c:raise() end),

16
.vimrc
View File

@ -4,21 +4,9 @@
" Start plugins
call plug#begin('~/.vim/plugged')
" Javascript
" Plug 'jelera/vim-javascript-syntax' " Replaced by yajs.vim
Plug 'pangloss/vim-javascript', {'for': 'javascript'}
Plug 'nathanaelkane/vim-indent-guides', {'for': 'javascript'}
Plug 'othree/yajs.vim', {'for': 'javascript'}
Plug 'gavocanov/vim-js-indent', {'for': 'javascript'}
Plug 'digitaltoad/vim-jade', {'for': 'javascript'}
Plug 'othree/es.next.syntax.vim', {'for': 'javascript'}
Plug 'othree/jsdoc-syntax.vim', {'for': 'javascript'}
Plug 'othree/html5.vim',
Plug 'heavenshell/vim-jsdoc', {'for': 'javascript'}
Plug 'othree/javascript-libraries-syntax.vim', {'for': 'javascript'}
Plug 'moll/vim-node', {'for': 'javascript'}
"Plug 'ternjs/tern_for_vim', {'for': 'javascript'}
"Plug 'moll/vim-node', {'for': 'javascript'}
Plug 'sheerun/vim-polyglot'
" C/C++
"Plug 'majutsushi/tagbar'

View File

@ -1,8 +1,8 @@
# Android
export NDK_ROOT=${HOME}/Sovellukset/AndroidDev/android-ndk-r9d
export NDK_ROOT=${HOME}/Sovellukset/android/android-ndk-r9d
export ANT_ROOT=/usr/bin/
export ANDROID_SDK_ROOT=${HOME}/Sovellukset/AndroidDev/sdk
export ANDROID_HOME=${HOME}/Sovellukset/AndroidDev/sdk
export ANDROID_SDK_ROOT=${HOME}/Sovellukset/android/sdk
export ANDROID_HOME=${HOME}/Sovellukset/android/sdk
export PATH=$NDK_ROOT:$PATH
export PATH=$ANDROID_SDK_ROOT:$PATH
export PATH=$ANDROID_SDK_ROOT/tools:$PATH
@ -21,6 +21,7 @@ export PATH=$NPM_PACKAGES/bin:$PATH
# Local
export PATH=/usr/local/bin:$PATH
export PATH=${HOME}/.local/bin:$PATH
# Own scripts
export LANXU_SCRIPTS_ROOT=${HOME}/Scripts