大改造ビフォー・アフター

Nanamiiiii · Feb 7, 2024 · 89a9a89 · 89a9a89
1 parent af7ce79
commit 89a9a89
Show file tree

Hide file tree

Showing 16 changed files with 417 additions and 2,898 deletions.
diff --git 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,39 +92,39 @@ button:hover {
 }
 
 .userbutton:hover {
-    background: rgba(20, 0, 0, 0.2);
+    background: rgba(20, 0, 0, 0.3);
 }
 
 .userbuttonlabel:hover {
     color: #111;
 }
 
 button.buttonState1 {
-    background: rgba(20,0,0,0.5);
+    background: rgba(20,0,0,0.6);
 }
 
 .userbuttonlabel.buttonState1 {
     color: #fff;
 }
 
 button.buttonState1:hover {
-    background: rgba(20,0,0, 0.4);
+    background: rgba(20,0,0, 0.5);
 }
 
 .userbuttonlabel.buttonState1:hover {
     color: #111;
 }
 
 button.buttonState2 {
-    background: rgba(255,255,255,0.3);
+    background: rgba(255,255,255,0.4);
 }
 
 .userbuttonlabel.buttonState2 {
     color: #111;
 }
 
 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
@@ -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
@@ -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
@@ -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
@@ -14,13 +14,13 @@ return {
         end,
     },
     { 'nvim-tree/nvim-web-devicons', lazy = true },
-    {
-        'Shougo/deol.nvim',
-        keys = {
-            { "<C-o>", ":<C-u>Deol -toggle -split=floating<CR>", desc = "deol", silent = true },
-            { "<ESC>", [[<C-\><C-n>]], mode = "t", silent = true },
-        },
-    },
+    --{
+    --    'Shougo/deol.nvim',
+    --    keys = {
+    --        { "<C-o>", ":<C-u>Deol -toggle -split=floating<CR>", desc = "deol", silent = true },
+    --        { "<ESC>", [[<C-\><C-n>]], 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 = {
+            { "<C-o>", '<CMD>lua require("FTerm").toggle()<CR>', desc = "fterm", mode = "n", silent = true },
+            { "<C-o>", '<C-\\><C-n><CMD>lua require("FTerm").toggle()<CR>', desc = "fterm", mode = "t", silent = true },
+        },
+    }
 }
 
diff --git a/picom/picom.conf b/picom/picom.conf
@@ -8,102 +8,71 @@ 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;
 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; }
 }
+