many new themes

8 files changed, 221 insertions, 30 deletions

diff --git a/bin/.local/bin/scripts/load-theme-wallpaper b/bin/.local/bin/scripts/load-theme-wallpaper
index c31fbfb..228ee97 100755
--- a/bin/.local/bin/scripts/load-theme-wallpaper
+++ b/bin/.local/bin/scripts/load-theme-wallpaper
@@ -3,9 +3,9 @@
 # Clean wallpaper cache file
 sed -i '/feh/d' $HOME/.cache/wallpaper
 
-search_string=$(echo -e "vivendi\noperandi\noperandi-tinted\nelea-light\nelea-dark\nnight\nautumn" | dmenu -p 'Select theme for search: ')
+search_string=$(echo -e "vivendi\noperandi\noperandi-tinted\nelea-light\ncyprus\ncherie\nelea-dark\nnight\nmaris-dark\nmaris-light\nautumn" | dmenu -p 'Select theme for search: ')
 
-selected_wallpaper=$(find ~/Pictures/wall_test -type f -name "*[[]${search_string}*[]]*" -exec nsxiv -t -o {} +)
+selected_wallpaper=$(find ~/Pictures/wallpaper -type f -name "*[[]${search_string}*[]]*" -exec nsxiv -t -o {} +)
 
 # Options for display modes
 OPTIONS="Tiled\nZoom Filled\nCentered\nMax"
diff --git a/fvwm/.fvwm/config b/fvwm/.fvwm/config
index f2b5728..5af663a 100644
--- a/fvwm/.fvwm/config
+++ b/fvwm/.fvwm/config
@@ -190,15 +190,16 @@ AddToFunc TileBottomRight
 + I ThisWindow (!Shaded, !Iconic) Maximize 50 50
 + I ThisWindow (Maximized, !Shaded, !Iconic) Move -0 -0
 
-DestroyFunc ChangeThemeColorset
-AddToFunc ChangeThemeColorset
+DestroyFunc ChangeTheme
+AddToFunc ChangeTheme
 + I Read $[themedir]/$0.sys
 + I Exec exec xrdb -load ~/Xresources.$1
++ I Exec exec echo "emacsclient -e \"$2\"" >> /tmp/fvwm_theme.log
 
 # To change the theme, you can call the function like this:
-# ChangeThemeColorset theme_name Xresources_file_name
+# ChangeTheme theme_name Xresources_file_name
 # For example:
-# ChangeThemeColorset "dark_theme" "dark_theme.Xresources"
+# ChangeTheme "dark_theme" "dark_theme.Xresources"
 
 
 #############
@@ -278,7 +279,8 @@ Style * BorderColorset 3, HilightBorderColorset 4
 # Disable Icons from appearing on desktop.
 # Comment this out or use Style * Icon to get the icons back.
 Style * Icon
-Style * IconBox 990x150-20-10, IconGrid 234 134, IconFill right bottom
+# Style * IconBox 990x150-20-10, IconGrid 234 134, IconFill right bottom
+Style * IconBox 64x300-0+0
 
 # Window Specific Styles
 Style LeftPanel !Title, !Borders, !Handles, Sticky, \
@@ -343,9 +345,7 @@ AddToMenu   MenuFvwmRoot "Fvwm Menu" Title
 + "&Wallpapers%Folder2-24x24.png%" Popup MenuWallpaper
 + "Th&emes%Gunsen-24x24.png%" Popup MenuThemes
 + "" Nop
-+ "Re&fresh%Futon (bed)-24x24.png%" Refresh
-+ "&Restart%Futon (bed)-24x24.png%" Restart
-+ "&Quit%Futon (bed)-24x24.png%" Module FvwmScript FvwmScript-ConfirmQuit
++ "&Power%Futon (bed)-24x24.png%" Popup MenuPower
 
 # Programs Menu
 #
@@ -371,21 +371,32 @@ AddToMenu MenuWallpaper "Wallpaper" Title
 
 DestroyMenu MenuThemes
 AddToMenu MenuThemes "Themes" Title
