From 53e38244f45cdf757c89810f15d479ddcd7b9523 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 12 Oct 2020 06:26:51 -0500 Subject: [PATCH 1/5] Desktop updates --- apps/de/sway/config | 4 +++- apps/kitty/kitty.conf | 2 +- bin/lib/arch-linux/provisioning/2-essentials.bash | 1 + bin/lock-and-sleep | 8 -------- env/desktop/bin/reboot-to-windows | 3 +++ 5 files changed, 8 insertions(+), 10 deletions(-) delete mode 100755 bin/lock-and-sleep create mode 100755 env/desktop/bin/reboot-to-windows diff --git a/apps/de/sway/config b/apps/de/sway/config index 35953d1..9940c7f 100644 --- a/apps/de/sway/config +++ b/apps/de/sway/config @@ -119,7 +119,9 @@ bindsym $mod+Control+Alt+k gaps vertical current plus 5 bindsym $mod+Control+equal gaps inner current set $default_gap bindsym $mod+Control+Shift+l exec swaylock -bindsym $mod+Control+Shift+s exec lock-and-sleep +# TODO: toggle-able swayidle? +# TODO: one-time swayidle? +# bindsym $mod+Control+Shift+s exec lock-and-disable-monitors mode "resize" { bindsym $left resize shrink width 10 px or 10 ppt diff --git a/apps/kitty/kitty.conf b/apps/kitty/kitty.conf index b698d2f..0f39402 100644 --- a/apps/kitty/kitty.conf +++ b/apps/kitty/kitty.conf @@ -1,4 +1,4 @@ -font_family Iosevka Fixed SS07 Medium +font_family iosevka-lyte repaint_delay 5 input_delay 1 diff --git a/bin/lib/arch-linux/provisioning/2-essentials.bash b/bin/lib/arch-linux/provisioning/2-essentials.bash index ed84fb9..d84bf49 100755 --- a/bin/lib/arch-linux/provisioning/2-essentials.bash +++ b/bin/lib/arch-linux/provisioning/2-essentials.bash @@ -14,6 +14,7 @@ pacaur --needed -S \ openssh mosh `# Remote Access` \ openssl `# Crypto` \ erlang elixir `# Elixir Language` \ + asdf-vm `# Runtime Version Manager` \ nodejs npm yarn `# JavaScript Runtime` \ python python-pip `# Python 3 Language` \ pass `# Password Management` \ diff --git a/bin/lock-and-sleep b/bin/lock-and-sleep deleted file mode 100755 index 9716996..0000000 --- a/bin/lock-and-sleep +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -if is_wayland; then - swaylock & -else - dm-tool switch-to-greeter & -fi -sudo systemctl suspend diff --git a/env/desktop/bin/reboot-to-windows b/env/desktop/bin/reboot-to-windows new file mode 100755 index 0000000..b37e5bc --- /dev/null +++ b/env/desktop/bin/reboot-to-windows @@ -0,0 +1,3 @@ +#!/usr/bin/env sh +sudo efibootmgr -n 0001 +sudo reboot From 2c73a5280cac56298c0bf8d14c47770fa049dcf7 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 16 Oct 2020 12:35:29 -0500 Subject: [PATCH 2/5] Fix plugin setup and basic colors --- apps/kak/kakrc | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/apps/kak/kakrc b/apps/kak/kakrc index 730c97a..2a7dee8 100644 --- a/apps/kak/kakrc +++ b/apps/kak/kakrc @@ -1,23 +1,51 @@ source "%val{config}/plugins/plug.kak/rc/plug.kak" -plug "andreyorst/fzf.kak" - -map global normal ': fzf-mode' +plug "TeddyDD/kakoune-selenized" theme +plug "robertmeta/plug.kak" noload do %{ + set global plug_always_ensure true + set global plug_max_active_downloads 25 +} +plug "alexherbo2/connect.kak" +plug "ul/kak-lsp" do %{ + cargo build --release --locked + cargo install --force --path . +} +plug 'delapouite/kakoune-buffers' %{ + # map global normal ^ q + # map global normal Q + # map global normal q b + # map global normal Q B + # map global normal + # map global normal + # map global normal b ': enter-buffers-mode' -docstring 'buffers' + # map global normal B ': enter-user-mode -lock buffers' -docstring 'buffers (lock)' +} map global normal D 'd' -docstring 'delete to end of line' map global normal Y 'y' -docstring 'yank to end of line' +declare -hidden range-faces show_matching_range + hook global InsertChar k %{ try %{ - exec -draft hh jk d - exec -}} -hook global InsertChar j %{ try %{ - exec -draft hh jj d + exec -draft hH jk d exec }} +hook global WinCreate .* %{ + addhl ranges show_matching_range +} + +map global normal '^' '' -docstring 'jump to start of line' + +add-highlighter global/show-trailing-whitespaces regex '\h+$' 0:Error +add-highlighter global show-matching + set global tabstop 2 set global indentwidth 2 -set-option global fzf_file_command 'rg' - +face global Information white,black +face global MenuBackground white,black +face global MenuForeground black,blue +face global PrimarySelection black,blue +face global PrimarySelection black,white +face global MatchingChar default,gray From 3b23337829595fac7468dcc0a5e9f919df9db800 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 16 Oct 2020 13:29:29 -0500 Subject: [PATCH 3/5] Work on lsp stuff --- apps/kak/kakrc | 28 +++++++++++++--------------- apps/neovim/plugins.vim | 33 ++++++++++++++++----------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/apps/kak/kakrc b/apps/kak/kakrc index 2a7dee8..f2ef56d 100644 --- a/apps/kak/kakrc +++ b/apps/kak/kakrc @@ -1,14 +1,13 @@ source "%val{config}/plugins/plug.kak/rc/plug.kak" plug "TeddyDD/kakoune-selenized" theme -plug "robertmeta/plug.kak" noload do %{ - set global plug_always_ensure true - set global plug_max_active_downloads 25 +plug "robertmeta/plug.kak" noload config %{ + set global plug_always_ensure true + set global plug_max_active_downloads 25 } plug "alexherbo2/connect.kak" -plug "ul/kak-lsp" do %{ - cargo build --release --locked - cargo install --force --path . +plug "kak-lsp/kak-lsp" do %{ + cargo install --locked --force --path . } plug 'delapouite/kakoune-buffers' %{ # map global normal ^ q @@ -21,24 +20,23 @@ plug 'delapouite/kakoune-buffers' %{ # map global normal B ': enter-user-mode -lock buffers' -docstring 'buffers (lock)' } +# eval %sh{kak-lsp --kakoune -s $kak_session} +hook global WinSetOption filetype=(rust|python|go|javascript|typescript|c|cpp|nim) %{ + lsp-enable-window +} + map global normal D 'd' -docstring 'delete to end of line' map global normal Y 'y' -docstring 'yank to end of line' -declare -hidden range-faces show_matching_range - hook global InsertChar k %{ try %{ exec -draft hH jk d exec }} -hook global WinCreate .* %{ - addhl ranges show_matching_range -} - map global normal '^' '' -docstring 'jump to start of line' -add-highlighter global/show-trailing-whitespaces regex '\h+$' 0:Error -add-highlighter global show-matching +# add-highlighter global/show-trailing-whitespaces regex '\h+$' 0:Error +# add-highlighter global show-matching set global tabstop 2 set global indentwidth 2 @@ -48,4 +46,4 @@ face global MenuBackground white,black face global MenuForeground black,blue face global PrimarySelection black,blue face global PrimarySelection black,white -face global MatchingChar default,gray +face global MatchingChar default,bright-black diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index cd13d98..7d6abbb 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -46,29 +46,29 @@ let g:polyglot_disabled = ['cue', 'cuesheet'] if exists('asmanviewer') || exists('nosession') let g:prosession_dir = '/dev/null' else - Plug 'tpope/vim-obsession' " session ease-of-use - Plug 'dhruvasagar/vim-prosession' " more session ease-of-use endif Plug 'junegunn/vim-plug' " plugin manager should manage itself +Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding +Plug 'junegunn/fzf.vim' " helpers for using fzf in vim +Plug 'tpope/vim-obsession' " session ease-of-use +Plug 'dhruvasagar/vim-prosession' " more session ease-of-use Plug 'vim-airline/vim-airline' " status line Plug 'vim-airline/vim-airline-themes' " more minimal status line Plug 'nathanaelkane/vim-indent-guides' " indentation guides Plug 'SirVer/ultisnips' " snippet manager -Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding -Plug 'junegunn/fzf.vim' " helpers for using fzf in vim Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements Plug 'vim-scripts/LargeFile' " gracefully handle very large files Plug 'tpope/vim-commentary' " toggle comments in code easily Plug 'tpope/vim-repeat' " better vim repeating for plugin-provided actions -Plug 'vim-scripts/SyntaxRange' " defined different syntax ranges in a file for highlighting -Plug 'tmux-plugins/vim-tmux-focus-events' " allow transitions within tmux -Plug 'christoomey/vim-tmux-navigator' " allow transitions within tmux -Plug 'godlygeek/tabular' " align text +Plug 'vim-scripts/SyntaxRange' " define syntax ranges +Plug 'tmux-plugins/vim-tmux-focus-events' " allow transitions from tmux +Plug 'christoomey/vim-tmux-navigator' " allow transitions to tmux +Plug 'godlygeek/tabular' " commands for aligning text Plug 'lytedev/vim-superman' " view man pages with vim Plug 'machakann/vim-sandwich' " quickly modify text surrounding objects -Plug 'tpope/vim-speeddating' " vim knows about date-like text objects -Plug 'tpope/vim-fugitive' " vim git commands +Plug 'tpope/vim-speeddating' " date-like text objects +Plug 'tpope/vim-fugitive' " git commands Plug 'michaeljsmith/vim-indent-object' " adds an indentation level text object Plug 'wellle/targets.vim' " adds some more handy text objects Plug 'dbakker/vim-projectroot' " adds helper functions for getting to a project's root directory @@ -76,8 +76,6 @@ Plug 'junegunn/goyo.vim' " better distrac Plug 'junegunn/limelight.vim' " dim inactive blocks of code Plug 'tpope/vim-sleuth' " try and detect indent method Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings -Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} " moonscript language -Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language Plug 'scrooloose/nerdtree' " file browser Plug 'tpope/vim-eunuch' " unix helper commands Plug 'mbbill/undotree' " undo tree visualizer @@ -85,15 +83,16 @@ Plug 'mbbill/undotree' " undo tree visu " language support Plug 'sheerun/vim-polyglot' " vim plugin loader for many languages +Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} " moonscript language Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language -Plug 'neoclide/coc.nvim', {'branch': 'release'} " language server interface -Plug 'elixir-lsp/elixir-ls', {'for': ['elixir', 'eelixir'], 'do': { -> g:elixirls.compile() }} -Plug 'tpope/vim-dadbod' " vim +" Plug 'neoclide/coc.nvim', {'branch': 'release'} " language server interface +Plug 'neovim/nvim-lspconfig' " neovim-native language server interface +Plug 'tpope/vim-dadbod' " vim database functions Plug 'lytedev/elm-vim', {'for': ['elm']} " elm lang Plug 'google/vim-jsonnet', {'for': ['jsonnet', 'libsonnet']} " jsonnet Plug 'sirtaj/vim-openscad', {'for': ['scad']} " openscad -Plug 'jjo/vim-cue' -Plug 'chrisbra/csv.vim' +Plug 'jjo/vim-cue' " cuelang Plug 'calviken/vim-gdscript3', {'for': ['gdscript']} " godot scripts +" Plug 'chrisbra/csv.vim' " Plug 'ssh://git@git.lyte.dev:2222/lytedev/vim-lytlang.git' From faeb7bd0d2287228e8f6b0e4ca7f9d4736d13888 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 23 Oct 2020 11:01:31 -0500 Subject: [PATCH 4/5] Various updates --- apps/de/x/resources | 2 +- apps/kak/colors/selenized-black.kak | 83 ++++++++++++++++++++++++++ apps/kak/colors/selenized-dark.kak | 83 ++++++++++++++++++++++++++ apps/kak/colors/selenized-light.kak | 90 +++++++++++++++++++++++++++++ apps/kak/colors/selenized-white.kak | 90 +++++++++++++++++++++++++++++ apps/mpd/mpd.conf | 28 +++++++++ apps/ncmpcpp/config | 7 +++ apps/neovim/plugins.vim | 4 +- env/desktop/bin/reboot-to-windows | 2 +- setup.bash | 6 ++ 10 files changed, 391 insertions(+), 4 deletions(-) create mode 100644 apps/kak/colors/selenized-black.kak create mode 100644 apps/kak/colors/selenized-dark.kak create mode 100644 apps/kak/colors/selenized-light.kak create mode 100644 apps/kak/colors/selenized-white.kak create mode 100644 apps/mpd/mpd.conf create mode 100644 apps/ncmpcpp/config diff --git a/apps/de/x/resources b/apps/de/x/resources index 3d47fe4..4171b2d 100755 --- a/apps/de/x/resources +++ b/apps/de/x/resources @@ -1,5 +1,5 @@ ! font -#define mono_font iosevka-lyte +#define mono_font Iosevka #define mono_font_size 14 #define bar_font_size 12 #define mono_font_letterspace 0 diff --git a/apps/kak/colors/selenized-black.kak b/apps/kak/colors/selenized-black.kak new file mode 100644 index 0000000..c5c3c09 --- /dev/null +++ b/apps/kak/colors/selenized-black.kak @@ -0,0 +1,83 @@ +#################### +# SELENIZED BLACK # +#################### +# theme by Jan Warchoł +# ported by TeddyDD + +evaluate-commands %sh{ + +bg="rgb:181818" +black="rgb:252525" +br_black="rgb:3b3b3b" +white="rgb:777777" +fg="rgb:b9b9b9" +br_white="rgb:dedede" + +red="rgb:ed4a46" +green="rgb:70b433" +yellow="rgb:dbb32d" +blue="rgb:368aeb" +magenta="rgb:eb6eb7" +cyan="rgb:3fc5b7" +orange="rgb:e67f43" +violet="rgb:a580e2" + +br_red="rgb:ff5e56" +br_green="rgb:83c746" +br_yellow="rgb:efc541" +br_blue="rgb:4f9cfe" +br_magenta="rgb:ff81ca" +br_cyan="rgb:56d8c9" +br_orange="rgb:fa9153" +br_violet="rgb:b891f5" + +## code +echo " +set-face global value ${orange}+b +set-face global type ${br_orange} +set-face global variable ${magenta} +set-face global module ${blue} +set-face global function ${br_cyan} +set-face global string ${br_green} +set-face global keyword ${violet}+b +set-face global operator ${br_cyan} +set-face global attribute ${orange} +set-face global comment ${white} +set-face global meta ${br_orange} +set-face global builtin ${fg}+b + +set-face global title ${blue}+u +set-face global header ${br_cyan}+u +set-face global bold ${br_white}+b +set-face global italic ${br_white}+i +set-face global mono ${br_green} +set-face global block ${orange} +set-face global link $blue +set-face global bullet ${br_magenta} +set-face global list ${magenta} + +set-face global Default ${fg},${bg} +set-face global PrimarySelection $black,$white +set-face global SecondarySelection ${fg},$br_black+i +set-face global PrimaryCursor $bg,$red+b +set-face global SecondaryCursor $black,$br_cyan+i +set-face global MatchingChar $black,$blue +set-face global Search $br_white,$green +set-face global CurrentWord $white,$blue + +set-face global MenuForeground $cyan,$br_black+b +set-face global MenuBackground $fg,$black + +set-face global Information $br_yellow,$black +set-face global Error $black,$br_red + +set-face global BufferPadding $black,$black +set-face global Whitespace $white +set-face global StatusLine $fg,$black +set-face global StatusLineInfo $yellow,$black + +set-face global LineNumbers default +set-face global LineNumberCursor default,default+r +" + +} diff --git a/apps/kak/colors/selenized-dark.kak b/apps/kak/colors/selenized-dark.kak new file mode 100644 index 0000000..fc2f6e1 --- /dev/null +++ b/apps/kak/colors/selenized-dark.kak @@ -0,0 +1,83 @@ +################## +# SELENIZED DARK # +################## +# theme by Jan Warchoł +# ported by Delapouite + +evaluate-commands %sh{ + +bg="rgb:103c48" +black="rgb:184956" +br_black="rgb:2d5b69" +white="rgb:72898f" +fg="rgb:adbcbc" +br_white="rgb:cad8d9" + +red="rgb:fa5750" +green="rgb:75b938" +yellow="rgb:dbb32d" +blue="rgb:4695f7" +magenta="rgb:f275be" +cyan="rgb:41c7b9" +orange="rgb:ed8649" +violet="rgb:af88eb" + +br_red="rgb:ff665c" +br_green="rgb:84c747" +br_yellow="rgb:ebc13d" +br_blue="rgb:58a3ff" +br_magenta="rgb:ff84cd" +br_cyan="rgb:53d6c7" +br_orange="rgb:fd9456" +br_violet="rgb:bd96fa" + +## code +echo " +set-face global value ${orange}+b +set-face global type ${br_orange} +set-face global variable ${magenta} +set-face global module ${blue} +set-face global function ${br_cyan} +set-face global string ${br_green} +set-face global keyword ${violet}+b +set-face global operator ${br_cyan} +set-face global attribute ${orange} +set-face global comment ${white} +set-face global meta ${br_orange} +set-face global builtin ${fg}+b + +set-face global title ${blue}+u +set-face global header ${br_cyan}+u +set-face global bold ${br_white}+b +set-face global italic ${br_white}+i +set-face global mono ${br_green} +set-face global block ${orange} +set-face global link $blue +set-face global bullet ${br_magenta} +set-face global list ${magenta} + +set-face global Default ${fg},${bg} +set-face global PrimarySelection $black,$white +set-face global SecondarySelection ${fg},$br_black+i +set-face global PrimaryCursor $bg,$red+b +set-face global SecondaryCursor $black,$br_cyan+i +set-face global MatchingChar $black,$blue +set-face global Search $br_white,$green +set-face global CurrentWord $white,$blue + +set-face global MenuForeground $cyan,$br_black+b +set-face global MenuBackground $fg,$black + +set-face global Information $br_yellow,$black +set-face global Error $black,$br_red + +set-face global BufferPadding $black,$black +set-face global Whitespace $white +set-face global StatusLine $fg,$black +set-face global StatusLineInfo $yellow,$black + +set-face global LineNumbers default +set-face global LineNumberCursor default,default+r +" + +} diff --git a/apps/kak/colors/selenized-light.kak b/apps/kak/colors/selenized-light.kak new file mode 100644 index 0000000..96ae169 --- /dev/null +++ b/apps/kak/colors/selenized-light.kak @@ -0,0 +1,90 @@ +#################### +# SELENIZED LIGHT # +#################### +# theme by Jan Warchoł +# ported by TeddyDD + +evaluate-commands %sh{ + +bg='rgb:fbf3db' +black='rgb:ece3cc' +br_black='rgb:d5cdb6' +white='rgb:909995' +fg='rgb:53676d' +br_white='rgb:3a4d53' + +red='rgb:d2212d' +green='rgb:489100' +yellow='rgb:ad8900' +blue='rgb:0072d4' +magenta='rgb:ca4898' +cyan='rgb:009c8f' +orange='rgb:c25d1e' +violet='rgb:8762c6' + +br_red='rgb:cc1729' +br_green='rgb:428b00' +br_yellow='rgb:a78300' +br_blue='rgb:006dce' +br_magenta='rgb:c44392' +br_cyan='rgb:00978a' +br_orange='rgb:bc5819' +br_violet='rgb:825dc0' + +## code +echo " +set-face global value ${orange}+b +set-face global type ${br_orange} +set-face global variable ${magenta} +set-face global module ${green} +set-face global function ${br_cyan} +set-face global string ${green} +set-face global keyword ${violet}+b +set-face global operator ${br_cyan} +set-face global attribute ${orange} +set-face global comment ${br_black} +set-face global meta ${br_orange} +set-face global builtin ${fg}+b +" + +## markup +echo " +set-face global title ${blue}+u +set-face global header ${br_cyan} +set-face global bold ${br_orange}+b +set-face global italic ${orange}+i +set-face global mono ${green} +set-face global block ${orange} +set-face global link $blue +set-face global bullet ${br_magenta} +set-face global list ${magenta} +" + +echo " +set-face global Default ${br_white},${bg} +set-face global PrimarySelection ${fg},$br_black+i +set-face global SecondarySelection $black,$white +set-face global PrimaryCursor $black,$red+b +set-face global SecondaryCursor $bg,$br_cyan+i +set-face global MatchingChar $black,$blue +set-face global Search $br_white,$green +set-face global CurrentWord $white,$blue + +# when item focused in menu +set-face global MenuForeground $orange,$br_black+d +# default bottom menu and autocomplete +set-face global MenuBackground $fg,$black + +set-face global Information $yellow,$black +set-face global Error $black,$red + +set-face global BufferPadding $black,$black +set-face global Whitespace $br_black +set-face global StatusLine $fg,$br_black +set-face global StatusLineInfo $blue,$br_black + +set-face global LineNumbers default +set-face global LineNumberCursor default,default+r +" + +} diff --git a/apps/kak/colors/selenized-white.kak b/apps/kak/colors/selenized-white.kak new file mode 100644 index 0000000..0e8cc63 --- /dev/null +++ b/apps/kak/colors/selenized-white.kak @@ -0,0 +1,90 @@ +################### +# SELENIZED WHITE # +################### +# theme by Jan Warchoł +# ported by Delapouite + +evaluate-commands %sh{ + +bg='rgb:ffffff' +black='rgb:ebebeb' +br_black='rgb:cdcdcd' +white='rgb:878787' +fg='rgb:474747' +br_white='rgb:282828' + +red='rgb:d6000c' +green='rgb:1d9700' +yellow='rgb:c49700' +blue='rgb:0064e4' +magenta='rgb:dd0f9d' +cyan='rgb:00ad9c' +orange='rgb:d04a00' +violet='rgb:7f51d6' + +br_red='rgb:bf0000' +br_green='rgb:008400' +br_yellow='rgb:af8500' +br_blue='rgb:0054cf' +br_magenta='rgb:c7008b' +br_cyan='rgb:009a8a' +br_orange='rgb:ba3700' +br_violet='rgb:6b40c3' + +## code +echo " +set-face global value ${orange}+b +set-face global type ${br_orange} +set-face global variable ${magenta} +set-face global module ${green} +set-face global function ${br_cyan} +set-face global string ${green} +set-face global keyword ${violet}+b +set-face global operator ${br_cyan} +set-face global attribute ${orange} +set-face global comment ${br_black} +set-face global meta ${br_orange} +set-face global builtin ${fg}+b +" + +## markup +echo " +set-face global title ${blue}+u +set-face global header ${br_cyan} +set-face global bold ${br_orange}+b +set-face global italic ${orange}+i +set-face global mono ${green} +set-face global block ${orange} +set-face global link $blue +set-face global bullet ${br_magenta} +set-face global list ${magenta} +" + +echo " +set-face global Default ${br_white},${bg} +set-face global PrimarySelection ${fg},$br_black+i +set-face global SecondarySelection $black,$white +set-face global PrimaryCursor $black,$red+b +set-face global SecondaryCursor $bg,$br_cyan+i +set-face global MatchingChar $black,$blue +set-face global Search $br_white,$green +set-face global CurrentWord $white,$blue + +# when item focused in menu +set-face global MenuForeground $orange,$br_black+d +# default bottom menu and autocomplete +set-face global MenuBackground $fg,$black + +set-face global Information $yellow,$black +set-face global Error $black,$red + +set-face global BufferPadding $black,$black +set-face global Whitespace $br_black +set-face global StatusLine $fg,$br_black +set-face global StatusLineInfo $blue,$br_black + +set-face global LineNumbers default +set-face global LineNumberCursor default,default+r +" + +} diff --git a/apps/mpd/mpd.conf b/apps/mpd/mpd.conf new file mode 100644 index 0000000..27e271a --- /dev/null +++ b/apps/mpd/mpd.conf @@ -0,0 +1,28 @@ +auto_update "yes" + +audio_output { + type "pulse" + name "pulse audio" +} + +db_file "~/.local/mpd/database" +log_file "syslog" +pid_file "~/.local/mpd/pid" +state_file "~/.local/mpd/pid" +sticker_file "~/.local/mpd/sticker.sql" + +playlist_directory "~/../music/mpd-playlists" +music_directory "~/../music" + +# bind_to_address "~/.local/mpd/socket" +bind_to_address "any" +port "6600" +restore_paused "yes" +log_level "verbose" + +input { + plugin "curl" + # proxy "proxy.isp.com:8080" + # proxy_user "user" + # proxy_password "password" +} diff --git a/apps/ncmpcpp/config b/apps/ncmpcpp/config new file mode 100644 index 0000000..422b610 --- /dev/null +++ b/apps/ncmpcpp/config @@ -0,0 +1,7 @@ +mpd_music_dir = "~/../music" +lyrics_directory = ~/.ncmpcpp/lyrics +ncmpcpp_directory = ~/.ncmpcpp +mpd_host = "localhost" +mpd_port = "6600" +mpd_connection_timeout = "5" +mpd_crossfade_time = "5" diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index 7d6abbb..852873b 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -46,13 +46,13 @@ let g:polyglot_disabled = ['cue', 'cuesheet'] if exists('asmanviewer') || exists('nosession') let g:prosession_dir = '/dev/null' else + Plug 'tpope/vim-obsession' " session ease-of-use + Plug 'dhruvasagar/vim-prosession' " more session ease-of-use endif Plug 'junegunn/vim-plug' " plugin manager should manage itself Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding Plug 'junegunn/fzf.vim' " helpers for using fzf in vim -Plug 'tpope/vim-obsession' " session ease-of-use -Plug 'dhruvasagar/vim-prosession' " more session ease-of-use Plug 'vim-airline/vim-airline' " status line Plug 'vim-airline/vim-airline-themes' " more minimal status line Plug 'nathanaelkane/vim-indent-guides' " indentation guides diff --git a/env/desktop/bin/reboot-to-windows b/env/desktop/bin/reboot-to-windows index b37e5bc..cfd84f6 100755 --- a/env/desktop/bin/reboot-to-windows +++ b/env/desktop/bin/reboot-to-windows @@ -1,3 +1,3 @@ #!/usr/bin/env sh -sudo efibootmgr -n 0001 +sudo efibootmgr -n 0000 sudo reboot diff --git a/setup.bash b/setup.bash index 67f3925..22280f9 100755 --- a/setup.bash +++ b/setup.bash @@ -116,6 +116,12 @@ links=( # XDG user directories "apps/shell/user-dirs" "$XDG_CONFIG_HOME/user-dirs.dirs" + + # Music Player Daemon + "apps/mpd" "$XDG_CONFIG_HOME/mpd" + + # MPD client + "apps/ncmpcpp" "$HOME/.ncmpcpp" ) chmod 700 -R "$HOME/.bin" From 3dc9ab3879da5f5bcb9b2a3c1a98cbc89d06c973 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 26 Oct 2020 11:56:49 -0500 Subject: [PATCH 5/5] Fixes for arch before moving to NixOS anyways...? --- apps/de/sway/config | 4 +-- apps/kanshi/config | 6 ++++ apps/kanshi/desktop-H-workspaces.sh | 24 ++++++++++++++++ .../arch-linux/provisioning/2-essentials.bash | 1 + env/desktop/sway/config.d/main | 28 +++++++++---------- env/laptop/sway/config.d/main | 2 +- setup.bash | 3 ++ 7 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 apps/kanshi/config create mode 100755 apps/kanshi/desktop-H-workspaces.sh diff --git a/apps/de/sway/config b/apps/de/sway/config index 9940c7f..77fb313 100644 --- a/apps/de/sway/config +++ b/apps/de/sway/config @@ -141,7 +141,7 @@ mode "resize" { default_border pixel 5 for_window [app_id="floating_terminal"] floating enable for_window [class="floating_terminal"] floating enable -for_window [class=".*"] layout splith +for_window [class=".*"] layout splitv # bindsym $mod+r mode "resize" @@ -161,9 +161,9 @@ client.focused_inactive #111111 #111111 #ffffff #111111 #111111 client.unfocused #111111 #111111 #ffffff #111111 #111111 exec mako -exec gammastep -t 6500:3500 -l 39.0:-94.5 exec_always makoctl reload exec_always notify-send -a "Sway" -i ~/.wallpaper "Sway configuration loaded." +exec_always kanshi include $ENV_PATH/sway/config.d/* diff --git a/apps/kanshi/config b/apps/kanshi/config new file mode 100644 index 0000000..48698c0 --- /dev/null +++ b/apps/kanshi/config @@ -0,0 +1,6 @@ +profile desktop-H { + output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,560 scale 1 transform normal + output "Dell Inc. DELL U2719DC 5DL4QS2" enable mode 2560x1440@60Hz position 0,0 scale 1 transform 270 + output "Dell Inc. DELL U2719DC 9DL4QS2" enable mode 2560x1440@60Hz position 4880,0 scale 1 transform 90 + exec "$HOME/.config/dotfiles/apps/kanshi/desktop-H-workspaces.sh" +} diff --git a/apps/kanshi/desktop-H-workspaces.sh b/apps/kanshi/desktop-H-workspaces.sh new file mode 100755 index 0000000..8929748 --- /dev/null +++ b/apps/kanshi/desktop-H-workspaces.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env sh + +set -x + +uw='Samsung Electric Company CF791 HTRJ500315' +l='Dell Inc. DELL U2719DC 5DL4QS2' +r='Dell Inc. DELL U2719DC 9DL4QS2' + +mws() { + swaymsg workspace "$1", move workspace to output "\"$2\"" +} + +mws 5 "$l" +mws 6 "$l" +mws 4 "$l" + +mws 8 "$r" +mws 9 "$r" +mws 7 "$r" + +mws 2 "$uw" +mws 3 "$uw" +mws 1 "$uw" + diff --git a/bin/lib/arch-linux/provisioning/2-essentials.bash b/bin/lib/arch-linux/provisioning/2-essentials.bash index d84bf49..4d06254 100755 --- a/bin/lib/arch-linux/provisioning/2-essentials.bash +++ b/bin/lib/arch-linux/provisioning/2-essentials.bash @@ -40,6 +40,7 @@ pacaur --needed -S \ bspwm-git sxhkd-git xdo-git `# Window Manager and Tools for its use` \ wlroots-git sway-git `# Wayland Compositor` \ swaylock `# Wayland Compositor` \ + kanshi `# Monitor Management for Wayland` \ waybar mako `# Wayland Bar & Notifications` \ slurp grim wl-clipboard `# Wayland Screen Selection & Clipping` \ wl-clipboard `# Wayland Clipboard CLI` \ diff --git a/env/desktop/sway/config.d/main b/env/desktop/sway/config.d/main index 711dbc7..e771715 100644 --- a/env/desktop/sway/config.d/main +++ b/env/desktop/sway/config.d/main @@ -1,27 +1,27 @@ exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000' # shared -workspace 1 output DP-1 -workspace 2 output DP-1 -workspace 3 output DP-1 +# workspace 1 output DP-1 +# workspace 2 output DP-1 +# workspace 3 output DP-1 # --I format # output DP-1 res 3440x1440@100Hz pos 2560 720 # output DP-2 res 2560x1440@60Hz pos 0 0 # output DP-4 res 2560x1440@60Hz pos 6000 0 transform 270 -workspace 4 output DP-2 -workspace 5 output DP-2 -workspace 6 output DP-2 -workspace 7 output DP-4 -workspace 8 output DP-4 -workspace 9 output DP-4 +# workspace 4 output DP-2 +# workspace 5 output DP-2 +# workspace 6 output DP-2 +# workspace 7 output DP-4 +# workspace 8 output DP-4 +# workspace 9 output DP-4 # H format -output DP-1 res 3440x1440@100Hz pos 1440 560 -output DP-2 res 2560x1440@60Hz pos 0 0 transform 90 -output DP-3 res 2560x1440@60Hz pos 0 0 transform 90 -output DP-4 res 2560x1440@60Hz pos 4880 0 transform 270 -output DP-5 res 2560x1440@60Hz pos 4880 0 transform 270 +# output DP-1 res 3440x1440@100Hz pos 1440 560 +# output DP-2 res 2560x1440@60Hz pos 0 0 transform 90 +# output DP-3 res 2560x1440@60Hz pos 0 0 transform 90 +# output DP-4 res 2560x1440@60Hz pos 4880 0 transform 270 +# output DP-5 res 2560x1440@60Hz pos 4880 0 transform 270 # iIi format # output DP-1 res 3440x1440@100Hz pos 1440 0 transform 90 diff --git a/env/laptop/sway/config.d/main b/env/laptop/sway/config.d/main index 61a3a53..959fb08 100644 --- a/env/laptop/sway/config.d/main +++ b/env/laptop/sway/config.d/main @@ -1,5 +1,5 @@ exec libinput-gestures -c $DOTFILES_PATH/apps/de/libinput/sway-gestures.conf - +exec gammastep -t 6500:3500 -l 39.0:-94.5 # exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000' bindswitch lid:toggle exec swaylock diff --git a/setup.bash b/setup.bash index d731581..0103ada 100755 --- a/setup.bash +++ b/setup.bash @@ -125,6 +125,9 @@ links=( # XDG user directories "env/nix/pkgs" "$XDG_CONFIG_HOME/nixpkgs" + + # Kanshi configuration + "apps/kanshi" "$XDG_CONFIG_HOME/kanshi" ) chmod 700 -R "$HOME/.bin"