diff --git a/.gitignore b/.gitignore index 3134055..8ed4c72 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ home/.Xresources +.tmp +#* +*~ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e642dcf --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "tools/oomox-gtk-theme"] + path = tools/oomox-gtk-theme + url = https://github.com/actionless/oomox-gtk-theme.git +[submodule "tools/oomox-archdroid-icon-theme"] + path = tools/oomox-archdroid-icon-theme + url = https://github.com/actionless/oomox-archdroid-icon-theme.git diff --git a/.tmp/gtk/settings.ini b/.tmp/gtk/settings.ini deleted file mode 100644 index 5d4acff..0000000 --- a/.tmp/gtk/settings.ini +++ /dev/null @@ -1,6 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme = false -gtk-theme-name = oomox-tmp.S46K0iNp8A -gtk-fallback-icon-theme = gnome -gtk-icon-theme-name = oomox-tmp.S46K0iNp8A -gtk-font-name = Source Code Pro 8 \ No newline at end of file diff --git a/.tmp/home/.Xresources b/.tmp/home/.Xresources deleted file mode 100644 index 7db27c0..0000000 --- a/.tmp/home/.Xresources +++ /dev/null @@ -1,60 +0,0 @@ -! Common -rofi.run-command: fish -c '{cmd}' -rofi.run-list-command: 'fish -c functions' -#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 - - -#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 - -*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 - -URxvt*font: xft:Source Code Pro for Powerline:style=medium:size=9 -st.font: Source Code Pro for Powerline:style=medium:size=9 -st.borderpx: 0 -URxvt.scrollBar: false -URxvt*buffered: false -URxvt.internalBorder: 0 -URxvt.perl-ext-common: default,clipboard,config-reload - -rofi.color-enabled: true -rofi.color-window: S_base03, S_base03, S_base02 -rofi.color-normal: S_base03, S_base0, S_base03, S_base02, S_base0 -rofi.color-active: S_base03, S_blue, S_base03, S_base02, S_blue -rofi.color-urgent: S_base03, S_magenta, S_base03, S_base02, S_magenta diff --git a/.tmp/home/.gtkrc-2.0 b/.tmp/home/.gtkrc-2.0 deleted file mode 100644 index e30ecba..0000000 --- a/.tmp/home/.gtkrc-2.0 +++ /dev/null @@ -1,2 +0,0 @@ -gtk-theme-name="oomox-tmp.S46K0iNp8A" -gtk-icon-theme-name="oomox-tmp.S46K0iNp8A" diff --git a/.tmp/i3/config b/.tmp/i3/config deleted file mode 100644 index 670afbf..0000000 --- a/.tmp/i3/config +++ /dev/null @@ -1,222 +0,0 @@ -# This file has been auto-generated by i3-config-wizard(1). -# It will not be overwritten, so edit it as you like. -# -# Should you change your keyboard layout some time, delete -# this file and re-run i3-config-wizard(1). -# - -# i3 config file (v4) -# -# Please see http://i3wm.org/docs/userguide.html for a complete reference! - -set $mod Mod4 - -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -font pango:monospace 8 - -# This font is widely installed, provides lots of unicode glyphs, right-to-left -# text rendering and scalability on retina/hidpi displays (thanks to pango). -#font pango:DejaVu Sans Mono 8 - -# Before i3 v4.8, we used to recommend this one as the default: -# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 -# The font above is very space-efficient, that is, it looks good, sharp and -# clear in small sizes. However, its unicode glyph coverage is limited, the old -# X core fonts rendering does not support right-to-left and this being a bitmap -# font, it doesn’t scale on retina/hidpi displays. - -# Borders -hide_edge_borders both -for_window [class="Firefox"] border none - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# start a terminal -bindsym $mod+Return exec st - -# kill focused window -bindsym $mod+Shift+q kill - -# start dmenu (a program launcher) -bindsym $mod+d exec rofi -show run -# There also is the (new) i3-dmenu-desktop which only displays applications -# shipping a .desktop file. It is a wrapper around dmenu, so you need that -# installed. -# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop - -# change focus -bindsym $mod+j focus left -bindsym $mod+k focus right -bindsym $mod+l focus up -bindsym $mod+semicolon focus down - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+j move left -bindsym $mod+Shift+k move right -bindsym $mod+Shift+l move up -bindsym $mod+Shift+semicolon move down - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -bindsym $mod+h split h - -# split in vertical orientation -bindsym $mod+v split v - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - -# focus the parent container -bindsym $mod+a focus parent - -# focus the child container -#bindsym $mod+d focus child - -# switch to workspace -bindsym $mod+1 workspace 1 -bindsym $mod+2 workspace 2 -bindsym $mod+3 workspace 3 -bindsym $mod+4 workspace 4 -bindsym $mod+5 workspace 5 -bindsym $mod+6 workspace 6 -bindsym $mod+7 workspace 7 -bindsym $mod+8 workspace 8 -bindsym $mod+9 workspace 9 -bindsym $mod+0 workspace 10 - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace 1 -bindsym $mod+Shift+2 move container to workspace 2 -bindsym $mod+Shift+3 move container to workspace 3 -bindsym $mod+Shift+4 move container to workspace 4 -bindsym $mod+Shift+5 move container to workspace 5 -bindsym $mod+Shift+6 move container to workspace 6 -bindsym $mod+Shift+7 move container to workspace 7 -bindsym $mod+Shift+8 move container to workspace 8 -bindsym $mod+Shift+9 move container to workspace 9 -bindsym $mod+Shift+0 move container to workspace 10 - -# reload the configuration file -bindsym $mod+Shift+c reload -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" - -# resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow width 10 px or 10 ppt - bindsym l resize grow height 10 px or 10 ppt - bindsym se4micolon resize shrink height 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape - bindsym Return mode "default" - bindsym Escape mode "default" -} - -bindsym $mod+r mode "resize" - -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - i3bar_command $HOME/.scripts/bar.sh - # colors { - # separator #586e75 - # background #fdf6e3 - # statusline #657b83 - # focused_workspace #fdf6e3 #859900 #fdf6e3 - # active_workspace #fdf6e3 #6c71c4 #fdf6e3 - # inactive_workspace #586e75 #93a1a1 #002b36 - # urgent_workspace #d33682 #d33682 #fdf6e3 - # } -} - -# ## Multi Monitor Specific -# bar { -# output VGA-0 -# output DVI-D-0 - -# mode hide - -# status_command while true; do sleep 2000; done -# colors { -# separator #586e75 -# background #002b36 -# statusline #268bd2 -# focused_workspace #fdf6e3 #859900 #fdf6e3 -# active_workspace #fdf6e3 #6c71c4 #fdf6e3 -# inactive_workspace #586e75 #93a1a1 #002b36 -# urgent_workspace #d33682 #d33682 #fdf6e3 -# } -# } - -# XRandR -exec --no-startup-id xrandr --output VGA-0 --primary --mode 1920x1080 --pos 3840x136 --rotate normal --output DVI-D-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DVI-D-1 --off --output HDMI-0 --mode 1920x1080 --pos 1920x0 --rotate normal - -# Rygel -exec --no-startup-id rygel - -# Compton -exec --no-startup-id compton - -# Media Keys -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound -bindsym $mod+Shift+S exec --no-startup-id xfce4-screenshooter -c --region - -bindsym XF86AudioPrev exec playerctl prev -bindsym XF86AudioNext exec playerctl next -bindsym XF86AudioPlay exec playerctl play-pause - -client.focused #eee8d5 #eee8d5 #839496 #6c71c4 -client.focused_inactive #eee8d5 #fdf6e3 #839496 #6c71c4 -client.unfocused #eee8d5 #fdf6e3 #839496 #586e75 -client.urgent #cb4b16 #fdf6e3 #839496 #dc322f - -bindsym "Control + 5" exec --no-startup-id setxkbmap us -bindsym "Control + 6" exec --no-startup-id setxkbmap de - - -exec --no-startup-id i3-msg 'workspace 4; exec st -hold -e ssh chat@ssh.protagon.space -p 5123' -exec --no-startup-id sudo skiller-ctl -p 2 -exec --no-startup-id sudo skiller-ctl -w 1 -exec --no-startup-id xfce4-clipman -exec ~/.scripts ec -e '' diff --git a/.tmp/yabar/yabar.conf b/.tmp/yabar/yabar.conf deleted file mode 100644 index 9439a51..0000000 --- a/.tmp/yabar/yabar.conf +++ /dev/null @@ -1,152 +0,0 @@ -#$ sed -e 's/0x/0x/g' -bar-list = ["topbar"]; -topbar:{ - font: "Monospace, FontAwesome 8"; - block-list: ["ya_i3", "ya_title", "ya_date", "ya_uptime", "ya_cpu", "ya_bw", "ya_mem", "ya_disk", "song"]; - position: "bottom"; - gap-vertical: 10; - #width: 1100; - height: 20; - //If you want transparency, use argb, not rgb - background-color-rgb: 0xeee8d5; - underline-size: 2; - overline-size: 2; - slack-size: 4; - #border-size: 2; - monitor: "HDMI-0"; # get names from `xrandr` - - ya_ws: { - exec: "YABAR_WORKSPACE"; - align: "left"; - fixed-size: 40; - background-color-rgb:0x93a1a1; - #internal-option1: "        "; - } - ya_i3: { - exec: "/home/hiro/Documents/Projects/i3test/test.o"; - underline-color-rgb: 0x93a1a1; - align: "left"; - pango-markup: true; - background-color-rgb:0x93a1a1; - type: "persist"; - } - ya_title: { - exec: "YABAR_TITLE"; - align: "left"; - background-color-rgb:0x93a1a1; - justify: "center"; - fixed-size: 300; - } - ya_date:{ - exec: "YABAR_DATE"; - align: "center"; - fixed-size: 170; - interval: 2; - background-color-rgb:0x93a1a1; - underline-color-rgb:0x002b36; - internal-prefix: " "; - internal-option1: "%a %d %b, %I:%M"; - } - ya_uptime:{ - exec: "YABAR_UPTIME"; - align: "right"; - fixed-size: 70; - interval: 1; - background-color-rgb:0x93a1a1; - underline-color-rgb:0x268bd2; - internal-prefix: " "; - #internal-spacing: true; - } - ya_mem:{ - exec: "YABAR_MEMORY"; - align: "right"; - fixed-size: 70; - interval: 1; - background-color-rgb:0x93a1a1; - underline-color-rgb:0x6c71c4; - internal-prefix: " "; - #internal-spacing: true; - } - ya_bw: { - exec: "YABAR_BANDWIDTH"; - align: "right"; - fixed-size: 110; - interval: 1; - internal-prefix: " "; - internal-option1: "enp3s0"; # "default" or network interface from `ifconfig` or `ip link` - internal-option2: " "; # characters to be placed before up/down data - #background-color-rgb:0x547980; - background-color-rgb:0x93a1a1; - underline-color-rgb:0xdc322f; - #internal-spacing: true; - } - ya_cpu: { - exec: "YABAR_CPU"; - align: "right"; - justify: "center"; - fixed-size: 60; - interval: 1; - internal-prefix: " "; - internal-suffix: "%"; - background-color-rgb:0x93a1a1; - underline-color-rgb:0xdc322f; - internal-spacing: true; - } - # ya_bat: { - # exec: "YABAR_BATTERY"; - # align: "right"; - # fixed-size: 70; - # interval: 1; - # internal-suffix: "%"; - # internal-option1: "BAT0"; - # internal-option2: "    "; - # #internal-spacing: true; - # } - ya_disk: { - exec: "YABAR_DISKIO"; - align: "right"; - fixed-size: 110; - interval: 1; - internal-prefix: " "; - internal-option1: "sda"; # name from `lsblk` or `ls /sys/class/block/` - internal-option2: " "; # characters to be placed before in/out data - background-color-rgb:0x93a1a1; - underline-color-rgb:0x859900; - #internal-spacing: true; - } - ya_diskspace: { - exec: "YABAR_DISKSPACE"; - align: "left"; - fixed-size: 120; - interval: 10; - internal-prefix: " "; - # examples for this option: - # "/dev/sda1" first partition of device sda - # "/dev/sdb" all mounted partitions of device sdb - # "/dev/mapper/vgc-" all mounted logical volumes of volume group vgc - # "/dev" all mounted partitions / logical volumes - internal-option1: "/dev/sda"; - background-color-rgb:0x93a1a1; - underline-color-rgb:0x268bd2; - } - # YA_wifi: { - # exec: "YABAR_WIFI"; - # internal-prefix: "  "; - # internal-suffix: " "; - # internal-option1: "wlan0"; - # variable-size: true; - # background-color-rgb: 0x444444; - # } - - song: { - exec: "YABAR_SONG"; - fixed-size: 200; - type: "periodic"; - align: "right"; - internal-option1: "google-play-music-desktop-player"; - background-color-rgb:0x93a1a1; - underline-color-rgb:0x002b36; - - } -} - diff --git a/.tmp/yabar/yabar.conf.tm b/.tmp/yabar/yabar.conf.tm deleted file mode 100644 index 0528ad7..0000000 --- a/.tmp/yabar/yabar.conf.tm +++ /dev/null @@ -1,152 +0,0 @@ -#$ sed -e 's/0x/0x/g' -bar-list = ["topbar"]; -topbar:{ - font: "Monospace, FontAwesome Bold 9"; - block-list: ["ya_diskspace", "ya_ws", "ya_title", "ya_date", "ya_diskusage", "ya_volume", "ya_uptime", "ya_cpu", "ya_thermal", "ya_brightness", "ya_bw", "ya_mem", "ya_disk", "ya_bat", "ya_wifi"]; - position: "bottom"; - gap-horizontal: 10; - gap-vertical: 10; - #width: 1100; - height: 20; - //If you want transparency, use argb, not rgb - background-color-rgb: 0x586e75; - underline-size: 2; - overline-size: 2; - slack-size: 4; - #border-size: 2; - #monitor: "LVDS1 HDMI1"; # get names from `xrandr` - - # various examples for internal blocks: - ya_ws: { - exec: "YABAR_WORKSPACE"; - underline-color-rgb: 0xde935f; - align: "left"; - fixed-size: 40; - internal-option1: "         "; - } - ya_title: { - exec: "YABAR_TITLE"; - align: "left"; - justify: "left"; - fixed-size: 300; - } - ya_date:{ - exec: "YABAR_DATE"; - align: "center"; - fixed-size: 170; - interval: 2; - background-color-rgb:0x279DBD; - underline-color-rgb:0xC02942; - internal-prefix: " "; - internal-option1: "%a %d %b, %I:%M"; - } - ya_uptime:{ - exec: "YABAR_UPTIME"; - align: "right"; - fixed-size: 70; - interval: 1; - background-color-rgb:0x96B49C; - underline-color-rgb:0xF8CA00; - internal-prefix: " "; - #internal-spacing: true; - } - ya_mem:{ - exec: "YABAR_MEMORY"; - align: "right"; - fixed-size: 70; - interval: 1; - background-color-rgb:0x45ADA8; - underline-color-rgb:0xFA6900; - internal-prefix: " "; - #internal-spacing: true; - } - ya_bw: { - exec: "YABAR_BANDWIDTH"; - align: "right"; - fixed-size: 110; - interval: 1; - internal-prefix: " "; - internal-option1: "enp3s0"; # "default" or network interface from `ifconfig` or `ip link` - internal-option2: " "; # characters to be placed before up/down data - #background-color-rgb:0x547980; - background-color-rgb:0x3EC9A7; - underline-color-rgb:0xD95B43; - #internal-spacing: true; - } - ya_cpu: { - exec: "YABAR_CPU"; - align: "right"; - fixed-size: 60; - interval: 1; - internal-prefix: " "; - internal-suffix: "%"; - background-color-rgb:0x98D9B6; - underline-color-rgb:0xE97F02; - #internal-spacing: true; - } - # ya_bat: { - # exec: "YABAR_BATTERY"; - # align: "right"; - # fixed-size: 70; - # interval: 1; - # internal-suffix: "%"; - # internal-option1: "BAT0"; - # internal-option2: "    "; - # #internal-spacing: true; - # } - ya_disk: { - exec: "YABAR_DISKIO"; - align: "right"; - fixed-size: 110; - interval: 1; - internal-prefix: " "; - internal-option1: "sda"; # name from `lsblk` or `ls /sys/class/block/` - internal-option2: " "; # characters to be placed before in/out data - background-color-rgb:0x49708A; - underline-color-rgb:0xECD078; - #internal-spacing: true; - } - ya_diskspace: { - exec: "YABAR_DISKSPACE"; - align: "left"; - fixed-size: 120; - interval: 10; - internal-prefix: " "; - # examples for this option: - # "/dev/sda1" first partition of device sda - # "/dev/sdb" all mounted partitions of device sdb - # "/dev/mapper/vgc-" all mounted logical volumes of volume group vgc - # "/dev" all mounted partitions / logical volumes - internal-option1: "/dev/sda"; - background-color-rgb:0x49708A; - underline-color-rgb:0xECD078; - } - # ya_wifi: { - # exec: "YABAR_WIFI"; - # internal-prefix: "  "; - # internal-suffix: " "; - # internal-option1: "wlan0"; - # variable-size: true; - # background-color-rgb: 0x444444; - # } - title: { - exec: "xtitle -s"; - align: "left"; - fixed-size: 350; - type: "persist"; - foreground-color-rgb:0xeeeeee; - underline-color-rgb:0x373b41; - overline-color-rgb:0x373b41; - } - # song:{ - # exec: "YABAR_SONG"; - # fixed-size: 200; - # type: "periodic"; - # internal-option1: "google-play-music-desktop-player"; - # } - keyboard: { - exec: "YABAR_KEYBOARD_LAYOUT"; - interval: 1; - } -} - diff --git a/colors.sh b/colors.sh index a7d1d67..47ee396 100644 --- a/colors.sh +++ b/colors.sh @@ -33,7 +33,11 @@ fi } function generateGtk { - OOMOXCONF=$(mktemp) + OOMOXCONF="$DOTFILES_TMP/$SCHEME" + + if [ ! -f $OOMOXCONF ]; then + grey "Generating...\nThis might take a while..." + cat > $OOMOXCONF << EOF NAME="hiroTheme" NOGUI=True @@ -58,7 +62,8 @@ EOF sed -i -s 's/#//' $OOMOXCONF # make the theme - oomox-cli $OOMOXCONF >/dev/null 2>&1 - oomox-archdroid-icons-cli $OOMOXCONF >/dev/null 2>&1 - OOMOXTHEME="oomox-"$(basename $OOMOXCONF) + tools/oomox-gtk-theme/change_color.sh $OOMOXCONF >/dev/null 2>&1 + tools/oomox-archdroid-icon-theme/change_color.sh $OOMOXCONF >/dev/null 2>&1 + fi + OOMOXTHEME="oomox-"$SCHEME } diff --git a/config.sh b/config.sh new file mode 100644 index 0000000..b0ef265 --- /dev/null +++ b/config.sh @@ -0,0 +1,6 @@ +WIFI_DEV="wlp2s0" +ETH_DEV="enp1s0" + +MAIN_NET=$WIFI_DEV +BATTERY="BAT1" +MAIN_FONT="Source Code Pro 8" diff --git a/gtk/settings.ini.template b/gtk/settings.ini.template index 6e76b08..7bbe3e8 100644 --- a/gtk/settings.ini.template +++ b/gtk/settings.ini.template @@ -2,5 +2,5 @@ gtk-application-prefer-dark-theme = false gtk-theme-name = {{ OOMOXTHEME }} gtk-fallback-icon-theme = gnome -gtk-icon-theme-name = {{ OOMOXTHEME }} +gtk-icon-theme-name = {{ OOMOXTHEME }}-flat gtk-font-name = Source Code Pro 8 \ No newline at end of file diff --git a/home/.emacs b/home/.emacs index a8227bb..5bcb192 100644 --- a/home/.emacs +++ b/home/.emacs @@ -17,10 +17,29 @@ ;;; Desktop (desktop-save-mode 1) -;;; Custom Scriptsp +;;; Custom Scripts (defun close-all-buffers () (interactive) (mapc 'kill-buffer (buffer-list))) +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(custom-safe-themes + (quote + ("8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "065efdd71e6d1502877fd5621b984cded01717930639ded0e569e1724d058af8" default))) + '(package-selected-packages + (quote + (nix-mode json-mode multiple-cursors swiper ivy xresources-theme powerline)))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) + + ;;; Packages (require 'package) @@ -44,20 +63,3 @@ (load-theme 'solarized t) (powerline-default-theme) -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(custom-safe-themes - (quote - ("8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "065efdd71e6d1502877fd5621b984cded01717930639ded0e569e1724d058af8" default))) - '(package-selected-packages - (quote - (json-mode multiple-cursors swiper ivy xresources-theme powerline)))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/home/.gtkrc-2.0.template b/home/.gtkrc-2.0.template index 4dcf07e..4194fc4 100644 --- a/home/.gtkrc-2.0.template +++ b/home/.gtkrc-2.0.template @@ -1,2 +1,2 @@ gtk-theme-name="{{ OOMOXTHEME }}" -gtk-icon-theme-name="{{ OOMOXTHEME }}" +gtk-icon-theme-name="{{ OOMOXTHEME }}-flat" diff --git a/i3/config.template b/i3/config.template index 9ceee92..78c76a4 100644 --- a/i3/config.template +++ b/i3/config.template @@ -40,7 +40,7 @@ bindsym $mod+Return exec st bindsym $mod+Shift+q kill # start dmenu (a program launcher) -bindsym $mod+d exec rofi -show run +bindsym $mod+d exec rofi -show run -dmenu # There also is the (new) i3-dmenu-desktop which only displays applications # shipping a .desktop file. It is a wrapper around dmenu, so you need that # installed. @@ -156,11 +156,20 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { - i3bar_command $HOME/.scripts/bar.sh + font pango: {{ MAIN_FONT }} + position top + status_command /usr/bin/env i3status-rs {{ HOME }}/.config/i3status/config.toml + colors { + separator {{S_base1}} + background {{S_base03}} + statusline {{S_base2}} + + focused_workspace {{ S_base00 }} {{ S_base00 }} #ffffff + active_workspace {{ S_base00 }} #333333 #ffffff + inactive_workspace {{ S_base02 }} {{ S_base02 }} #888888 + urgent_workspace {{ S_orange }} {{ S_orange}} #ffffff + } # colors { - # separator {{S_base1}} - # background {{S_base03}} - # statusline {{S_base0}} # focused_workspace #fdf6e3 #859900 #fdf6e3 # active_workspace #fdf6e3 #6c71c4 #fdf6e3 # inactive_workspace #586e75 #93a1a1 #002b36 diff --git a/i3status/config.toml.template b/i3status/config.toml.template new file mode 100644 index 0000000..06652da --- /dev/null +++ b/i3status/config.toml.template @@ -0,0 +1,63 @@ +icons = "awesome" + +[theme] +name = "solarized-dark" +[theme.overrides] +idle_bg = "{{ S_base02 }}" +idle_fg = "{{ S_base3 }}" + +[[block]] +block = "focused_window" +max_width = 21 + +[[block]] +block = "disk_space" +path = "/" +alias = "/" +info_type = "available" +unit = "GB" +interval = 20 + +[[block]] +block = "memory" +display_type = "memory" +format_mem = "{Mup}%" +format_swap = "{SUp}%" + +[[block]] +block = "cpu" +interval = 1 + +[[block]] +block = "load" +interval = 1 +format = "{1m}" + +[[block]] +block = "sound" + +[[block]] +block = "music" +player = "google-play-music-desktop-player" +buttons = ["play", "next"] + +[[block]] +block = "net" +device = "{{ MAIN_NET }}" +ssid = true +ip = true +speed_up = false +graph_up = false +interval = 5 + +{{ #BATTERY }} +[[block]] +block = "battery" +interval = 10 +device = "{{ BATTERY }}" +{{ /BATTERY }} + +[[block]] +block = "time" +interval = 60 +format = "%a %d/%m %R" \ No newline at end of file diff --git a/install.sh b/install.sh index 3b11421..5b0ddcd 100644 --- a/install.sh +++ b/install.sh @@ -1,5 +1,7 @@ #!/bin/bash source colors.sh +source config.sh +source install_init.sh source tools/mo echo -e " @@ -11,13 +13,35 @@ echo -e " DOTFILES_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DOTFILES_TMP=$DOTFILES_DIR/.tmp #TODO remove FISH_DIR=$HOME/.config/fish -SCHEME=$1 +SCHEME="light" +YES=false function main { + # extract options and their arguments into variables. + while getopts ":s: :i :y" OPT; do + case $OPT in + s) + SCHEME=$OPTARG + grey "\n---------> Using color scheme: $SCHEME" + ;; + i) + printHeading "Installing initial dependencies!" + installInit + exit + ;; + y) + YES=true + ;; + \?) + echo "Usage $0 [-i -> Initialize] [-s -> Colorscheme] [-y]" + exit + ;; + esac + done + mkdir -p $DOTFILES_TMP printHeading "Creating Color Themes." - grey "This might take a while..." setColors $SCHEME generateGtk @@ -39,7 +63,7 @@ function main { ## Install Powerline Config linkall "i3" ".config/i3" - linkall "yabar" ".config/yabar" + linkall "i3status" ".config/i3status" # Install GTK stuff linkall "gtk" ".config/gtk-3.0/" @@ -49,10 +73,10 @@ function main { linkall "scripts" ".scripts" # Reload - xrdb -load ${HOME}/.Xresources - killall -s USR1 st - i3-msg restart - gtkrc-reload + xrdb -load ${HOME}/.Xresources >/dev/null 2>&1 + killall -s USR1 st >/dev/null 2>&1 + i3-msg restart >/dev/null 2>&1 + gtkrc-reload >/dev/null 2>&1 } ## Helpers @@ -112,13 +136,13 @@ function linkall { # Get Commands CMD=$(sed -n '/#\$/p' $CDIR/$f | sed -e 's/#\$//g') - if [ ${f: -9} == ".template" ]; then + if [[ ${f: -9} == ".template" ]]; then mkdir -p $DOTFILES_TMP/$DIR cat $CDIR/$f | mo > $DOTFILES_TMP/$DIR/${f:0:-9} CDIR=$DOTFILES_TMP/$DIR/ f=${f:0:-9} fi - if [ -f $HOME/$INSTALL_PREFIX/$f ]; then + if ! $YES && [ -f $HOME/$INSTALL_PREFIX/$f ]; then attention "Overwrite File '$HOME/$INSTALL_PREFIX/$f' [Y/n] " read c case $c in diff --git a/install_init.sh b/install_init.sh new file mode 100644 index 0000000..0c611cd --- /dev/null +++ b/install_init.sh @@ -0,0 +1,11 @@ +#!/bin/bash +function installInit { + printHeading "Install OMF" + + OMF_TMP=$(mktemp) + curl -L https://get.oh-my.fish > $OMF_TMP + fish $OMF_TMP + + printSubHeading "Install OMF Theme" + fish -c "omf install bobthefish" +} diff --git a/scripts/ec b/scripts/ec index 7076323..7f8e149 100755 --- a/scripts/ec +++ b/scripts/ec @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Shamelessly taken from http://mjwall.com/blog/2013/10/04/how-i-use-emacs/ diff --git a/tools/oomox-archdroid-icon-theme b/tools/oomox-archdroid-icon-theme new file mode 160000 index 0000000..6dc4c92 --- /dev/null +++ b/tools/oomox-archdroid-icon-theme @@ -0,0 +1 @@ +Subproject commit 6dc4c92689ea2ce99534d6f461283efdf8ffd270 diff --git a/tools/oomox-gtk-theme b/tools/oomox-gtk-theme new file mode 160000 index 0000000..fef5f8d --- /dev/null +++ b/tools/oomox-gtk-theme @@ -0,0 +1 @@ +Subproject commit fef5f8d74dd0a0bc0add311d32bb0682715266a9 diff --git a/yabar/yabar.conf.template b/yabar/yabar.conf.template index 32c4110..f7b0552 100644 --- a/yabar/yabar.conf.template +++ b/yabar/yabar.conf.template @@ -2,7 +2,7 @@ bar-list = ["topbar"]; topbar:{ font: "Monospace, FontAwesome 8"; - block-list: ["ya_i3", "ya_title", "ya_date", "ya_uptime", "ya_cpu", "ya_bw", "ya_mem", "ya_disk", "song"]; + block-list: ["workspaces", "ya_title", "ya_date", "ya_uptime", "ya_cpu", "ya_bw" {{ #BATTERY }}, "ya_bat" {{ /BATTERY }}, "ya_mem", "ya_disk", "song" {{ #WIFI_DEV }}, "ya_wifi" {{ /WIFI_DEV }}]; position: "bottom"; gap-vertical: 10; #width: 1100; @@ -15,14 +15,26 @@ topbar:{ #border-size: 2; monitor: "HDMI-0"; # get names from `xrandr` - ya_i3: { - exec: "YABAR_I3_DESKTOPS"; - underline-color-rgb: 0x{{S_base01}}; - align: "left"; - fixed-size: 40; - background-color-rgb:0x{{S_base01}}; - internal-option1: "         "; - } + # ya_i3: { + # exec: "YABAR_I3_DESKTOPS"; + # underline-color-rgb: 0x{{S_base01}}; + # align: "left"; + # fixed-size: 40; + # background-color-rgb:0x{{S_base01}}; + # internal-option1: "         "; + # } + workspaces: { + exec: "YABAR_WORKSPACES"; + underline-color-rgb: 0xde935f; + focused: { + background-color-rgb: 0xBF674A; + underline-color-rgb: 0xde935f; + } + urgent: {} + align: "left"; + internal-option2: "name"; + variable-size: true; + } ya_title: { exec: "YABAR_TITLE"; align: "left"; @@ -66,7 +78,7 @@ topbar:{ fixed-size: 110; interval: 1; internal-prefix: " "; - internal-option1: "enp3s0"; # "default" or network interface from `ifconfig` or `ip link` + internal-option1: "{{ TRAFFIC_COUNTER }}"; # "default" or network interface from `ifconfig` or `ip link` internal-option2: " "; # characters to be placed before up/down data #background-color-rgb:0x547980; background-color-rgb:0x{{S_base01}}; @@ -85,16 +97,19 @@ topbar:{ underline-color-rgb:0x{{S_red}}; internal-spacing: true; } - # ya_bat: { - # exec: "YABAR_BATTERY"; - # align: "right"; - # fixed-size: 70; - # interval: 1; - # internal-suffix: "%"; - # internal-option1: "BAT0"; - # internal-option2: "    "; - # #internal-spacing: true; - # } + {{ #BATTERY }} + ya_bat: { + exec: "YABAR_BATTERY"; + align: "right"; + fixed-size: 70; + interval: 1; + internal-suffix: "%"; + internal-option1: "{{ BATTERY }}"; + background-color-rgb:0x{{S_base01}}; + internal-option2: "    "; + #internal-spacing: true; + } + {{ /BATTERY }} ya_disk: { exec: "YABAR_DISKIO"; align: "right"; @@ -104,7 +119,7 @@ topbar:{ internal-option1: "sda"; # name from `lsblk` or `ls /sys/class/block/` internal-option2: " "; # characters to be placed before in/out data background-color-rgb:0x{{S_base01}}; - underline-color-rgb:0x{{S_green}}; + underline-color-rgb:0x{{S_blue}}; #internal-spacing: true; } ya_diskspace: { @@ -122,15 +137,17 @@ topbar:{ background-color-rgb:0x{{S_base01}}; underline-color-rgb:0x{{S_blue}}; } - # YA_wifi: { - # exec: "YABAR_WIFI"; - # internal-prefix: "  "; - # internal-suffix: " "; - # internal-option1: "wlan0"; - # variable-size: true; - # background-color-rgb: 0x444444; - # } - + {{ #WIFI_DEV }} + ya_wifi: { + exec: "YABAR_WIFI"; + internal-prefix: "  "; + internal-suffix: " "; + internal-option1: "{{ WIFI_DEV }}"; + variable-size: true; + type: "persist"; + background-color-rgb:0x{{S_base01}}; + } + {{ /WIFI_DEV }} song: { exec: "YABAR_SONG"; fixed-size: 200;