diff options
| -rwxr-xr-x | .autostart | 14 | ||||
| -rw-r--r-- | .config/ncmpcpp/bindings | 10 | ||||
| -rw-r--r-- | .config/ncmpcpp/config | 544 | ||||
| -rw-r--r-- | .config/ranger/rc.conf | 1 | ||||
| -rw-r--r-- | .mailcap | 3 | ||||
| -rw-r--r-- | .muttrc | 17 | ||||
| -rw-r--r-- | .screenlayout/set.sh | 1 | ||||
| -rw-r--r-- | arch/aur | 8 | ||||
| -rw-r--r-- | arch/mainline | 91 | ||||
| -rwxr-xr-x | arch/required | 3 | ||||
| -rwxr-xr-x | build | 26 | ||||
| -rw-r--r-- | dwm/config.h | 4 | ||||
| -rw-r--r-- | dwmstatus/custom.diff | 47 | ||||
| -rwxr-xr-x | lxc/arch_roll | 9 | ||||
| -rwxr-xr-x | lxc/debian_roll | 6 | ||||
| -rwxr-xr-x | lxc/debian_setup (renamed from lxc/setup) | 0 | ||||
| -rw-r--r-- | st/config.h | 2 |
17 files changed, 667 insertions, 119 deletions
@@ -1,10 +1,20 @@ #!/bin/bash wait_time=0.1 -st -e trans -shell -brief & +# user arandr to generate startup +# also if using old monitor do: +# xrandr --newmode 1280x1024_75.00 138.75 1280 1368 1504 1728 1024 1027 1034 1072 -hsync +vsync +# xrandr --addmode DP-3 "1280x1024_75.00" +# xrandr --output DP-1 --off --output HDMI-1 --mode 1920x1080 --pos 0x0 --rotate normal --output +# DP-2 --off --output +# DP-3 --mode 1280x1024_75.00 --pos 1920x0 --rotate normal + +nitrogen --restore + +st -e watch -t 'task' & sleep $wait_time st -e ncmpcpp & sleep $wait_time st -e htop & sleep $wait_time -st -e aerc & +st -e neomutt & diff --git a/.config/ncmpcpp/bindings b/.config/ncmpcpp/bindings new file mode 100644 index 0000000..6a3dbaf --- /dev/null +++ b/.config/ncmpcpp/bindings @@ -0,0 +1,10 @@ +def_key "l" + next_column +def_key "h" + previous_column +def_key "k" + scroll_up +def_key "j" + scroll_down +def_key "d" + delete_playlist_items diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config new file mode 100644 index 0000000..501db5e --- /dev/null +++ b/.config/ncmpcpp/config @@ -0,0 +1,544 @@ +############################################################################## +## This is the example configuration file. Copy it to $HOME/.ncmpcpp/config ## +## or $XDG_CONFIG_HOME/ncmpcpp/config and set up your preferences. ## +############################################################################## +# +##### directories ###### +## +## Directory for storing ncmpcpp related files. Changing it is useful if you +## want to store everything somewhere else and provide command line setting for +## alternative location to config file which defines that while launching +## ncmpcpp. +## +# +#ncmpcpp_directory = ~/.ncmpcpp +# +## +## Directory for storing downloaded lyrics. It defaults to ~/.lyrics since other +## MPD clients (eg. ncmpc) also use that location. +## +# +#lyrics_directory = ~/.lyrics +# +##### connection settings ##### +# +mpd_host = core-a.lan +# +#mpd_port = 6600 +# +#mpd_connection_timeout = 5 +# +## Needed for tag editor and file operations to work. +## +#mpd_music_dir = ~/music +# +#mpd_crossfade_time = 5 +# +##### music visualizer ##### +## +## Note: In order to make music visualizer work you'll need to use mpd fifo +## output, whose format parameter has to be set to 44100:16:1 for mono +## visualization or 44100:16:2 for stereo visualization. Example configuration +## (it has to be put into mpd.conf): +## +## audio_output { +## type "fifo" +## name "Visualizer feed" +## path "/tmp/mpd.fifo" +## format "44100:16:2" +## } +## +# +#visualizer_fifo_path = /tmp/mpd.fifo +# +## +## Note: Below parameter is needed for ncmpcpp to determine which output +## provides data for visualizer and thus allow syncing between visualization and +## sound as currently there are some problems with it. +## +# +#visualizer_output_name = Visualizer feed +# +## +## If you set format to 44100:16:2, make it 'yes'. +## +#visualizer_in_stereo = yes +# +## +## Note: Below parameter defines how often ncmpcpp has to "synchronize" +## visualizer and audio outputs. 30 seconds is optimal value, but if you +## experience synchronization problems, set it to lower value. Keep in mind +## that sane values start with >=10. +## +# +#visualizer_sync_interval = 30 +# +## +## Note: To enable spectrum frequency visualization you need to compile ncmpcpp +## with fftw3 support. +## +# +## Available values: spectrum, wave, wave_filled, ellipse. +## +#visualizer_type = wave +# +#visualizer_look = ●▮ +# +#visualizer_color = blue, cyan, green, yellow, magenta, red +# +## Alternative subset of 256 colors for terminals that support it. +## +#visualizer_color = 41, 83, 119, 155, 185, 215, 209, 203, 197, 161 +# +##### system encoding ##### +## +## ncmpcpp should detect your charset encoding but if it failed to do so, you +## can specify charset encoding you are using here. +## +## Note: You can see whether your ncmpcpp build supports charset detection by +## checking output of `ncmpcpp --version`. +## +## Note: Since MPD uses UTF-8 by default, setting this option makes sense only +## if your encoding is different. +## +# +#system_encoding = "" +# +##### delays ##### +# +## Time of inactivity (in seconds) after playlist highlighting will be disabled +## (0 = always on). +## +#playlist_disable_highlight_delay = 5 +# +## Defines how long messages are supposed to be visible. +## +#message_delay_time = 5 +# +##### song format ##### +## +## For a song format you can use: +## +## %l - length +## %f - filename +## %D - directory +## %a - artist +## %A - album artist +## %t - title +## %b - album +## %y - date +## %n - track number (01/12 -> 01) +## %N - full track info (01/12 -> 01/12) +## %g - genre +## %c - composer +## %p - performer +## %d - disc +## %C - comment +## %P - priority +## $R - begin right alignment +## +## If you want to make sure that a part of the format is displayed only when +## certain tags are present, you can archieve it by grouping them with brackets, +## e.g. '{%a - %t}' will be evaluated to 'ARTIST - TITLE' if both tags are +## present or '' otherwise. It is also possible to define a list of +## alternatives by providing several groups and separating them with '|', +## e.g. '{%t}|{%f}' will be evaluated to 'TITLE' or 'FILENAME' if the former is +## not present. +## +## Note: If you want to set limit on maximal length of a tag, just put the +## appropriate number between % and character that defines tag type, e.g. to +## make album take max. 20 terminal cells, use '%20b'. +## +## In addition, formats support markers used for text attributes. They are +## followed by character '$'. After that you can put: +## +## - 0 - default window color (discards all other colors) +## - 1 - black +## - 2 - red +## - 3 - green +## - 4 - yellow +## - 5 - blue +## - 6 - magenta +## - 7 - cyan +## - 8 - white +## - 9 - end of current color +## - b - bold text +## - u - underline text +## - r - reverse colors +## - a - use alternative character set +## +## If you don't want to use a non-color 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. +## +## If you want to use 256 colors and/or background colors in formats (the naming +## scheme is described below in section about color definitions), it can be done +## with the syntax $(COLOR), e.g. to set the artist tag to one of the +## non-standard colors and make it have yellow background, you need to write +## $(197_yellow)%a$(end). Note that for standard colors this is interchangable +## with attributes listed above. +## +## Note: colors can be nested. +## +# +#song_list_format = {%a - }{%t}|{$8%f$9}$R{$3(%l)$9} +# +#song_status_format = {{%a{ "%b"{ (%y)}} - }{%t}}|{%f} +# +#song_library_format = {%n - }{%t}|{%f} +# +#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} +# +#current_item_prefix = $(yellow)$r +# +#current_item_suffix = $/r$(end) +# +#current_item_inactive_column_prefix = $(white)$r +# +#current_item_inactive_column_suffix = $/r$(end) +# +#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: attributes are not supported for the following variables. +## +#song_window_title_format = {%a - }{%t}|{%f} +## +## 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)} +# +##### columns settings ##### +## +## syntax of song columns list format is "column column etc." +## +## - syntax for each column is: +## +## (width of the column)[color of the column]{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 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, leave the field empty). +## +## 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. +## +#execute_on_song_change = "" +# +## +## Note: Custom command that will be executed each time player state +## changes. The environment variable MPD_PLAYER_STATE is set to the current +## state (either unknown, play, pause, or stop) for its duration. +## +# +#execute_on_player_state_change = "" +# +#playlist_show_mpd_host = no +# +#playlist_show_remaining_time = no +# +#playlist_shorten_total_times = no +# +#playlist_separate_albums = no +# +## +## Note: Possible display modes: classic, columns. +## +#playlist_display_mode = columns +# +#browser_display_mode = classic +# +#search_engine_display_mode = classic +# +#playlist_editor_display_mode = classic +# +#discard_colors_if_item_is_selected = yes +# +#show_duplicate_tags = yes +# +#incremental_seeking = yes +# +#seek_time = 1 +# +#volume_change_step = 2 +# +#autocenter_mode = no +# +#centered_cursor = no +# +## +## Note: You can specify third character which will be used to build 'empty' +## part of progressbar. +## +#progressbar_look = => +# +## Available values: database, playlist. +## +#default_place_to_search_in = database +# +## Available values: classic, alternative. +## +#user_interface = classic +# +#data_fetching_delay = yes +# +## Available values: artist, album_artist, date, genre, composer, performer. +## +#media_library_primary_tag = artist +# +#media_library_albums_split_by_date = yes +# +## Available values: wrapped, normal. +## +#default_find_mode = wrapped +# +#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 +# +#lyrics_fetchers = lyricwiki, azlyrics, genius, sing365, lyricsmania, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, internet +# +#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 +# +#space_add_mode = add_remove +# +#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, +## lyrics, last_fm. +## +#screen_switcher_mode = playlist, browser +# +## +## Note: You can define startup screen by choosing screen from the list above. +## +#startup_screen = playlist +# +## +## Note: You can define startup slave screen by choosing screen from the list +## above or an empty value for no slave screen. +## +#startup_slave_screen = "" +# +#startup_slave_screen_focus = no +# +## +## 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 +# +## Available values: none, basic, extended, perl. +## +#regular_expressions = perl +# +## +## 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 +# +## +## Note: if below is enabled, ncmpcpp will ignore diacritics while searching and +## filtering lists. This takes an effect only if boost was compiled with ICU +## support. +## +#ignore_diacritics = no +# +#block_search_constraints_change_if_items_found = yes +# +#mouse_support = yes +# +#mouse_list_scroll_whole_page = yes +# +#empty_tag_marker = <empty> +# +#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 = nano +# +## Note: set to yes if external editor is a console application. +## +#use_console_editor = yes +# +##### colors definitions ##### +## +## It is possible to set a background color by setting a color value +## "<foreground>_<background>", e.g. red_black will set foregound color to red +## and background color to black. +## +## In addition, for terminals that support 256 colors it is possible to set one +## of them by using a number in range [1, 256] instead of color name, +## e.g. numerical value corresponding to red_black is 2_1. To find out if the +## terminal supports 256 colors, run ncmpcpp and check out the bottom of the +## help screen for list of available colors and their numerical values. +## +## What is more, there are two special values for the background color: +## "transparent" and "current". The first one explicitly sets the background to +## be transparent, while the second one allows you to preserve current +## background color and change only the foreground one. It's used implicitly +## when background color is not specified. +## +## Moreover, it is possible to attach format information to selected color +## variables by appending to their end a colon followed by one or more format +## flags, e.g. black:b or red:ur. The following variables support this syntax: +## visualizer_color, color1, color2, empty_tag_color, volume_color, +## state_line_color, state_flags_color, progressbar_color, +## progressbar_elapsed_color, player_state_color, statusbar_time_color, +## alternative_ui_separator_color. +## +## Note: due to technical limitations of older ncurses version, if 256 colors +## are used there is a possibility that you'll be able to use only colors with +## transparent background. +# +#colors_enabled = yes +# +#empty_tag_color = cyan +# +#header_window_color = default +# +#volume_color = default +# +#state_line_color = default +# +#state_flags_color = default:b +# +#main_window_color = yellow +# +#color1 = white +# +#color2 = green +# +#progressbar_color = black:b +# +#progressbar_elapsed_color = green:b +# +#statusbar_color = default +# +#statusbar_time_color = default:b +# +#player_state_color = default:b +# +#alternative_ui_separator_color = black:b +# +#window_border_color = green +# +#active_window_border = red +# diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf new file mode 100644 index 0000000..ceda364 --- /dev/null +++ b/.config/ranger/rc.conf @@ -0,0 +1 @@ +set show_hidden true diff --git a/.mailcap b/.mailcap new file mode 100644 index 0000000..dea866b --- /dev/null +++ b/.mailcap @@ -0,0 +1,3 @@ +text/html; xdg-open %s &> /dev/null &; nametemplate=%s.html +application/*; xdg-open %s &> /dev/null &; +image/*; xdg-open %s &> /dev/null &; @@ -0,0 +1,17 @@ +set my_name = "tom" +set imap_user = tom@tombarrett.xyz +set imap_pass = blahblah +set folder = imaps://blahblah +set spoolfile =+INBOX + +set header_cache = ~/.cache/mutt +set message_cachedir = "~/.cache/mutt/" + +set my_user = tom%40tombarrett.xyz +set record = +Sent +set from = tom@tombarrett.xyz +set smtp_pass = $imap_pass +set smtp_url = smtps://tom%40tombarrett.xyz@blahblah +set ssl_force_tls = yes + +set editor = "nvim +':set textwidth=0'" diff --git a/.screenlayout/set.sh b/.screenlayout/set.sh deleted file mode 100644 index 31e07c4..0000000 --- a/.screenlayout/set.sh +++ /dev/null @@ -1 +0,0 @@ -use arandr @@ -1,9 +1,3 @@ -aerc -ccrypt +brave-bin deluge-stable-git -mcrypt -pacmixer -pygtk -st -systemd-numlockontty yay-bin diff --git a/arch/mainline b/arch/mainline index 6dd41f1..821d945 100644 --- a/arch/mainline +++ b/arch/mainline @@ -1,110 +1,57 @@ alsa-utils -amd-ucode arandr -asoundconf -atril +autoconf +automake base bc -chromium cmake -dhcpcd -dialog dmenu +dosfstools efibootmgr +element-desktop fakeroot feh -firefox fish -freeglut gcc -gedit git -glew +gnu-netcat gparted grub htop ledger -libgit2 -libtorrent linux linux-firmware make +mpc +mtools ncdu +ncmpcpp +neomutt neovim -netctl networkmanager nitrogen nmap openssh +otf-hermit p7zip pass patch -pavucontrol pkgconf pulseaudio -pwgen -python2 -python2-gobject2 -python2-service-identity +pulseaudio-zeroconf +pulsemixer +ranger +rsync scrot -sdl -steam +slock +stone-soup +systemd-swap task +tmux +traceroute tree -ttf-liberation -vi vim wget which -wine -wqy-zenhei -xf86-video-vesa -xorg-bdftopcf -xorg-docs -xorg-font-util -xorg-fonts-100dpi -xorg-fonts-75dpi -xorg-fonts-encodings -xorg-iceauth -xorg-luit -xorg-mkfontscale xorg-server -xorg-server-common -xorg-server-devel -xorg-server-xephyr -xorg-server-xnest -xorg-server-xvfb -xorg-server-xwayland -xorg-sessreg -xorg-setxkbmap -xorg-smproxy -xorg-x11perf -xorg-xauth -xorg-xbacklight -xorg-xcmsdb -xorg-xcursorgen -xorg-xdpyinfo -xorg-xdriinfo -xorg-xev -xorg-xgamma -xorg-xhost xorg-xinit -xorg-xinput -xorg-xkbcomp -xorg-xkbevd -xorg-xkbutils -xorg-xkill -xorg-xlsatoms -xorg-xlsclients -xorg-xmodmap -xorg-xpr -xorg-xprop -xorg-xrandr -xorg-xrdb -xorg-xrefresh -xorg-xset -xorg-xsetroot -xorg-xvinfo -xorg-xwd -xorg-xwininfo -xorg-xwud diff --git a/arch/required b/arch/required index 77251fc..ad8c2b8 100755 --- a/arch/required +++ b/arch/required @@ -2,8 +2,7 @@ # run as root pacman -S --needed - < mainline -useradd tom -mkdir /home/tom +useradd -m tom mkdir /home/tom/yay git clone https://aur.archlinux.org/yay-bin.git /home/tom/yay @@ -16,7 +16,7 @@ git clone https://git.suckless.org/dwm $DWM_DIR patch $DWM_DIR'/dwm.c' $RC_DIR'/dwm/custom.diff' -cp $RC_DIR'/dwm/config.h' $DWM_DIR +ln -s $RC_DIR'/dwm/config.h' $DWM_DIR make -C $DWM_DIR @@ -36,24 +36,30 @@ ln -s $DWMSTS_DIR/dwmstatus $HOME/bin ST_DIR=$HOME'/src/st' git clone https://git.suckless.org/st $ST_DIR -cp $RC_DIR'/st/config.h' $ST_DIR +ln -s $RC_DIR'/st/config.h' $ST_DIR make -C $ST_DIR ln -s $ST_DIR/st $HOME/bin # fish setup -cp -r $RC_DIR'/.config/fish' $HOME'/.config/' - -# lxc setup -cp -r $RC_DIR'/.config/lxc' $HOME'/.config' -chmod a+rw $HOME'/.local/' $HOME'/.local/share' +ln -s $RC_DIR'/.config/fish' $HOME'/.config' # freedesktop setup -cp $RC_DIR'/.config/user-dirs.dirs' $HOME'/.config/' +ln -s $RC_DIR'/.config/user-dirs.dirs' $HOME'/.config' # xorg setup -cp $RC_DIR'/.xinitrc' $HOME +ln -s $RC_DIR'/.xinitrc' $HOME # autostart script -cp $RC_DIR'/.autostart' $HOME +ln -s $RC_DIR'/.autostart' $HOME + +# ranger setup +ln -s $RC_DIR'/.config/ranger' $HOME'/.config' + +# ncmpcpp setup +ln -s $RC_DIR'/.config/ncmpcpp' $HOME'/.config' + +# neomutt setup +ln -s $RC_DIR'/.muttrc' $HOME +ln -s $RC_DIR'/.mailcap' $HOME diff --git a/dwm/config.h b/dwm/config.h index 689c2ee..15d5052 100644 --- a/dwm/config.h +++ b/dwm/config.h @@ -6,8 +6,8 @@ static const unsigned int snap = 32; /* snap pixel */ static const unsigned int gapp = 30; static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "monospace:size=10" }; -static const char dmenufont[] = "monospace:size=10"; +static const char *fonts[] = { "Hermit-Regular:size=11" }; +static const char dmenufont[] = "Hermit-Regular:size=11"; static const char col_gray1[] = "#181818"; static const char col_gray2[] = "#585858"; static const char col_gray3[] = "#b8b8b8"; diff --git a/dwmstatus/custom.diff b/dwmstatus/custom.diff index 11e5d05..6b82e5f 100644 --- a/dwmstatus/custom.diff +++ b/dwmstatus/custom.diff @@ -1,5 +1,5 @@ diff --git a/dwmstatus.c b/dwmstatus.c -index d2a4b03..555f0bd 100644 +index d2a4b03..307d290 100644 --- a/dwmstatus.c +++ b/dwmstatus.c @@ -17,8 +17,6 @@ @@ -29,7 +29,7 @@ index d2a4b03..555f0bd 100644 } if (remcap < 0 || descap < 0) -@@ -175,47 +173,70 @@ gettemperature(char *base, char *sensor) +@@ -175,47 +173,86 @@ gettemperature(char *base, char *sensor) return smprintf("%02.0f°C", atof(co) / 1000); } @@ -51,10 +51,9 @@ index d2a4b03..555f0bd 100644 +} + +char * -+getvolume() { -+ char *co = smprintf("amixer -D pulse sget Master | grep % | head -n 1 | cut -d ' ' -f 7 | tr -d '[]\n'"); ++gettemp() { ++ char *co = smprintf("sensors amdgpu-pci-0400 | grep edge | cut -c 16-22"); + FILE *fd = popen(co, "r"); -+ + if (fd == NULL) + return smprintf("invalid"); + @@ -68,19 +67,37 @@ index d2a4b03..555f0bd 100644 + return smprintf("%s", ret); +} + ++char * ++gettrack() { ++ char *co = smprintf("mpc -h core-a.lan | head -n 1 | tr -d '\n'" ); ++ FILE *fd = popen(co, "r"); ++ if (fd == NULL) ++ return smprintf("invalid"); ++ ++ char ret[100]; ++ if (fgets(ret, 100, fd) == NULL) ++ return smprintf("invalid"); ++ ++ if (pclose(fd) == -1) ++ return smprintf("invalid"); ++ ++ return smprintf("%s", ret); ++} ++ int main(void) { char *status; char *avgs; - char *bat; +- char *bat; - char *bat1; - char *tmar; - char *tmutc; char *tmbln; - char *t0, *t1, *t2; + char *partition; -+ char *volume; ++ char *temp; ++ char *track; if (!(dpy = XOpenDisplay(NULL))) { fprintf(stderr, "dwmstatus: cannot open display.\n"); @@ -88,10 +105,9 @@ index d2a4b03..555f0bd 100644 } - for (;;sleep(60)) { -+ for (;;sleep(1)) { ++ for (;;sleep(10)) { avgs = loadavg(); -+ partition = getpartition("/$"); - bat = getbattery("/sys/class/power_supply/BAT0"); +- bat = getbattery("/sys/class/power_supply/BAT0"); - bat1 = getbattery("/sys/class/power_supply/BAT1"); - tmar = mktimes("%H:%M", tzargentina); - tmutc = mktimes("%H:%M", tzutc); @@ -103,19 +119,22 @@ index d2a4b03..555f0bd 100644 - status = smprintf("T:%s|%s|%s L:%s B:%s|%s A:%s U:%s %s", - t0, t1, t2, avgs, bat, bat1, tmar, tmutc, - tmbln); ++ partition = getpartition("/$"); + tmbln = mktimes("%a %d %b %H:%M", tzberlin); -+ volume = getvolume(); ++ temp = gettemp(); ++ track = gettrack(); + + status = smprintf(" %s | %s | %s | %s | %s", -+ avgs, partition, volume, bat, tmbln); ++ track, avgs, temp, partition, tmbln); setstatus(status); - free(t0); - free(t1); - free(t2); ++ free(track); ++ free(temp); free(avgs); -+ free(volume); - free(bat); +- free(bat); - free(bat1); - free(tmar); - free(tmutc); diff --git a/lxc/arch_roll b/lxc/arch_roll index ce97bfe..cf1dfa7 100755 --- a/lxc/arch_roll +++ b/lxc/arch_roll @@ -16,8 +16,7 @@ lxc-attach -n $NAME -- pacman -Sy --noconfirm \ git sudo vim openssh xorg-xauth xorg-xhost fakeroot binutils # setup user -lxc-attach -n $NAME -- useradd $USER -lxc-attach -n $NAME -- mkdir /home/$USER +lxc-attach -n $NAME -- useradd -m $USER lxc-attach -n $NAME -- bash -c 'echo "'$USER' ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers' lxc-attach -n $NAME -- bash -c 'echo -e "'$PASS'\n'$PASS'" | passwd $USER' @@ -29,9 +28,9 @@ lxc-attach -n $NAME -- bash -c 'cd /home/'$USER'/yay && sudo -u '$USER' makepkg lxc-attach -n $NAME -- bash -c 'sudo -u '$USER' yay -Syu --noconfirm' # setup x11 forwarding -lxc-attach -n $NAME -- bash -c 'echo "X11Forwarding yes" >> /etc/ssh/sshd_config' -lxc-attach -n $NAME -- bash -c 'echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config' -lxc-attach -n $NAME -- bash -c 'echo "X11UseLocalhost yes" >> /etc/ssh/sshd_config' +# lxc-attach -n $NAME -- bash -c 'echo "X11Forwarding yes" >> /etc/ssh/sshd_config' +# lxc-attach -n $NAME -- bash -c 'echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config' +# lxc-attach -n $NAME -- bash -c 'echo "X11UseLocalhost yes" >> /etc/ssh/sshd_config' lxc-attach -n $NAME -- systemctl start sshd # display info diff --git a/lxc/debian_roll b/lxc/debian_roll index 7ea23c3..5ae7b7e 100755 --- a/lxc/debian_roll +++ b/lxc/debian_roll @@ -20,9 +20,9 @@ lxc-attach -n $NAME -- adduser $USER --gecos "" --disabled-password lxc-attach -n $NAME -- bash -c 'echo -e "'$PASS'\n'$PASS'" | passwd $USER' # setup x11 forwarding -lxc-attach -n $NAME -- bash -c 'echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config' -lxc-attach -n $NAME -- bash -c 'echo "X11UseLocalhost yes" >> /etc/ssh/sshd_config' -lxc-attach -n $NAME -- systemctl restart sshd +# lxc-attach -n $NAME -- bash -c 'echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config' +# lxc-attach -n $NAME -- bash -c 'echo "X11UseLocalhost yes" >> /etc/ssh/sshd_config' +# lxc-attach -n $NAME -- systemctl restart sshd # display info lxc-info -n $NAME diff --git a/lxc/setup b/lxc/debian_setup index 6cfe699..6cfe699 100755 --- a/lxc/setup +++ b/lxc/debian_setup diff --git a/st/config.h b/st/config.h index 40412a7..9714554 100644 --- a/st/config.h +++ b/st/config.h @@ -5,7 +5,7 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; +static char *font = "Hermit-Regular:pixelsize=15"; static int borderpx = 2; /* |