From 91b3c89fc20017f68f8364b1a7a78cb8635b6070 Mon Sep 17 00:00:00 2001 From: Marcin Wozniak Date: Sat, 10 Aug 2019 01:25:07 +0200 Subject: [PATCH] Uploaded --- Xdefaults | 72 ------------------------------------------------------ Xinitrc | 29 +--------------------- config.h | 2 +- copy | 9 ++++++- dwm_status | 13 +++------- tmux.conf | 3 ++- xinitrc | 44 --------------------------------- 7 files changed, 15 insertions(+), 157 deletions(-) delete mode 100644 Xdefaults delete mode 100644 xinitrc diff --git a/Xdefaults b/Xdefaults deleted file mode 100644 index 4a58fb0..0000000 --- a/Xdefaults +++ /dev/null @@ -1,72 +0,0 @@ -! Solarized color scheme for the X Window System -! -! http://ethanschoonover.com/solarized - - -! Common - -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - - -! Dark - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - - -! Light - -! #define S_base03 #fdf6e3 -! #define S_base02 #eee8d5 -! #define S_base01 #93a1a1 -! #define S_base00 #839496 -! #define S_base0 #657b83 -! #define S_base1 #586e75 -! #define S_base2 #073642 -! #define S_base3 #002b36 - - -! To only apply colors to your terminal, for example, prefix -! the color assignment statement with its name. Example: -! -! URxvt*background: S_base03 - -*background: S_base03 -*foreground: S_base0 -*fading: 40 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground: S_base01 -*pointerColorForeground: S_base1 - -*color0: S_base02 -*color1: S_red -*color2: S_green -*color3: S_yellow -*color4: S_blue -*color5: S_magenta -*color6: S_cyan -*color7: S_base2 -*color9: S_orange -*color8: S_base03 -*color10: S_base01 -*color11: S_base00 -*color12: S_base0 -*color13: S_violet -*color14: S_base1 -*color15: S_base3 - - diff --git a/Xinitrc b/Xinitrc index 6ef37e8..b6d1fc4 100644 --- a/Xinitrc +++ b/Xinitrc @@ -38,34 +38,7 @@ fi #xterm*faceSize: 20 -# Starting DWM xrandr --setprovideroutputsource modesetting NVIDIA-0 xrandr --auto exec ck-launch-session dbus-launch dwm - -# Start programs -feh --bg-fill $HOME/.wall.jpg & -xset s off -dpms& -xset b off& -xset s off& -xset -dpms& -redshift -l 52.2327:18.3036 -t 6500:3200& -nm-applet --sm-disable& -/usr/local/bin/st -e "tmux-my"& -firefox-bin& -"/mnt/mega/Systems/Gentoo/apps/KeePass.AppImage"& -megasync& -dunst -config& -/usr/bin/ibus-daemon -d& -sh /home/yorune/.xsessionrc& -keepassxc& -transmission-daemon& -teamviewer& -getforecast& - -# Start bar - -dwmbar& - -#exec i3 -#exec ck-launch-session dbus-launch --sh-syntax --exit-with-session i3 +#exec ck-launch-session dbus-launch i3 diff --git a/config.h b/config.h index 3808de1..2109707 100644 --- a/config.h +++ b/config.h @@ -1,6 +1,6 @@ /* appearance */ static const unsigned int borderpx = 3; /* border pixel of windows */ -static const unsigned int gappx = 15; /* gaps between windows */ +static const unsigned int gappx = 10; /* gaps between windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ diff --git a/copy b/copy index 2e040d3..c47b539 100755 --- a/copy +++ b/copy @@ -1,6 +1,13 @@ +!/bin/bash mkdir -p ~/.config/ranger/ cp rangerrc.conf ~/.config/ranger/rc.conf cp rifle.conf ~/.config/ranger/rifle.conf cp tmux.conf ~/.tmux.conf cp Xinitrc ~/.xinitrc -cp scope.sh ~/.config/ranger/scope.sh +cp scope.sh ~/.config/ranger/scope.sh +#ln -s /home/yorune/MEGA/Systems/Gentoo/configs/config.fish ~/.config.fish +#ln -s /home/yorune/MEGA/Systems/Gentoo/configs/config.fish /home/yorune/.config/fish/config.fish +#curl -L https://get.oh-my.fish | fish +#curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish +#fish +#fisher add jethrokuan/fzf diff --git a/dwm_status b/dwm_status index 30b4da7..bdc2206 100755 --- a/dwm_status +++ b/dwm_status @@ -116,29 +116,22 @@ xset b off& xset s off& xset -dpms& redshift -l 52.2327:18.3036 -t 6500:3200& -compton& +#compton& nm-applet --sm-disable& -/usr/local/bin/st -e "/bin/zsh"& -#opera& +/usr/local/bin/st -e "tmux"& firefox-bin& thunderbird-bin& "/mnt/mega/Systems/Gentoo/apps/KeePass.AppImage"& -#"/mnt/mega/Systems/Gentoo/apps/todoist/todoist"& megasync& dunst -config& /usr/bin/ibus-daemon -d& sh /home/yorune/.xsessionrc& transmission-daemon& -#teamviewer& -#discord& getforecast& -#kodi& while true do - #xsetroot -name "$(playerCmus) | $(print_temp) | $(usageData) | $(testweather) | $(print_wifi) | $(batLevel) | $(print_volume) | $(print_date)" - xsetroot -name "$(print_temp) | $(testweather) | $(print_wifi) | $(batLevel) | $(print_volume) | $(print_date)" + xsetroot -name "$(print_temp) | $(usageData) | $(testweather) | $(print_wifi) | $(batLevel) | $(print_volume) | $(print_date)" sleep 2 done - diff --git a/tmux.conf b/tmux.conf index 694d1ab..75bfc26 100644 --- a/tmux.conf +++ b/tmux.conf @@ -2,10 +2,11 @@ set -g prefix C-a set-option -g default-shell /bin/zsh unbind C-b bind-key C-a send-prefix +unbind q +bind q confirm kill-window set -g exit-unattached on set -g destroy-unattached on set -g status on -bind-key p command-prompt -p 'save history to filename:' -I '~/tmux.history' 'capture-pane -JS -32768 ; save-buffer %1 ; delete-buffer' bind-key -n C-f copy-mode \; send-key ? set -g default-terminal "st-256color" set -g history-limit 20000 diff --git a/xinitrc b/xinitrc deleted file mode 100644 index 4f520f1..0000000 --- a/xinitrc +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - - xrdb -merge $sysresources - -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - - xrdb -merge "$userresources" - -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs - -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -#xterm*faceSize: 20 - -# Starting DWM -xrandr --setprovideroutputsource modesetting NVIDIA-0 -xrandr --auto -exec ck-launch-session dbus-launch dwm