-+ "Vivendi" ChangeThemeColorset 'modus-vivendi' 'vivendi'
-+ "Operandi Tinted" ChangeThemeColorset 'operandi-tinted' 'operandi-tinted'
-+ "Ef Autumn" ChangeThemeColorset 'ef-autumn' 'autumn'
-+ "Ef Elea Light" ChangeThemeColorset 'ef-elea-light' 'elea-light'
-+ "Ef Night" ChangeThemeColorset 'ef-night' 'night'
-+ "" ChangeThemeColorset 'vivendi' 'vivendi' 'vivendi'
++ "&Vivendi" ChangeTheme 'modus-vivendi' 'vivendi' "(modus-themes-select 'modus-vivendi)"
++ "&Operandi Tinted" ChangeTheme 'operandi-tinted' 'operandi-tinted' "(modus-themes-select 'modus-operandi-tinted)"
++ "Ef &Autumn" ChangeTheme 'ef-autumn' 'autumn' "(ef-themes-select 'ef-autumn)"
++ "Ef &Elea Light" ChangeTheme 'ef-elea-light' 'elea-light' "(ef-themes-select 'ef-elea-light)"
++ "Ef &Cyprus" ChangeTheme 'ef-cyprus' 'cyprus' "(ef-themes-select 'ef-cyprus)"
++ "Ef &Night" ChangeTheme 'ef-night' 'night' "(ef-themes-select 'ef-night)"
++ "Ef &Maris Dark" ChangeTheme 'ef-maris-dark' 'maris-dark' "(ef-themes-select 'ef-maris-dark)"
++ "Ef &Cherie" ChangeTheme 'ef-cherie' 'cherie' "(ef-themes-select 'ef-cherie)"
++ "" ChangeTheme 'vivendi' 'vivendi' "(modus-themes-select 'modus-vivendi)"
 
 DestroyMenu MenuEmacsApps
-AddToMenu MenuEmacsApps
-Test (x emacs) + "Music" Exec exec emacsclient -c -e '(emms)'
-Test (x emacs) + "RSS" Exec exec emacsclient -c -e '(elfeed)'
-Test (x emacs) + "Email" Exec exec emacsclient -c -e '(notmuch-hello)'
+AddToMenu MenuEmacsApps "Media" Title
+Test (x emacs) + "&Agenda" Exec exec emacsclient -c -e '(bard/default-agenda)'
+Test (x emacs) + "&Music" Exec exec emacsclient -c -e '(emms)'
+Test (x emacs) + "&RSS" Exec exec emacsclient -c -e '(elfeed)'
+Test (x emacs) + "&Email" Exec exec emacsclient -c -e '(notmuch-hello)'
+Test (x emacs) + "&Timers" Exec exec emacsclient -c -e '(tmr-tabulated-view)'
+
+DestroyMenu MenuPower
+AddToMenu MenuPower
++ "Re&fresh" Refresh
++ "&Restart" Restart
++ "&Quit" Module FvwmScript FvwmScript-ConfirmQuit
 
 DestroyMenu MenuSettings
-AddToMenu MenuSettings
+AddToMenu MenuSettings "Settings" Title
 Test (x nmtui) + "Network" Exec exec st -e nmtui
 Test (x arandr) + "Display" Exec exec arandr
 Test (x btop) + "System" Exec exec st -e btop
@@ -778,35 +789,35 @@ DestroyModuleConfig LeftPanel:*
 #     Top, Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
 # Test (!x stalonetray) PipeRead 'echo "*LeftPanel: (120x20)),\
 #     Top, Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
-*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 9,  \
+*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 15,  \
             Icon "Chouchin Reinensai.png", \
             ActiveTitle "Net", \
             Action (Mouse 1) Exec exec firefox-bin, \
             Action (Mouse 2) Exec exec discord, \
             Action (Mouse 3) Exec exec librewolf-bin)
 
-*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 9, \
+*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 15, \
             Icon Bonsai.png, \
             ActiveTitle "Files", \
             Action (Mouse 1) Exec exec emacsclient -c -e "(dired \"~/\")" -a 'emacs', \
             Action (Mouse 3) Exec exec pcmanfm )
 
-*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 9, \
+*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 15, \
             ActiveTitle "Term", \
             Icon "Yunomi (tea cup).png", \
             Action (Mouse 1) Exec "St" exec st)
 
