From 89a9a8967e98fbee16352e410c5c42baf7bc8826 Mon Sep 17 00:00:00 2001 From: Akihiro Saiki Date: Thu, 8 Feb 2024 01:02:02 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=94=B9=E9=80=A0=E3=83=93=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=BB=E3=82=A2=E3=83=95=E3=82=BF=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deadd/deadd.css | 22 +- deadd/deadd.yml | 6 +- i3/config | 26 +- i3/launch_notification.sh | 3 + nvim/lua/plugins/init.lua | 40 +- picom/picom.conf | 73 +- polybar/bars.ini | 522 --------------- polybar/colors.ini | 18 +- polybar/config.ini | 844 ++++++------------------ polybar/launch.sh | 17 +- polybar/modules.ini | 1133 +++----------------------------- polybar/preview.ini | 312 --------- polybar/preview.sh | 14 - polybar/scripts/mediaplayer.py | 23 +- polybar/user_modules.ini | 260 -------- spotify-tui/config.yml | 2 +- 16 files changed, 417 insertions(+), 2898 deletions(-) create mode 100755 i3/launch_notification.sh delete mode 100644 polybar/bars.ini delete mode 100644 polybar/preview.ini delete mode 100755 polybar/preview.sh delete mode 100644 polybar/user_modules.ini diff --git a/deadd/deadd.css b/deadd/deadd.css index 1d10714..2dbbcdb 100644 --- a/deadd/deadd.css +++ b/deadd/deadd.css @@ -2,7 +2,7 @@ /* Notification center */ .blurredBG, #main_window, .blurredBG.low, .blurredBG.normal { - background: rgba(26, 27, 38, 0.5); + background: rgba(26, 27, 38, 0.6); } .noti-center.time { @@ -30,15 +30,15 @@ } .blurredBG.notification { - background: rgba(26, 27, 38, 0.4); + background: rgba(26, 27, 38, 0.5); } .blurredBG.notification.critical { - background: rgba(255, 0, 0, 0.5); + background: rgba(255, 0, 0, 0.6); } .notificationInCenter.critical { - background: rgba(155, 0, 20, 0.5); + background: rgba(155, 0, 20, 0.6); } /* Labels */ @@ -72,7 +72,7 @@ button { button:hover { border-radius: 3px; - background: rgba(0, 20, 20, 0.2); + background: rgba(0, 20, 20, 0.3); border-width: 0px; border-top: transparent; border-color: #f00; @@ -83,7 +83,7 @@ button:hover { /* Custom Buttons */ .userbutton { - background: rgba(20,0,0, 0.15); + background: rgba(20,0,0, 0.25); } .userbuttonlabel { @@ -92,7 +92,7 @@ button:hover { } .userbutton:hover { - background: rgba(20, 0, 0, 0.2); + background: rgba(20, 0, 0, 0.3); } .userbuttonlabel:hover { @@ -100,7 +100,7 @@ button:hover { } button.buttonState1 { - background: rgba(20,0,0,0.5); + background: rgba(20,0,0,0.6); } .userbuttonlabel.buttonState1 { @@ -108,7 +108,7 @@ button.buttonState1 { } button.buttonState1:hover { - background: rgba(20,0,0, 0.4); + background: rgba(20,0,0, 0.5); } .userbuttonlabel.buttonState1:hover { @@ -116,7 +116,7 @@ button.buttonState1:hover { } button.buttonState2 { - background: rgba(255,255,255,0.3); + background: rgba(255,255,255,0.4); } .userbuttonlabel.buttonState2 { @@ -124,7 +124,7 @@ button.buttonState2 { } button.buttonState2:hover { - background: rgba(20,0,0, 0.3); + background: rgba(20,0,0, 0.4); } .userbuttonlabel.buttonState2:hover { diff --git a/deadd/deadd.yml b/deadd/deadd.yml index f729b31..8024016 100644 --- a/deadd/deadd.yml +++ b/deadd/deadd.yml @@ -1,9 +1,9 @@ ### Margins for notification-center/notifications -margin-top: 50 -margin-right: 10 +margin-top: 60 +margin-right: 15 ### Margins for notification-center -margin-bottom: 10 +margin-bottom: 15 ### Width of the notification center/notifications in pixels. width: 500 diff --git a/i3/config b/i3/config index f6c7c14..9189e89 100644 --- a/i3/config +++ b/i3/config @@ -36,7 +36,8 @@ font PlemolJP Console NF 14 # set inner and outer gaps gaps outer 3 gaps inner 5 -default_border pixel 3 +gaps top 52 +default_border pixel 0 default_floating_border pixel 3 # color @@ -74,7 +75,7 @@ exec yaskkserv2 --google-japanese-input=last --google-suggest --google-cache-fil exec --no-startup-id nitrogen --restore # notification -exec_always deadd-notification-center +exec_always ~/.config/i3/launch_notification.sh # media controller exec playerctld daemon @@ -152,6 +153,7 @@ bindsym $super+L exec ~/.config/i3/toggle_autosleep.sh ## reload bindsym $mod+shift+r restart +bindsym $super+shift+r exec --no-startup-id ~/.config/polybar/launch.sh ### window focus @@ -178,16 +180,16 @@ bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right ### workspaces -set $ws1 "1:term" -set $ws2 "2:code" -set $ws3 "3:web" -set $ws4 "4:comm" -set $ws5 "5:tools" -set $ws6 "6:S1" -set $ws7 "7:S2" -set $ws8 "8:S3" -set $ws9 "9:S4" -set $ws10 "10:S5" +set $ws1 1 +set $ws2 2 +set $ws3 3 +set $ws4 4 +set $ws5 5 +set $ws6 6 +set $ws7 7 +set $ws8 8 +set $ws9 9 +set $ws10 10 # assign to display workspace $ws1 output $primary diff --git a/i3/launch_notification.sh b/i3/launch_notification.sh new file mode 100755 index 0000000..f86a156 --- /dev/null +++ b/i3/launch_notification.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +pgrep -f deadd-notification-center || deadd-notification-center diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index 8f29c6e..8b080af 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -14,13 +14,13 @@ return { end, }, { 'nvim-tree/nvim-web-devicons', lazy = true }, - { - 'Shougo/deol.nvim', - keys = { - { "", ":Deol -toggle -split=floating", desc = "deol", silent = true }, - { "", [[]], mode = "t", silent = true }, - }, - }, + --{ + -- 'Shougo/deol.nvim', + -- keys = { + -- { "", ":Deol -toggle -split=floating", desc = "deol", silent = true }, + -- { "", [[]], mode = "t", silent = true }, + -- }, + --}, --'airblade/vim-gitgutter', { 'lewis6991/gitsigns.nvim', @@ -32,5 +32,31 @@ return { 'gamoutatsumi/dps-ghosttext.vim', dependencies = 'vim-denops/denops.vim', }, + { + 'numToStr/FTerm.nvim', + opts = { + ft = 'FTerm', + cmd = os.getenv('SHELL'), + border = 'single', + auto_close = true, + hl = 'Normal', + blend = 0, + dimensions = { + height = 0.8, + width = 0.8, + x = 0.5, + y = 0.5, + }, + clear_env = false, + env = nil, + on_exit = nil, + on_stdout = nil, + on_stderr = nil, + }, + keys = { + { "", 'lua require("FTerm").toggle()', desc = "fterm", mode = "n", silent = true }, + { "", 'lua require("FTerm").toggle()', desc = "fterm", mode = "t", silent = true }, + }, + } } diff --git a/picom/picom.conf b/picom/picom.conf index d154605..e34264f 100644 --- a/picom/picom.conf +++ b/picom/picom.conf @@ -8,32 +8,21 @@ mark-ovredir-focused = true; use-ewmh-active-win = false; detect-rounded-corners = true; detect-client-opacity = true; +corner-radius = 10; +rounded-corners-exclude = [ + "window_type = 'dock' && class_g != 'Polybar'", + "window_type = 'desktop'", +]; dbe = false; unredir-if-possible = false; -focus-exclude = [ ]; detect-transient = true; detect-client-leader = true; invert-color-include = [ ]; -#glx-no-stencil = true; -#glx-copy-from-front = false; -#glx-use-copysubbuffermesa = false; -#glx-no-rebind-pixmap = false; -#glx-swap-method = "undefined"; -#vsync = "opengl-swc" - -################################# -# -# Shadow -# -################################# - shadow = true; -#no-dnd-shadow = true; -#no-dock-shadow = true; -shadow-radius = 15; -shadow-offset-x = -20; -shadow-offset-y = -20; -shadow-opacity = 0.7; +shadow-radius = 18; +shadow-offset-x = -16; +shadow-offset-y = -16; +shadow-opacity = 0.8; shadow-red = 0.0; shadow-green = 0.0; shadow-blue = 0.0; @@ -41,69 +30,49 @@ shadow-exclude = [ "class_g = 'VirtualBox Machine'", "class_g = 'i3-frame'", "class_g = 'Terminator'", - "class_g = 'firefoxdeveloperedition' && argb", - "class_g = 'Polybar'", +# "class_g = 'firefoxdeveloperedition' && argb", +# "class_g = 'Polybar'", "bounding_shaped", - "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'" + "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'", + "class_g = 'firefoxdeveloperedition' && argb", ]; - - -################################# -# -# Blur -# -################################# - blur-background = true; blur-background-frame = true; blur-background-fixed = true; blur-background-exclude = [ "class_g = 'VirtualBox Machine'", - "class_g = 'Polybar'", +# "class_g = 'Polybar'", "class_g ~= 'slop'", "class_i ~= 'slop'", "name ~= 'maim'", "window_type = 'desktop'", + "class_g = 'firefoxdeveloperedition'", ]; blur-method = "dual_kawase"; -#blur-method = "kernel"; blur-strength = 5; - - - - -################################# -# -# Opacity -# -################################# - #menu-opacity = 1; inactive-opacity = 0.6; active-opacity = 1.0; frame-opacity = 0.6; inactive-opacity-override = false; #alpha-step = 0.06; - opacity-rule = [ - "100:class_g = 'VirtualBox Machine'", - "90:class_g = 'Alacritty' && focused", - "60:class_g = 'Alacritty' && !focused", - "100:class_g = 'firefoxdeveloperedition' && !focused", - "100:class_g = 'okular' && !focused", "90:class_g = 'Rofi'", ]; - -# GLX backend +focus-exclude = [ + "class_g = 'firefoxdeveloperedition'", + "class_g = 'okular'", + "class_g = 'VirtualBox Machine'", +]; backend = "glx"; glx-no-stencil = true; glx-copy-from-front = false; glx-no-rebind-pixmap = true; use-damage = true; - wintypes: { dropdown_menu = { fade = false; shadow = false; blur-background = false; } popup_menu = { fade = false; shadow = false; blur-background = false; } utility = { fade = false; shadow = false; blur-background = false; } } + diff --git a/polybar/bars.ini b/polybar/bars.ini deleted file mode 100644 index 738e9da..0000000 --- a/polybar/bars.ini +++ /dev/null @@ -1,522 +0,0 @@ -;; ┌────────────────────────────────────────────────────┐ -;; │░█▀█░█▀█░█░░░█░█░█▀▄░█▀█░█▀▄░░░░░░░░░█▀▄░█▀█░█▀▄░█▀▀│ -;; │░█▀▀░█░█░█░░░░█░░█▀▄░█▀█░█▀▄░░░░▀░░░░█▀▄░█▀█░█▀▄░▀▀█│ -;; │░▀░░░▀▀▀░▀▀▀░░▀░░▀▀░░▀░▀░▀░▀░░░░▀░░░░▀▀░░▀░▀░▀░▀░▀▀▀│ -;; │░Created░By░Aditya░Shakya░@adi1090x░░░░░░░░░░░░░░░░░│ -;; └────────────────────────────────────────────────────┘ - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -[bar] -fill = 絛 -empty = 絛 -indicator = 雷 -; Nerd font :   ,  ⏽,  樂 籠 錄 , 雷 絛 - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -[module/volume] -type = internal/alsa - -; Soundcard to be used -; Usually in the format hw:# where # is the card number -; You can find the different card numbers in `/proc/asound/cards` -master-soundcard = default -speaker-soundcard = default -headphone-soundcard = default - -; Name of the master, speaker and headphone mixers -; Use the following command to list available mixer controls: -; $ amixer scontrols | sed -nr "s/.*'([[:alnum:]]+)'.*/\1/p" -; If master, speaker or headphone-soundcard isn't the default, -; use `amixer -c # scontrols` instead where # is the number -; of the master, speaker or headphone soundcard respectively -; -; Default: Master -master-mixer = Master - -; Optionally define speaker and headphone mixers -; Default: none -;;speaker-mixer = Speaker -; Default: none -;;headphone-mixer = Headphone - -; NOTE: This is required if headphone_mixer is defined -; Use the following command to list available device controls -; $ amixer controls | sed -r "/CARD/\!d; s/.*=([0-9]+).*name='([^']+)'.*/printf '%3.0f: %s\n' '\1' '\2'/e" | sort -; You may also need to use `amixer -c # controls` as above for the mixer names -; Default: none -;;headphone-id = 9 - -; Use volume mapping (similar to amixer -M and alsamixer), where the increase in volume is linear to the ear -; Default: false -;;mapped = true - -; Interval for volume increase/decrease (in percent points) -; Default: 5 -interval = 5 - -; Available tags: -; (default) -; -; -format-volume = -format-volume-background = ${color.shade6} -format-volume-padding = 2 - -; Available tags: -; (default) -; -; -format-muted = -format-muted-prefix = 婢 -format-muted-background = ${color.shade6} -format-muted-padding = 2 - -; Available tokens: -; %percentage% (default) -label-volume = %percentage%% - -; Available tokens: -; %percentage% (default -label-muted = " Muted" -label-muted-foreground = ${color.foreground} - -; Only applies if is used -ramp-volume-0 = 奄 -ramp-volume-1 = 奔 -ramp-volume-2 = 墳 - -; Only applies if is used -bar-volume-width = 10 -bar-volume-gradient = false - -bar-volume-indicator = ${bar.indicator} -bar-volume-indicator-foreground = ${color.foreground} - -bar-volume-fill = ${bar.fill} -bar-volume-foreground-0 = ${color.foreground} -bar-volume-foreground-1 = ${color.foreground} -bar-volume-foreground-2 = ${color.foreground} - -bar-volume-empty = ${bar.empty} -bar-volume-empty-foreground = ${color.foreground} - -; If defined, it will replace when -; headphones are plugged in to `headphone_control_numid` -; If undefined, will be used for both -; Only applies if is used -ramp-headphones-0 =  - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -[module/brightness] -;type = internal/xbacklight -type = internal/backlight - -; Use the following command to list available cards: -; $ ls -1 /sys/class/backlight/ -;card = intel_backlight -card = amdgpu_bl0 - -; Available tags: -;