From 8a88aa5b0128508c490fc833e6198f821917a6f5 Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Thu, 6 Jun 2019 10:45:56 +0200 Subject: [PATCH] some updates --- config.desktop.sh | 7 +- dots/alacritty/alacritty.yml.template | 6 +- dots/dunst/.link | 2 +- dots/fish/config.fish | 18 +- dots/home/.emacs | 96 +++++-- dots/i3/config.template | 6 +- dots/i3status/config.toml.template | 9 +- dots/ncmpcpp/config | 362 +++----------------------- dots/screenlayout/desktop.sh | 2 +- dots/scripts/ec | 14 +- 10 files changed, 147 insertions(+), 375 deletions(-) diff --git a/config.desktop.sh b/config.desktop.sh index 9137274..9424082 100644 --- a/config.desktop.sh +++ b/config.desktop.sh @@ -3,8 +3,9 @@ ETH_DEV="enp3s0" MAIN_NET=$ETH_DEV MAIN_FONT="Source Code Pro 8" -MAIN_MONITOR=DP-1 -MONITORS=(DVI-I-1 DP-3) -SCREENLAYOUT="xrandr --output DVI-I-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-3 --mode 1920x1080 --pos 3840x0 --rotate normal --output DP-2 --off --output DP-1 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output DVI-D-1 --off" +MAIN_MONITOR=DisplayPort-0 +MONITORS=(DVI-I-0 DisplayPort-2) +SCREENLAYOUT="xrandr --output DisplayPort-1 --off --output DisplayPort-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output DisplayPort-2 --mode 1920x1080 --pos 3840x0 --rotate normal --output DVI-I-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DVI-D-1 --off" RYGEL="true" BAR_POS="bottom" +DPI=96 diff --git a/dots/alacritty/alacritty.yml.template b/dots/alacritty/alacritty.yml.template index 22618e0..301cb25 100644 --- a/dots/alacritty/alacritty.yml.template +++ b/dots/alacritty/alacritty.yml.template @@ -33,8 +33,8 @@ window: # The FreeType rasterizer needs to know the device DPI for best results # (changes require restart) dpi: - x: 157.0 - y: 157.0 + x: {{ DPI }} + y: {{ DPI }} # Display tabs using this many cells (changes require restart) tabspaces: 8 @@ -63,7 +63,7 @@ font: style: italic # Point size of the font - size: 9.9 + size: 9 # Offset is the extra space around each character. offset.y can be thought of # as modifying the linespacing, and offset.x as modifying the letter spacing. diff --git a/dots/dunst/.link b/dots/dunst/.link index 91847c8..d999f91 100644 --- a/dots/dunst/.link +++ b/dots/dunst/.link @@ -1,2 +1,2 @@ TASKNAME="Configure Dunst" -LINKTO=".config/" \ No newline at end of file +LINKTO=".config/" diff --git a/dots/fish/config.fish b/dots/fish/config.fish index 19f5a4c..5681f26 100644 --- a/dots/fish/config.fish +++ b/dots/fish/config.fish @@ -2,5 +2,21 @@ set fish_greeting "" set -gx PATH $HOME/.scripts $PATH set -g theme_display_date no set -g fish_key_bindings fish_default_key_bindings +set -g FZF_PREVIEW_FILE_CMD "bat --color=always" +set -g FZF_CD_CMD "fd --type d . \$dir" +set -g FZF_FIND_FILE_CMD "fd --type f . \$dir" +set -g FZF_OPEN_COMMAND "fd . \$dir" -alias mktargz "tar -zcvf" \ No newline at end of file +set -g FZF_LEGACY_KEYBINDINGS 1 +set -g FZF_COMPLETE 0 + +set -U FZF_FIND_FILE_OPTS '--preview "$FZF_PREVIEW_FILE_CMD {}"' +alias mktargz "tar -zcvf" +alias frem "sudo pacman -R (pacman -Q | fzf -m --preview=\"echo {} | cut -d' ' -f1 | pacman -Si -\" | cut -d' ' -f1 )" +alias fyay "yay -Pc x | fzf -m | cut -f1 | yay -S -" +alias ftmux "tmux a -t (tmux ls | fzf --height=5 | cut -d ' ' -f 1)" + +function cmus + set cmus_sess "cmus" + tmux new-session -A -s $cmus_sess "bash -c cmus" +end diff --git a/dots/home/.emacs b/dots/home/.emacs index c31162c..7f9e9a2 100644 --- a/dots/home/.emacs +++ b/dots/home/.emacs @@ -45,13 +45,15 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("4cf3221feff536e2b3385209e9b9dc4c2e0818a69a1cdb4b522756bcdf4e00a4" "84d2f9eeb3f82d619ca4bfffe5f157282f4779732f48a5ac1484d94d5ff5b279" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" "8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "065efdd71e6d1502877fd56 -21b984cded01717930639ded0e569e1724d058af8" default)) + (quote + ("4cf3221feff536e2b3385209e9b9dc4c2e0818a69a1cdb4b522756bcdf4e00a4" "84d2f9eeb3f82d619ca4bfffe5f157282f4779732f48a5ac1484d94d5ff5b279" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" "8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "065efdd71e6d1502877fd56 +21b984cded01717930639ded0e569e1724d058af8" default))) '(package-selected-packages - '(ethan-wspace sphinx-doc python-docstring elpy htmlize company-anaconda anaconda-mode graphql-mode graphql git-gutter-fringe+ git-timemachine flycheck-pos-tip modalka doom-modeline company-tern persp-projectile perspective all-the-icons-ivy all-the-icons-dired all-the-icons neotree rjsx-mode emmet-mode web-mode counsel-projectile jade-mode srefactor sly-repl-ansi-color sly-quicklisp sly-macrostep sly ranger company-tabnine counsel-notmuch circe-notifications circe pretty-mode lispy info-beamer auctex-latexmk ag indium js-doc yasnippet-classic-snippets yasnippet-snippets ivy-yasnippet counsel sage-shell-mode dummyparens magit-filenotify docker-compose-mode docker js2-refactor flycheck-rtags flycheck ivy-rtags rtags auctex magit flycheck-rust avy-flycheck company racer cargo rust-mode restart-emacs json-mode multiple-cursors swiper ivy xresources-theme powerline)) - '(safe-local-variable-values '((TeX-master . t))) + (quote + (fish-mode pkgbuild-mode realgud fzf ein org-super-agenda company-lsp dap-mode lsp-ui lsp-mode elixir-yasnippets alchemist ethan-wspace sphinx-doc python-docstring elpy htmlize company-anaconda anaconda-mode graphql-mode graphql git-gutter-fringe+ git-timemachine flycheck-pos-tip modalka doom-modeline company-tern persp-projectile perspective all-the-icons-ivy all-the-icons-dired all-the-icons neotree rjsx-mode emmet-mode web-mode counsel-projectile jade-mode srefactor sly-repl-ansi-color sly-quicklisp sly-macrostep sly ranger company-tabnine counsel-notmuch circe-notifications circe pretty-mode lispy info-beamer auctex-latexmk ag indium js-doc yasnippet-classic-snippets yasnippet-snippets ivy-yasnippet counsel sage-shell-mode dummyparens magit-filenotify docker-compose-mode docker js2-refactor flycheck-rtags flycheck ivy-rtags rtags auctex magit flycheck-rust avy-flycheck company racer cargo rust-mode restart-emacs json-mode multiple-cursors swiper ivy xresources-theme powerline))) + '(safe-local-variable-values (quote ((TeX-master . t)))) '(show-paren-mode t) - '(tramp-syntax 'default nil (tramp))) + '(tramp-syntax (quote default) nil (tramp))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -99,6 +101,8 @@ ;; (add-to-list 'company-backends #'company-tabnine) (add-to-list 'company-backends 'company-tern) (add-to-list 'company-backends 'company-anaconda) + (add-to-list 'company-backends 'company-lsp) + (global-company-mode) (setq company-show-numbers t) (setq company-idle-delay 0) @@ -178,6 +182,7 @@ ;;;; Latex (auctex-latexmk-setup) +(setq LaTeX-electric-left-right-brace t) ;;;; JavasScipt @@ -371,22 +376,34 @@ (setq org-refile-targets '((org-agenda-files :maxlevel . 3))) (global-set-key (kbd "C-c a") 'org-agenda) +(setq org-agenda-prefix-format '((agenda . " %i %-12:c%?-12t% s") + (timeline . " % s") + (todo . + " %i %-12:c %(concat \"[ \"(org-format-outline-path (org-get-outline-path)) \" ]\") ") + (tags . + " %i %-12:c %(concat \"[ \"(org-format-outline-path (org-get-outline-path)) \" ]\") ") + (search . " %i %-12:c")) + ) + ;; (org-super-agenda--def-auto-group path "their path in the outline" ;; :key-form (org-super-agenda--when-with-marker-buffer (org-super-agenda--get-marker item) ;; (when (org-up-heading-safe) ;; (org-format-outline-path (org-get-outline-path t t)) ;; ))) -;; (setq org-super-agenda-groups -;; '(;; Each group has an implicit boolean OR operator between its selectors. -;; ;; (:auto-parent t) +(setq org-super-agenda-groups + '(;; Each group has an implicit boolean OR operator between its selectors. + (:name "NEXT" + :order 1 + :todo "NEXT") + (:name "WAITING" + :order 2 + :todo "WAITING") + (:name "TODO" + :order 3 + :todo "TODO") ; Items that have this TODO keyword + )) - -;; (:name "NEXT" ; Optionally specify section name -;; ;; :auto-path t -;; :todo "NEXT") -;; (:name "TODO" ; Optionally specify section name -;; :todo "TODO") ; Items that have this TODO keyword -;; )) +(org-super-agenda-mode 1) (setq org-agenda-custom-commands '(("X" agenda "" @@ -441,7 +458,25 @@ ;; (put 'upcase-region 'disabled nil) (global-pretty-mode t) (pretty-activate-groups '(:sub-and-superscripts :greek :arithmetic-nary - :arrows :arithmetic)) + r :arrows :arithmetic)) +(defun my-prettify-symbols-compose-p (start end _match) + "Return true iff the symbol MATCH should be composed. +The symbol starts at position START and ends at position END. +This is the default for `prettify-symbols-compose-predicate' +which is suitable for most programming languages such as C or Lisp." + ;; Check that the chars should really be composed into a symbol. + (let* ((syntaxes-beg (if (memq (char-syntax (char-after start)) '(?w ?_)) + '(?w ?_) '(?. ?\\))) + (syntaxes-end (if (memq (char-syntax (char-before end)) '(?w ?_)) + '(?w ?_) '(?. ?\\)))) + (not (or (and + (null (memq (char-before start) '(?_))) + (memq (char-syntax (or (char-before start) ?\s)) syntaxes-beg)) + (and + (null (memq (char-after end) '(?_))) + (memq (char-syntax (or (char-after end) ?\s)) syntaxes-end)) + (nth 8 (syntax-ppss)))))) +(setq prettify-symbols-compose-predicate #'my-prettify-symbols-compose-p) ;;; Avy (global-set-key (kbd "M-g w") @@ -592,7 +627,7 @@ Effect of this translation is global." (modalka-define-kbd "a" "C-a") (modalka-define-kbd "b" "C-b") ;; (modalka-define-kbd "c b" "C-c C-b") -;; (modalka-define-kbd "c c" "C-c C-c") +(modalka-define-kbd "c c" "C-c C-c") ;; (modalka-define-kbd "c k" "C-c C-k") ;; (modalka-define-kbd "c n" "C-c C-n") ;; (modalka-define-kbd "c s" "C-c C-s") @@ -693,7 +728,7 @@ Effect of this translation is global." (whitespace-mode 1) (python-docstring-mode 1))) (add-hook 'python-mode-hook 'anaconda-eldoc-mode) - +(require 'dap-python) (setq whitespace-line-collumn 79) (setq whitespace-style '(face empty tabs lines-tail trailing)) @@ -704,4 +739,29 @@ Effect of this translation is global." ;; Whitespace and teaks (global-ethan-wspace-mode 1) +(setq mode-require-final-newline nil) (electric-pair-mode 1) + +;; EIN +(setq ein:output-type-preference + '(emacs-lisp svg png jpeg html text latex javascript)) + +;; Elixir +(add-hook 'elixir-mode-hook #'lsp) +(setq lsp-clients-elixir-server-executable "/home/hiro/src/elixir-ls/rel/language_server.sh") + +(setq lsp-prefer-flymake nil) +(setq lsp-ui-doc-enable t + lsp-ui-doc-use-childframe t + lsp-ui-doc-position 'top + lsp-ui-doc-include-signature t + lsp-ui-sideline-enable nil + lsp-ui-flycheck-enable t + lsp-ui-flycheck-list-position 'right + lsp-ui-flycheck-live-reporting t + lsp-ui-peek-enable t + lsp-ui-peek-list-width 60 + lsp-ui-peek-peek-height 25) + +(add-hook 'lsp-mode-hook 'lsp-ui-mode) +(add-to-list 'exec-path "/home/hiro/src/elixir-ls/rel/language_server.sh") diff --git a/dots/i3/config.template b/dots/i3/config.template index 875e7d7..819438f 100644 --- a/dots/i3/config.template +++ b/dots/i3/config.template @@ -211,8 +211,6 @@ bar { } } -# XRandR -exec --no-startup-id sh {{ HOME }}/.screenlayout/{{ SCREENLAYOUT }}.sh {{/MONITORS[*]}} # Rygel @@ -257,9 +255,9 @@ client.urgent {{S_orange}} {{S_base03}} {{S_base00}} #dc322f bindsym $mod+Shift+P exec --no-startup-id gopass ls --flat | rofi -dmenu | xargs --no-run-if-empty gopass show -c #exec --no-startup-id i3-msg 'workspace 4; exec st -hold -e ssh chat@ssh.protagon.space -p 5123' -{{ #XRANDR }} +{{ #SCREENLAYOUT }} exec {{ SCREENLAYOUT }} -{{ /XRANDR }} +{{ /SCREENLAYOUT }} exec --no-startup-id udiskie exec --no-startup-id xfce4-clipman diff --git a/dots/i3status/config.toml.template b/dots/i3status/config.toml.template index 3f88a71..34732bb 100644 --- a/dots/i3status/config.toml.template +++ b/dots/i3status/config.toml.template @@ -11,6 +11,10 @@ idle_fg = "{{ S_base3 }}" block = "focused_window" max_width = 21 +[[block]] +block = "music" +buttons = ["play", "next"] + [[block]] block = "disk_space" path = "/" @@ -38,11 +42,6 @@ format = "{1m}" # [[block]] # block = "sound" -# [[block]] -# block = "music" -# player = "google-play-music-desktop-player" -# buttons = ["play", "next"] - [[block]] block = "net" interval = 5 diff --git a/dots/ncmpcpp/config b/dots/ncmpcpp/config index c95e66a..1eb5d16 100644 --- a/dots/ncmpcpp/config +++ b/dots/ncmpcpp/config @@ -175,337 +175,35 @@ message_delay_time = 3 ## ## Note: colors can be nested. ## -# -#song_list_format = {%a - }{%t}|{$8%f$9}$R{$3(%l)$9} -#song_list_format = "$9{$8%a $1►$3 %t}|{$8%a $1►$8 }|{$8 $1►$3 %t}|{$1►$8 %f} $9 $R{$1%l}" -song_list_format = "{$1►$3 %t}|{$1►$8 }|{$1►$8 %f} $1$R{$8 %a}|{$8 } {$1◀ %l}" -#(Kori list below) -#song_list_format = "$2%t$7 $1by$6 %a$1 on %b$9" -# -#song_status_format = {{%a{ "%b"{ (%y)}} - }{%t}}|{%f} -song_status_format = {$8%t}{$8 "%b"}|{$8 "%a"}$8 -# -#song_library_format = {%n - }{%t}|{%f} -# -#tag_editor_album_format = {(%y) }%b -# -## -## Note: Below variables are used for sorting songs in browser. -## The sort mode determines how songs are sorted, and can be used -## in combination with a sort format to specify a custom sorting format. -## Available values for browser_sort_mode are "name", "mtime", "format" -## and "noop". -## -# -#browser_sort_mode = name -# -#browser_sort_format = {%a - }{%t}|{%f} {(%l)} -# -## -## Note: Below variables are for alternative version of user's interface. -## Their syntax supports all tags and colors listed above plus some extra -## markers used for text attributes. They are followed by character '$'. -## After that you can put: -## -## - b - bold text -## - u - underline text -## - r - reverse colors -## - a - use alternative character set -## -## If you don't want to use an attribute anymore, just put it again, but -## this time insert character '/' between '$' and attribute character, -## e.g. {$b%t$/b}|{$r%f$/r} will display bolded title tag or filename -## with reversed colors. -## -# -#alternative_header_first_line_format = $b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b -# -#alternative_header_second_line_format = {{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D} -alternative_header_first_line_format = "$8$aqqu$/a$b {%t}|{%f} $/b$8$atqq$/a$9" -alternative_header_second_line_format = "{{$8%a}{$8 - %b$9}{$8 (%y)$8}}|{%D$9}" -# -## -## Note: below variables also support text attributes listed above. -## -# + +user_interface = "alternative" + +alternative_header_first_line_format = "$(11)─┤ $b$(13)%a$(end)$/b ├─$(end)" +alternative_header_second_line_format = "$(4)%t (%y)$(end)" +alternative_ui_separator_color = 11 + +color1 = 13 +color2 = 15 +main_window_highlight_color = cyan +main_window_color = 13 + now_playing_prefix = "$b" now_playing_suffix = "$/b" -# -#browser_playlist_prefix = "$2playlist$9 " -# -#selected_item_prefix = $6 -# -#selected_item_suffix = $9 -# -#modified_item_prefix = $3> $9 -# -## Note: colors are not supported for below variable. -## -#song_window_title_format = {%a - }{%t}|{%f} -# -##### columns settings ##### -## -## syntax of song columns list format is "column column etc." -## -## - syntax for each column is: -## -## (width of column)[column's color]{displayed tag} -## -## Note: Width is by default in %, if you want a column to -## have fixed size, add 'f' after the value, e.g. (10)[white]{a} -## will be the column that take 10% of screen (so the real column's -## width will depend on actual screen size), whereas (10f)[white]{a} -## will take 10 terminal cells, no matter how wide the screen is. -## -## - color is optional (if you want the default one, type []) -## -## Note: You can give a column additional attributes by putting appropriate -## character after displayed tag character. Available attributes are: -## -## - r - column will be right aligned -## - E - if tag is empty, empty tag marker won't be displayed -## -## You can also: -## -## - give a column custom name by putting it after attributes, -## separated with character ':', e.g. {lr:Length} gives you -## right aligned column of lengths named "Length". -## -## - define sequence of tags, that have to be displayed in case -## predecessor is empty in a way similar to the one in classic -## song format, i.e. using '|' character, e.g. {a|c|p:Owner} -## creates column named "Owner" that tries to display artist -## tag and then composer and performer if previous ones are -## not available. -## -# -#song_columns_list_format = (20)[]{a} (6f)[green]{NE} (50)[white]{t|f:Title} (20)[cyan]{b} (7f)[magenta]{l} -# -##### various settings ##### -# -## -## Note: Custom command that will be executed each -## time song changes. Useful for notifications etc. -## -## Attention: It doesn't support song format anymore. -## Use `ncmpcpp --now-playing SONG_FORMAT` instead. -## -#execute_on_song_change = "" -# -#playlist_show_remaining_time = no -# -#playlist_shorten_total_times = no -# -#playlist_separate_albums = no -# -## -## Note: Possible display modes: classic, columns. -## -playlist_display_mode = classic -# -browser_display_mode = columns -# -#search_engine_display_mode = columns -# -#playlist_editor_display_mode = columns -# -#discard_colors_if_item_is_selected = yes -# -#incremental_seeking = yes -# -seek_time = 4 -# -volume_change_step = 3 -# -autocenter_mode = yes -# -#centered_cursor = no -# -## -## Note: You can specify third character which will -## be used to build 'empty' part of progressbar. -## -#progressbar_look = "=>" -#progressbar_look = "─- " -#progressbar_look = "▒▒░" -#progressbar_look = "┅┅┄" -#progressbar_look = "─⊙┄" -#progressbar_look = "─➞─" -#progressbar_look = "─┅─" -#progressbar_look = "▪▪▪" -progressbar_look = "▪▪▫" -#progressbar_look = "───" -#progressbar_look = "▁▁▁" -#progressbar_look = "‒‒‒" -#progressbar_look = "■◣ " -#progressbar_look = "◈◆◇" -# -progressbar_boldness = no -# -## Available values: database, playlist. -## -#default_place_to_search_in = database -# -## Available values: classic, alternative. -## -user_interface = classic -# -## Available values: artist, album_artist, date, genre, composer, performer. -## -#media_library_primary_tag = artist -# -## Available values: wrapped, normal. -## -#default_find_mode = wrapped -# -## Available values: add, select. -## -#default_space_mode = add -# -#default_tag_editor_pattern = %n - %t -# -header_visibility = yes -# -statusbar_visibility = yes -# -titles_visibility = yes -# -header_text_scrolling = yes -# -#cyclic_scrolling = no -# -#lines_scrolled = 2# -# -#follow_now_playing_lyrics = no -# -#fetch_lyrics_for_current_song_in_background = no -# -#store_lyrics_in_song_dir = no -# -#generate_win32_compatible_filenames = yes -# -allow_for_physical_item_deletion = no -# -## -## Note: If you set this variable, ncmpcpp will try to -## get info from last.fm in language you set and if it -## fails, it will fall back to english. Otherwise it will -## use english the first time. -## -## Note: Language has to be expressed as an ISO 639 alpha-2 code. -## -#lastfm_preferred_language = en -# -## Available values: add_remove, always_add. -## -#space_add_mode = always_add -# -#show_hidden_files_in_local_browser = no -# -## -## How shall screen switcher work? -## -## - "previous" - switch between the current and previous screen. -## - "screen1,...,screenN" - switch between given sequence of screens. -## -## Screens available for use: help, playlist, browser, search_engine, -## media_library, playlist_editor, tag_editor, outputs, visualizer, clock. -## -#screen_switcher_mode = playlist, browser -# -## -## Note: You can define startup screen for ncmpcpp -## by choosing screen from the list above. -## -startup_screen = "playlist" -# -## -## Default width of locked screen (in %). -## Acceptable values are from 20 to 80. -## -# -#locked_screen_width_part = 50 -# -#ask_for_locked_screen_width_part = yes -# -#jump_to_now_playing_song_at_start = yes -# -#ask_before_clearing_playlists = yes -# -#clock_display_seconds = no -# -#display_volume_level = yes -# -#display_bitrate = no -# -display_remaining_time = no -playlist_show_remaining_time = no -# -## Available values: none, basic, extended. -## -#regular_expressions = none -# -## -## Note: If below is enabled, ncmpcpp will ignore leading -## "The" word while sorting items in browser, tags in -## media library, etc. -## -#ignore_leading_the = no -# -#block_search_constraints_change_if_items_found = yes -# -mouse_support = yes -# -#mouse_list_scroll_whole_page = yes -# -#empty_tag_marker = -# -#tags_separator = " | " -# -#tag_editor_extended_numeration = no -# -#media_library_sort_by_mtime = no -# -#enable_window_title = yes -# -## -## Note: You can choose default search mode for search -## engine. Available modes are: -## -## - 1 - use mpd built-in searching (no regexes, pattern matching) -## - 2 - use ncmpcpp searching (pattern matching with support for regexes, -## but if your mpd is on a remote machine, downloading big database -## to process it can take a while -## - 3 - match only exact values (this mode uses mpd function for searching -## in database and local one for searching in current playlist) -## -# -#search_engine_default_search_mode = 1 -# -external_editor = "/usr/bin/vim" -# -## Note: set to yes if external editor is a console application. -## -use_console_editor = yes -# -##### colors definitions ##### -# -# colors_enabled = yes -# empty_tag_color = "white" -# header_window_color = "white" -# volume_color = "white" -# state_line_color = "black" -# state_flags_color = "white" -# main_window_color = "white" -# color1 = "white" -# color2 = "green" -# main_window_highlight_color = "black" ### -# progressbar_color = 9 -# progressbar_elapsed_color = "white" -# statusbar_color = "white" -# alternative_ui_separator_color = "black" -# active_column_color = "black" ### -# visualizer_color = "magenta" -# window_border_color = "white" -# active_window_border = "white" -# # +song_list_format = " $(15)%t$(end)$R $(11)%A$(end) ($(cyan)%l$(end)) " +song_columns_list_format = "(40)[15]{t|f} (25)[13]{a} (25)[11]{b} (5)[cyan]{l}" +browser_playlist_prefix = "$(11) playlist $(end) " +active_column_color = 4 + +progressbar_color = 1 +progressbar_elapsed_color = 11 +progressbar_look = "──━" +song_status_format = " $(15)%a$(end) $4⟫$7⟫$0 $(13)%t$(end) $4⟫$7⟫$0 $(11)%b$(end)" + +mouse_support = "yes" +header_visibility = "no" +statusbar_visibility = "yes" +playlist_display_mode = "classic" (classic/columns) +browser_display_mode = "columns" +search_engine_display_mode = "columns" +playlist_editor_display_mode = "columns" +autocenter_mode = "yes" diff --git a/dots/screenlayout/desktop.sh b/dots/screenlayout/desktop.sh index 07ba08c..0514e83 100755 --- a/dots/screenlayout/desktop.sh +++ b/dots/screenlayout/desktop.sh @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output DVI-I-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-3 --mode 1920x1080 --pos 3840x0 --rotate normal --output DP-2 --off --output DP-1 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output DVI-D-1 --off +xrandr --output DisplayPort-1 --off --output DisplayPort-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output DisplayPort-2 --mode 1920x1080 --pos 3840x0 --rotate normal --output DVI-I-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DVI-D-1 --off diff --git a/dots/scripts/ec b/dots/scripts/ec index 5cf3fa2..2abf964 100755 --- a/dots/scripts/ec +++ b/dots/scripts/ec @@ -19,21 +19,21 @@ # You may also want to stop the output from returning to the terminal, like # ec -e "(message \"Hello\")" > /dev/null -# remacsclient options for reference -# -a "" starts remacs daemon and reattaches +# emacsclient options for reference +# -a "" starts emacs daemon and reattaches # -c creates a new frame # -n returns control back to the terminal # -e eval the script # Number of current visible frames, -# Remacs daemon always has a visible frame called F1 +# Emacs daemon always has a visible frame called F1 visible_frames() { - remacsclient -a "" -e '(length (visible-frame-list))' + emacsclient -a "" -e '(length (visible-frame-list))' } change_focus() { - remacsclient -n -e "(select-frame-set-input-focus (selected-frame))" > /dev/null + emacsclient -n -e "(select-frame-set-input-focus (selected-frame))" > /dev/null } # try switching to the frame incase it is just minimized @@ -42,9 +42,9 @@ test "$(visible_frames)" -eq "1" && change_focus if [ "$(visible_frames)" -lt "2" ]; then # need to create a frame # -c $@ with no args just opens the scratch buffer - remacsclient -n -c "$@" && change_focus + emacsclient -n -c "$@" && change_focus else # there is already a visible frame besides the daemon, so change_focus # -n $@ errors if there are no args - test "$#" -ne "0" && remacsclient -n "$@" + test "$#" -ne "0" && emacsclient -n "$@" fi