diff --git a/README.md b/README.md index 763169c..8c07d03 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,10 @@ Dotfiles My personal configurations, managed with the 'dotdrop' submodule. -![neofetch](https://i.imgur.com/zBQgwUu.png) -![vim](https://i.imgur.com/NvSeJaH.png) +Accent-Color: #00d3a8 + +![neofetch](https://i.imgur.com/tBfX9Ao.png) +![vim](https://i.imgur.com/m6NoNJE.png) | Usage | Name | | :--- | :--- | @@ -12,9 +14,13 @@ My personal configurations, managed with the 'dotdrop' submodule. | Shell | zsh + oh-my-zsh | | WM | i3 (work), i3-gaps (home) | | Terminal | xterm | -| Font | Inconsolata | -| VIM-Theme | OneDark | -| VIM-Bar | lightline | +| Font | Inconsolata Nerd Font Mono | +| VIM-Theme | Nord | +| VIM-Bar | airline | +| Xresources | Nord | +| Backlight | light | +| Notifications | dunst | +| Audio Control | playerctl | | Bar | polybar | | Transparency | picom | | Wallpaper | teh | diff --git a/config.yaml b/config.yaml index 4727fa0..ff808ac 100644 --- a/config.yaml +++ b/config.yaml @@ -63,6 +63,9 @@ dotfiles: d_polybar: src: polybar dst: ~/.config/polybar + d_dunst: + src: dunst + dst: ~/.config/dunst profiles: laptop: @@ -76,6 +79,7 @@ profiles: - tmux - wallpaper - polybar + - dunst work: include: - zsh @@ -128,3 +132,6 @@ profiles: polybar: dotfiles: - d_polybar + dunst: + dotfiles: + - d_dunst diff --git a/dotdrop b/dotdrop index 736941a..141caef 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 736941a147b173b988e0c3510b431c1ca6188424 +Subproject commit 141caef07f716da726879ff61dd084819912d68a diff --git a/dotfiles/X11/Xresources b/dotfiles/X11/Xresources index dff4e36..62006b0 100644 --- a/dotfiles/X11/Xresources +++ b/dotfiles/X11/Xresources @@ -31,7 +31,7 @@ XTerm.vt100.translations: #override \n\ Ctrl plus: larger-vt-font() ! some urxvt term settings -URxvt.font: xft:Inconsolata:size=11:antialias=true +URxvt.font: xft:Inconsolata Nerd Font Mono:size=11:antialias=true URxvt.transparent: true URxvt.shading: 50 URxvt.scrollBar: false diff --git a/dotfiles/dunst/dunstrc b/dotfiles/dunst/dunstrc new file mode 100644 index 0000000..fa5f004 --- /dev/null +++ b/dotfiles/dunst/dunstrc @@ -0,0 +1,336 @@ +[global] + ### Display ### + + # Which monitor should the notifications be displayed on. + monitor = 0 + + # Display notification on focused monitor. Possible modes are: + # mouse: follow mouse pointer + # keyboard: follow window with keyboard focus + # none: don't follow anything + # + # "keyboard" needs a window manager that exports the + # _NET_ACTIVE_WINDOW property. + # This should be the case for almost all modern window managers. + # + # If this option is set to mouse or keyboard, the monitor option + # will be ignored. + follow = mouse + + # The geometry of the window: + # [{width}]x{height}[+/-{x}+/-{y}] + # The geometry of the message window. + # The height is measured in number of notifications everything else + # in pixels. If the width is omitted but the height is given + # ("-geometry x2"), the message window expands over the whole screen + # (dmenu-like). If width is 0, the window expands to the longest + # message displayed. A positive x is measured from the left, a + # negative from the right side of the screen. Y is measured from + # the top and down respectively. + # The width can be negative. In this case the actual width is the + # screen width minus the width defined in within the geometry option. + #geometry = "300x5-30+20" + geometry = "400x20-10+35" + + # Show how many messages are currently hidden (because of geometry). + indicate_hidden = yes + + # Shrink window if it's smaller than the width. Will be ignored if + # width is 0. + shrink = no + + # The transparency of the window. Range: [0; 100]. + # This option will only work if a compositing window manager is + # present (e.g. xcompmgr, compiz, etc.). + transparency = 20 + + # The height of the entire notification. If the height is smaller + # than the font height and padding combined, it will be raised + # to the font height and padding. + notification_height = 0 + + # Draw a line of "separator_height" pixel height between two + # notifications. + # Set to 0 to disable. + separator_height = 2 + + # Padding between text and separator. + padding = 8 + + # Horizontal padding. + horizontal_padding = 8 + + # Defines width in pixels of frame around the notification window. + # Set to 0 to disable. + frame_width = 5 + + # Defines color of the frame around the notification window. + frame_color = "#262626" + + # Define a color for the separator. + # possible values are: + # * auto: dunst tries to find a color fitting to the background; + # * foreground: use the same color as the foreground; + # * frame: use the same color as the frame; + # * anything else will be interpreted as a X color. + separator_color = frame + + # Sort messages by urgency. + sort = yes + + # Don't remove messages, if the user is idle (no mouse or keyboard input) + # for longer than idle_threshold seconds. + # Set to 0 to disable. + # Transient notifications ignore this setting. + idle_threshold = 120 + + ### Text ### + + font = Inconsolata Nerd Font Mono 11 + + # The spacing between lines. If the height is smaller than the + # font height, it will get raised to the font height. + line_height = 0 + + # Possible values are: + # full: Allow a small subset of html markup in notifications: + # bold + # italic + # strikethrough + # underline + # + # For a complete reference see + # . + # + # strip: This setting is provided for compatibility with some broken + # clients that send markup even though it's not enabled on the + # server. Dunst will try to strip the markup but the parsing is + # simplistic so using this option outside of matching rules for + # specific applications *IS GREATLY DISCOURAGED*. + # + # no: Disable markup parsing, incoming notifications will be treated as + # plain text. Dunst will not advertise that it has the body-markup + # capability if this is set as a global setting. + # + # It's important to note that markup inside the format option will be parsed + # regardless of what this is set to. + markup = full + + # The format of the message. Possible variables are: + # %a appname + # %s summary + # %b body + # %i iconname (including its path) + # %I iconname (without its path) + # %p progress value if set ([ 0%] to [100%]) or nothing + # %n progress value if set without any extra characters + # %% Literal % + # Markup is allowed + format = "%s\n%b" + + # Alignment of message text. + # Possible values are "left", "center" and "right". + alignment = left + + # Show age of message if message is older than show_age_threshold + # seconds. + # Set to -1 to disable. + show_age_threshold = 60 + + # Split notifications into multiple lines if they don't fit into + # geometry. + word_wrap = yes + + # When word_wrap is set to no, specify where to ellipsize long lines. + # Possible values are "start", "middle" and "end". + ellipsize = middle + + # Ignore newlines '\n' in notifications. + ignore_newline = no + + # Merge multiple notifications with the same content + stack_duplicates = true + + # Hide the count of merged notifications with the same content + hide_duplicate_count = false + + # Display indicators for URLs (U) and actions (A). + show_indicators = yes + + ### Icons ### + + # Align icons left/right/off + icon_position = left + + # Scale larger icons down to this size, set to 0 to disable + max_icon_size = 48 + + # Paths to default icons. + #icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ + icon_path = /usr/share/icons/Adwaita/16x16/status/:/usr/share/icons/Adwaita/16x16/devices/ + + ### History ### + + # Should a notification popped up from history be sticky or timeout + # as if it would normally do. + sticky_history = yes + + # Maximum amount of notifications kept in history + history_length = 20 + + ### Misc/Advanced ### + + # dmenu path. + dmenu = /usr/bin/dmenu -p dunst: + + # Browser for opening urls in context menu. + browser = /usr/bin/firefox -new-tab + + # Always run rule-defined scripts, even if the notification is suppressed + always_run_script = true + + # Define the title of the windows spawned by dunst + title = Dunst + + # Define the class of the windows spawned by dunst + class = Dunst + + # Print a notification on startup. + # This is mainly for error detection, since dbus (re-)starts dunst + # automatically after a crash. + startup_notification = true + + ### Legacy + + # Use the Xinerama extension instead of RandR for multi-monitor support. + # This setting is provided for compatibility with older nVidia drivers that + # do not support RandR and using it on systems that support RandR is highly + # discouraged. + # + # By enabling this setting dunst will not be able to detect when a monitor + # is connected or disconnected which might break follow mode if the screen + # layout changes. + force_xinerama = false + +# Experimental features that may or may not work correctly. Do not expect them +# to have a consistent behaviour across releases. +[experimental] + # Calculate the dpi to use on a per-monitor basis. + # If this setting is enabled the Xft.dpi value will be ignored and instead + # dunst will attempt to calculate an appropriate dpi value for each monitor + # using the resolution and physical size. This might be useful in setups + # where there are multiple screens with very different dpi values. + per_monitor_dpi = false + +[shortcuts] + + # Shortcuts are specified as [modifier+][modifier+]...key + # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", + # "mod3" and "mod4" (windows-key). + # Xev might be helpful to find names for keys. + + # Close notification. + close = ctrl+space + + # Close all notifications. + close_all = ctrl+shift+space + + # Redisplay last message(s). + # On the US keyboard layout "grave" is normally above TAB and left + # of "1". Make sure this key actually exists on your keyboard layout, + # e.g. check output of 'xmodmap -pke' + history = ctrl+grave + + # Context menu. + context = ctrl+shift+period + +[urgency_low] + # IMPORTANT: colors have to be defined in quotation marks. + # Otherwise the "#" and following would be interpreted as a comment. + background = "#00d3a8" + foreground = "#202124" + frame_color = "#202124" + timeout = 5 + # Icon for notifications with low urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_normal] + background = "#00d3a8" + foreground = "#202124" + frame_color = "#202124" + timeout = 5 + # Icon for notifications with normal urgency, uncomment to enable + #icon = /path/to/icon + +[urgency_critical] + background = "#00d3a8" + foreground = "#202124" + frame_color = "#202124" + timeout = 0 + # Icon for notifications with critical urgency, uncomment to enable + #icon = /path/to/icon + +# Every section that isn't one of the above is interpreted as a rules to +# override settings for certain messages. +# Messages can be matched by "appname", "summary", "body", "icon", "category", +# "msg_urgency" and you can override the "timeout", "urgency", "foreground", +# "background", "new_icon" and "format". +# Shell-like globbing will get expanded. +# +# SCRIPTING +# You can specify a script that gets run when the rule matches by +# setting the "script" option. +# The script will be called as follows: +# script appname summary body icon urgency +# where urgency can be "LOW", "NORMAL" or "CRITICAL". +# +# NOTE: if you don't want a notification to be displayed, set the format +# to "". +# NOTE: It might be helpful to run dunst -print in a terminal in order +# to find fitting options for rules. + +[slack] + appname = Slack + new_icon = /home/id0827502/images/icons/slack.png + urgency = normal + format = "%s\n\n%b" + +#[espeak] +# summary = "*" +# script = dunst_espeak.sh + +#[script-test] +# summary = "*script*" +# script = dunst_test.sh + +#[ignore] +# # This notification will not be displayed +# summary = "foobar" +# format = "" + +#[history-ignore] +# # This notification will not be saved in history +# summary = "foobar" +# history_ignore = yes + +#[signed_on] +# appname = Pidgin +# summary = "*signed on*" +# urgency = low +# +#[signed_off] +# appname = Pidgin +# summary = *signed off* +# urgency = low +# +#[says] +# appname = Pidgin +# summary = *says* +# urgency = critical +# +#[twitter] +# appname = Pidgin +# summary = *twitter.com* +# urgency = normal +# +# vim: ft=cfg diff --git a/dotfiles/fonts/Inconsolata Regular Nerd Font Complete.ttf b/dotfiles/fonts/Inconsolata Regular Nerd Font Complete.ttf deleted file mode 100644 index 8ca633e..0000000 Binary files a/dotfiles/fonts/Inconsolata Regular Nerd Font Complete.ttf and /dev/null differ diff --git a/dotfiles/fonts/InconsolataGitHub/Inconsolata Nerd Font Complete Mono.otf b/dotfiles/fonts/InconsolataGitHub/Inconsolata Nerd Font Complete Mono.otf new file mode 100644 index 0000000..6a0ca1f Binary files /dev/null and b/dotfiles/fonts/InconsolataGitHub/Inconsolata Nerd Font Complete Mono.otf differ diff --git a/dotfiles/fonts/InconsolataGitHub/Inconsolata Regular Nerd Font Complete Mono.otf b/dotfiles/fonts/InconsolataGitHub/Inconsolata Regular Nerd Font Complete Mono.otf new file mode 100644 index 0000000..cdff02d Binary files /dev/null and b/dotfiles/fonts/InconsolataGitHub/Inconsolata Regular Nerd Font Complete Mono.otf differ diff --git a/dotfiles/fonts/InconsolataGitHub/Inconsolata Regular Nerd Font Complete Mono.ttf b/dotfiles/fonts/InconsolataGitHub/Inconsolata Regular Nerd Font Complete Mono.ttf new file mode 100644 index 0000000..428adba Binary files /dev/null and b/dotfiles/fonts/InconsolataGitHub/Inconsolata Regular Nerd Font Complete Mono.ttf differ diff --git a/dotfiles/fonts/Space Mono Nerd Font Complete Mono.ttf b/dotfiles/fonts/Space Mono Nerd Font Complete Mono.ttf deleted file mode 100644 index ad07b9d..0000000 --- a/dotfiles/fonts/Space Mono Nerd Font Complete Mono.ttf +++ /dev/null @@ -1,878 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - nerd-fonts/Space Mono Nerd Font Complete Mono.ttf at master · ryanoasis/nerd-fonts · GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Skip to content - - - - - - - - - - - -
- -
- - -
- -
- - - - -
-
-
- - - - - - - - - - - - - -
- -
- -
-

- - - / - - nerd-fonts - - -

- - -
- - - -
- - - -
- -
- - -
-
-
- - - - - - - - - Permalink - - - - - -
- - -
- - Branch: - master - - - - -
- - - -
- -
- -
- - Find file - - - Copy path - -
- -

- nerd-fonts/patched-fonts/SpaceMono/Regular/complete/Space Mono Nerd Font Complete Mono.ttf -

- -
- - Find file - - - Copy path - -
-
- - - - - - -
- Fetching contributors… -
- -
- - Cannot retrieve contributors at this time -
- - - - - -
- -
-
- - 844 KB -
- -
- -
- Download - History -
- - -
- - - - -
- -
-
-
- - - - - - -
-
- View raw -
-
- -
- - - -
- - -
- - -
 -
- - - -
-
- -
-
- - -
- - - - - - -
- - - You can’t perform that action at this time. -
- - - - - - - - - - - - - - - - - - -
- - - - - -NO javascript -NO script-type - diff --git a/dotfiles/i3/i3 b/dotfiles/i3/i3 index 24b5327..0612c90 100644 --- a/dotfiles/i3/i3 +++ b/dotfiles/i3/i3 @@ -10,7 +10,6 @@ # Please see https://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 @@ -32,11 +31,17 @@ exec --no-startup-id nm-applet # Use pactl to adjust volume in PulseAudio. set $refresh_i3status killall -SIGUSR1 i3status -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +2% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -2% && $refresh_i3status bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status +#sound control +bindsym XF86AudioPlay exec playerctl play +bindsym XF86AudioPause exec playerctl pause +bindsym XF86AudioNext exec playerctl next +bindsym XF86AudioPrev exec playerctl previous + # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod @@ -149,7 +154,7 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Itterasshai!' -B 'Hai!' 'i3- # Border for_window [class="^.*"] border pixel 0 # class border backgr. text indicator child_border -client.focused #00b111 #222222 #ffffff #2e9ef4 #990000 +client.focused #00d3a8 #222222 #ffffff #2e9ef4 #990000 client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.unfocused #333333 #222222 #888888 #292d2e #222222 client.urgent #2f343a #900000 #ffffff #900000 #900000 @@ -227,7 +232,7 @@ bindsym $mod+Ctrl+2 move workspace to output $monitor2 bindsym $mod+Shift+BackSpace exec "xlock -mode matrix -info ''" # Custom Workspaces -exec --no-startup-id "chromium-browser" +# exec --no-startup-id "chromium-browser" for_window [class="Chromium"] move container to workspace 9 @@ -243,7 +248,8 @@ bindsym $mod+Ctrl+1 move workspace to output $monitor1 bindsym $mod+Ctrl+2 move workspace to output $monitor2 # i3-gaps smart_gaps on -gaps inner 10 +gaps inner 5 exec_always --no-startup-id ~/.config/polybar/start.sh & +exec_always --no-startup-id dunst {%@@ endif @@%} diff --git a/dotfiles/picom/picom b/dotfiles/picom/picom index 50ed6df..4c8011c 100644 --- a/dotfiles/picom/picom +++ b/dotfiles/picom/picom @@ -2,6 +2,7 @@ opacity-rule = [ "90:class_g = 'XTerm' && !focused", "95:class_g = 'XTerm' && focused", + "95:class_g = 'discord'", ]; inactive-opacity = 1.0; active-opacity = 1.0; diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config index 954a861..64faa59 100644 --- a/dotfiles/polybar/config +++ b/dotfiles/polybar/config @@ -3,10 +3,6 @@ [colors] my_green = #00d3a8 -accent = ${self.my_green} -background = #18191E -foreground = #fff - black = #000000 red = #ff000f green = #8ce10b @@ -16,9 +12,14 @@ magenta = #6d43a6 cyan = #00d8eb white = #fff +accent = ${self.my_green} +#background = #18191E +background = #f018191E +foreground = ${self.white} + ############################################################################### [font] -inconsolata = "Inconsolata:pixelsize=12;0" +inconsolata = "Inconsolata Nerd Font Mono:pixelsize=11;0" ############################################################################### [bar/laptop] @@ -30,7 +31,7 @@ font-0 = ${font.inconsolata} bottom = false fixed-center = true width = 100% -height = 25 +height = 27 #padding-left = 0.5 padding-right = 1 @@ -38,12 +39,15 @@ padding-right = 1 foreground = ${colors.foreground} background = ${colors.background} +#border-size = 5 +#border-color = ${colors.background} + module-margin = 1 modules-left = i3tabs -modules-center = date -modules-right = spotify backlight network volume battery powermenu -separator = +modules-center = +modules-right = backlight volume network battery date time powermenu +separator = | dim-value = 1.0 @@ -52,8 +56,8 @@ tray-position = right wm-name = i3 wm-restack = i3 -dpi-x = 96 -dpi-y = 96 +#dpi-x = 96 +#dpi-y = 96 ############################################################################### [bar/HDMI1] @@ -62,8 +66,9 @@ inherit = bar/laptop monitor = "HDMI-1" modules-left = i3tabs -modules-center = date -modules-right = network volume powermenu +modules-center = +modules-right = volume network battery date time powermenu +separator = | ############################################################################### [module/i3tabs] @@ -72,34 +77,36 @@ type = internal/i3 pin-workspaces = true index-sort = true enable-click = true -enable-scroll = false +enable-scroll = true wrapping-scroll = false -format = +format = -background = #383D41 +background_visible = #383D41 +background = ${colors.background} label-focused = %index% -label-focused-foreground = ${colors.accent} -label-focused-background = ${self.background} +label-focused-foreground = ${colors.background} +label-focused-background = ${colors.accent} label-focused-underline = ${colors.white} -label-focused-padding = 2 +label-focused-padding = 1 label-unfocused = %index% label-unfocused-foreground = ${colors.white} label-unfocused-background = ${self.background} -label-unfocused-padding = 2 +label-unfocused-padding = 1 label-visible = %index% label-visible-foreground = #ffffff label-visible-background = ${self.background} -label-visible-padding = 2 +label-visible-padding = 1 label-urgent = %index% label-urgent-foreground = ${colors.red} label-urgent-background = ${self.background} -label-urgent-padding = 2 +label-urgent-padding = 1 +label-mode = %mode% label-mode-padding = 0 label-mode-foreground = ${colors.accent} label-mode-background = ${self.background} @@ -110,16 +117,24 @@ type = internal/date interval = 1.0 -date = %Y-%m-%d% +#date = %Y-%m-%d% +date = %A, %d %B %Y + +label = %date% +label-font = 0 +label-foreground = ${colors.white} + +############################################################################### +[module/time] +type = internal/date + +interval = 1.0 time = %H:%M -date-alt = %A, %d %B %Y -time-alt = %H:%M:%S - -label = %date% %time% +label = %time% label-font = 0 -label-foreground = #fff +label-foreground = ${colors.accent} ############################################################################### [module/title] @@ -161,7 +176,7 @@ headphone-soundcard = default master-mixer = Master format-volume = -format-volume-foreground = #fff +format-volume-foreground = ${colors.accent} label-volume = VOL %percentage%% format-muted @@ -180,7 +195,7 @@ format-disconnectded = label-connected = %essid% label-connected-foreground = #fff -label-disconnected = +label-disconnected = NO WIFI label-disconnected-foreground = #fff ############################################################################### @@ -190,9 +205,10 @@ type = internal/backlight card = amdgpu_bl0 enable-scroll = true -format = -format-foreground = #fff -label = BRIGHT %percentage%% +format =