-*LeftPanel: ( 120x30, Frame 1, Colorset 15,  PressColorset 9, \
+*LeftPanel: ( 120x30, Frame 1, Colorset 15,  PressColorset 15, \
             ActiveTitle "Editor", \
             Icon Shodou.png, \
-            Action (Mouse 1) Exec "GNU Emacs" exec emacsclient -c -a 'emacs')
+            Action (Mouse 1) Exec exec emacsclient -c -a 'emacs')
 
-*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 9, \
+*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 15, \
             ActiveTitle "Media", \
             Icon Shamisen.png, \
             Action (Mouse 1) Exec exec emacsclient -c -e '(emms)' -a 'emacs')
 
-*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 9, \
+*LeftPanel: ( 120x30, Frame 1, Colorset 15, PressColorset 15, \
             ActiveTitle "Utilities", \
             Icon "Ishidourou.png", \
             Action (Mouse 1) Exec "Network" exec st -e nmtui, \
@@ -814,12 +825,12 @@ DestroyModuleConfig LeftPanel:*
 
 *LeftPanel: ( 120x30, Frame 1, Icon "Tourist guidebook.png", \
             ActiveTitle "Identify ...", \
-            Colorset 15,  PressColorset 9,\
+            Colorset 15,  PressColorset 15,\
             Action Module FvwmIdent )
 
 *LeftPanel: ( 120x30, Frame 1, ActiveTitle "Lock", \
             Colorset 15, \
-            PressColorset 9, \
+            PressColorset 15, \
             Icon "Shoji2(paper sliding-door).png", \
             Action (Mouse 1) Exec exec slock)
 
diff --git a/fvwm/.fvwm/themes/ef-cherie.sys b/fvwm/.fvwm/themes/ef-cherie.sys
new file mode 100644
index 0000000..9cf004a
--- /dev/null
+++ b/fvwm/.fvwm/themes/ef-cherie.sys
@@ -0,0 +1,16 @@
+Colorset 0  fg #d3cfcf, bg #190a0f, hi, sh, Plain, NoShape
+Colorset 1  fg #808898, bg #291f26, hi, sh, Plain, NoShape
+Colorset 2  fg #ffcfdf, bg #190a0f, hi, sh, Plain, NoShape
+Colorset 3  fg #808898, bg #291f26, hi #291f26, sh #291f26, Plain, NoShape
+Colorset 4  fg #ffcfdf, bg #771a4f, hi #771a4f, sh #771a4f, Plain, NoShape
+Colorset 5  fg #d3cfcf, bg #190a0f, hi, sh, Plain, NoShape
+Colorset 6  fg #d3cfcf, bg #771a4f, hi, sh, Plain, NoShape
+Colorset 7  fg #d3cfcf, bg #d3cfcf, hi, sh, Plain, NoShape
+Colorset 8  fg #771a4f, bg #ffc4df, hi, sh, Plain, NoShape
+Colorset 10 fg #d3cfcf, bg #190a0f, hi, sh, Plain, NoShape
+Colorset 11 fg #d3cfcf, bg #771a4f, hi #d3cfcf, sh #d3cfcf, Plain, NoShape
+Colorset 12 fg #d3cfcf, bg #684d54, hi, sh, Plain, NoShape
+Colorset 13 fg #d3cfcf, bg #684d54, hi, sh, Plain, NoShape
+Colorset 14 fg #d3cfcf, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
+# dock buttons
+Colorset 15 fg #d3cfcf, bg #190a0f, hi, sh, Plain, Noshape
\ No newline at end of file
diff --git a/fvwm/.fvwm/themes/ef-cyprus.sys b/fvwm/.fvwm/themes/ef-cyprus.sys
new file mode 100644
index 0000000..7653d7f
--- /dev/null
+++ b/fvwm/.fvwm/themes/ef-cyprus.sys
@@ -0,0 +1,16 @@
+Colorset 0  fg #242521, bg #fcf7ef, hi, sh, Plain, NoShape
+Colorset 1  fg #59786f, bg #f0ece0, hi, sh, Plain, NoShape
+Colorset 2  fg #242521, bg #fcf7ef, hi, sh, Plain, NoShape
+Colorset 3  fg #fcf7ef, bg #142810, hi #142810, sh #142810, Plain, NoShape
+Colorset 4  fg #fcf7ef, bg #c0df6f, hi #c0df6f, sh #c0df6f, Plain, NoShape
+Colorset 5  fg #242521, bg #fcf7ef, hi, sh, Plain, NoShape
+Colorset 6  fg #242521, bg #c0df6f, hi, sh, Plain, NoShape
+Colorset 7  fg #242521, bg #242521, hi, sh, Plain, NoShape
+Colorset 8  fg #fcf7ef, bg #242521, hi, sh, Plain, NoShape
+Colorset 10 fg #242521, bg #fcf7ef, hi, sh, Plain, NoShape
+Colorset 11 fg #242521, bg #c0df6f, hi #242521, sh #242521, Plain, NoShape
+Colorset 12 fg #242521, bg #efc26f, hi, sh, Plain, NoShape
+Colorset 13 fg #242521, bg #efc26f, hi, sh, Plain, NoShape
+Colorset 14 fg #242521, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
+# dock buttons
+Colorset 15 fg #242521, bg #fcf7ef, hi, sh, Plain, Noshape
\ No newline at end of file
diff --git a/fvwm/.fvwm/themes/ef-maris-dark.sys b/fvwm/.fvwm/themes/ef-maris-dark.sys
new file mode 100644
index 0000000..2f7143c
--- /dev/null
+++ b/fvwm/.fvwm/themes/ef-maris-dark.sys
@@ -0,0 +1,16 @@
+Colorset 0  fg #eaedef, bg #131c2b, hi, sh, Plain, NoShape
+Colorset 1  fg #969faf, bg #2a3644, hi, sh, Plain, NoShape
+Colorset 2  fg #eaedef, bg #131c2b, hi, sh, Plain, NoShape
+Colorset 3  fg #131c2b, bg #969faf, hi #969faf, sh #969faf, Plain, NoShape
+Colorset 4  fg #131c2b, bg #2f527b, hi #2f527b, sh #2f527b, Plain, NoShape
+Colorset 5  fg #eaedef, bg #131c2b, hi, sh, Plain, NoShape
+Colorset 6  fg #eaedef, bg #2f527b, hi, sh, Plain, NoShape
+Colorset 7  fg #eaedef, bg #eaedef, hi, sh, Plain, NoShape
+Colorset 8  fg #131c2b, bg #eaedef, hi, sh, Plain, NoShape
+Colorset 10 fg #eaedef, bg #131c2b, hi, sh, Plain, NoShape
+Colorset 11 fg #eaedef, bg #2f527b, hi #eaedef, sh #eaedef, Plain, NoShape
+Colorset 12 fg #eaedef, bg #684d54, hi, sh, Plain, NoShape
+Colorset 13 fg #eaedef, bg #684d54, hi, sh, Plain, NoShape
+Colorset 14 fg #eaedef, bg #302a3a, hi #aaaaaa, sh #999999, Plain, NoShape
+# dock buttons
+Colorset 15 fg #eaedef, bg #131c2b, hi, sh, Plain, Noshape
\ No newline at end of file
diff --git a/xorg/Xresources.cherie b/xorg/Xresources.cherie
new file mode 100644
index 0000000..078da85
--- /dev/null
+++ b/xorg/Xresources.cherie
@@ -0,0 +1,44 @@
+! Ef Cherie Xresources theme
+*.foreground:      #d3cfcf
+*.background:      #190a0f
+URxvt.background:  [90]#190a0f
+*.cursorColor:     #d3cfcf
+! black
+*.color0:       #190a0f
+*.color8:       #1a202b
+! red
+*.color1:       #ff7359
+*.color9:       #ff7359
+! green
+*.color2:       #60b444
+*.color10:      #60b444
+! yellow
+*.color3:       #e5b76f
+*.color11:      #e5b76f
+! blue
+*.color4:       #8fa5f6
+*.color12:      #8fa5f6
+! magenta
+*.color5:       #ef80bf
+*.color13:      #ef80bf
+! cyan
+*.color6:       #8fbaef
+*.color14:      #8fbaef
+! white
+*.color7:       #d3cfcf
+*.color15:      #d3cfcf
+
+st.font: Iosevka Comfy-14
+
+dmenu.background: #190a0f
+dmenu.foreground: #d3cfcf
+dmenu.selbackground: #771a4f
+dmenu.selforeground: #d3cfcf
+dmenu.font: Iosevka Comfy-14
+
+Nsxiv.window.background: #190a0f
+Nsxiv.window.foreground: #d3cfcf
+Nsxiv.mark.foreground: #d3cfcf
+Nsxiv.bar.background: #771a4f
+Nsxiv.bar.foreground: #d3cfcf
+Nsxiv.bar.font: IosevkaComfy-16
diff --git a/xorg/Xresources.cyprus b/xorg/Xresources.cyprus
new file mode 100644
index 0000000..d9768ab
--- /dev/null
+++ b/xorg/Xresources.cyprus
@@ -0,0 +1,44 @@
+! Ef Cyprus Xresources theme
+*.foreground:      #242521
+*.background:      #fcf7ef
+URxvt.background:  [90]#fcf7ef
+*.cursorColor:     #242521
+! black
+*.color0:       #242521
+*.color8:       #e5e3d8
+! red
+*.color1:       #9f0d0f
+*.color9:       #9f0d0f
+! green
+*.color2:       #006f00
+*.color10:      #006f00
+! yellow
+*.color3:       #a7601f
+*.color11:      #a7601f
+! blue
+*.color4:       #375cc6
+*.color12:      #375cc6
+! magenta
+*.color5:       #9a456f
+*.color13:      #9a456f
+! cyan
+*.color6:       #1f70ad
+*.color14:      #1f70ad
+! white
+*.color7:       #fcf7ef
+*.color15:      #fcf7ef
+
+st.font: Iosevka Comfy-14
+
+dmenu.background: #fcf7ef
+dmenu.foreground: #242521
+dmenu.selbackground: #c0df6f
+dmenu.selforeground: #242521
+dmenu.font: Iosevka Comfy-14
+
+Nsxiv.window.background: #fcf7ef
+Nsxiv.window.foreground: #242521
+Nsxiv.mark.foreground: #242521
+Nsxiv.bar.background: #c0df6f
+Nsxiv.bar.foreground: #221321
+Nsxiv.bar.font: IosevkaComfy-16
diff --git a/xorg/Xresources.maris-dark b/xorg/Xresources.maris-dark
new file mode 100644
index 0000000..1e9442b
--- /dev/null
+++ b/xorg/Xresources.maris-dark
@@ -0,0 +1,44 @@
+! Ef Elea Light Xresources theme
+*.foreground:      #eaedef
+*.background:      #131c2b
+URxvt.background:  [90]#131c2b
+*.cursorColor:     #eaedef
+! black
+*.color0:       #131c2b
+*.color8:       #2a3644
+! red
+*.color1:       #ff6f6f
+*.color9:       #ff6f6f
+! green
+*.color2:       #31bf4f
+*.color10:      #31bf4f
+! yellow
+*.color3:       #d0d24f
+*.color11:      #d0d24f
+! blue
+*.color4:       #57b0ff
+*.color12:      #57b0ff
+! magenta
+*.color5:       #f59acf
+*.color13:      #f59acf
+! cyan
+*.color6:       #2fd0db
+*.color14:      #2fd0db
+! white
+*.color7:       #eaedef
+*.color15:      #eaedef
+
+st.font: Iosevka Comfy-14
+
+dmenu.background: #131c2b
+dmenu.foreground: #eaedef
+dmenu.selbackground: #2f527b
+dmenu.selforeground: #eaedef
+dmenu.font: Iosevka Comfy-14
+
+Nsxiv.window.background: #131c2b
+Nsxiv.window.foreground: #eaedef
+Nsxiv.mark.foreground: #eaedef
+Nsxiv.bar.background: #2f527b
+Nsxiv.bar.foreground: #eaedef
+Nsxiv.bar.font: IosevkaComfy-16