summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--home/config/gtk/gtk-2.0/gtkfilechooser.ini11
-rw-r--r--home/config/gtk/gtk-2.0/settings19
-rw-r--r--home/config/gtk/gtk-3.0/bookmarks6
-rw-r--r--home/config/gtk/gtk-3.0/colors.css84
-rw-r--r--home/config/gtk/gtk-3.0/gtk.css1
-rw-r--r--home/config/gtk/gtk-3.0/settings.ini6
-rw-r--r--home/config/gtk/gtk-4.0/colors.css84
-rw-r--r--home/config/gtk/gtk-4.0/gtk.css1
-rw-r--r--home/config/gtk/gtk-4.0/settings.ini6
-rw-r--r--home/config/hypr/config.d/plugins.conf2
-rw-r--r--home/config/hypr/config.d/theme.conf22
-rw-r--r--home/config/zsh/zprofile2
-rw-r--r--home/home.scm4
-rw-r--r--modules/freya/packages/gnome-xyz.scm27
14 files changed, 67 insertions, 208 deletions
diff --git a/home/config/gtk/gtk-2.0/gtkfilechooser.ini b/home/config/gtk/gtk-2.0/gtkfilechooser.ini
deleted file mode 100644
index e1aabf7..0000000
--- a/home/config/gtk/gtk-2.0/gtkfilechooser.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Filechooser Settings]
-LocationMode=path-bar
-ShowHidden=false
-ShowSizeColumn=true
-GeometryX=805
-GeometryY=486
-GeometryWidth=948
-GeometryHeight=656
-SortColumn=name
-SortOrder=ascending
-StartupMode=recent
diff --git a/home/config/gtk/gtk-2.0/settings b/home/config/gtk/gtk-2.0/settings
new file mode 100644
index 0000000..00d6a1e
--- /dev/null
+++ b/home/config/gtk/gtk-2.0/settings
@@ -0,0 +1,19 @@
+#[Settings]
+#gtk-application-prefer-dark-theme=true
+#gtk-enable-animations=true
+gtk-theme-name=Orchis-Teal-Dark
+gtk-icon-theme-name=Adwaita
+gtk-cursor-theme-name=Adwaita
+gtk-cursor-theme-size=24
+#gtk-decoration-layout=icon:minimize,maximize,close
+gtk-font-name=Noto Sans, 10
+gtk-primary-button-warps-slider=true
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=0
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintfull
+gtk-xft-rgba=rgb
+#gtk-xft-dpi=122880
diff --git a/home/config/gtk/gtk-3.0/bookmarks b/home/config/gtk/gtk-3.0/bookmarks
deleted file mode 100644
index e2576aa..0000000
--- a/home/config/gtk/gtk-3.0/bookmarks
+++ /dev/null
@@ -1,6 +0,0 @@
-file:///home/freya/.config
-file:///home/freya/downloads
-file:///home/freya/documents
-file:///home/tylerm/code
-file:///home/tylerm/sync
-file:///home/freya/sync/nextcloud
diff --git a/home/config/gtk/gtk-3.0/colors.css b/home/config/gtk/gtk-3.0/colors.css
deleted file mode 100644
index 821726e..0000000
--- a/home/config/gtk/gtk-3.0/colors.css
+++ /dev/null
@@ -1,84 +0,0 @@
-@define-color borders_breeze #5f6265;
-@define-color content_view_bg_breeze #1b1e20;
-@define-color error_color_backdrop_breeze #da4453;
-@define-color error_color_breeze #da4453;
-@define-color error_color_insensitive_backdrop_breeze #592930;
-@define-color error_color_insensitive_breeze #592930;
-@define-color insensitive_base_color_breeze #1a1d1f;
-@define-color insensitive_base_fg_color_breeze #656768;
-@define-color insensitive_bg_color_breeze #282c30;
-@define-color insensitive_borders_breeze #3a3d41;
-@define-color insensitive_fg_color_breeze #6e7173;
-@define-color insensitive_selected_bg_color_breeze #282c30;
-@define-color insensitive_selected_fg_color_breeze #6e7173;
-@define-color insensitive_unfocused_bg_color_breeze #282c30;
-@define-color insensitive_unfocused_fg_color_breeze #6e7173;
-@define-color insensitive_unfocused_selected_bg_color_breeze #282c30;
-@define-color insensitive_unfocused_selected_fg_color_breeze #6e7173;
-@define-color link_color_breeze #1d99f3;
-@define-color link_visited_color_breeze #9b59b6;
-@define-color success_color_backdrop_breeze #27ae60;
-@define-color success_color_breeze #27ae60;
-@define-color success_color_insensitive_backdrop_breeze #1e4d34;
-@define-color success_color_insensitive_breeze #1e4d34;
-@define-color theme_base_color_breeze #1b1e20;
-@define-color theme_bg_color_breeze #2a2e32;
-@define-color theme_button_background_backdrop_breeze #31363b;
-@define-color theme_button_background_backdrop_insensitive_breeze #2f3338;
-@define-color theme_button_background_insensitive_breeze #2f3338;
-@define-color theme_button_background_normal_breeze #31363b;
-@define-color theme_button_decoration_focus_backdrop_breeze #3daee9;
-@define-color theme_button_decoration_focus_backdrop_insensitive_breeze #335c72;
-@define-color theme_button_decoration_focus_breeze #3daee9;
-@define-color theme_button_decoration_focus_insensitive_breeze #335c72;
-@define-color theme_button_decoration_hover_backdrop_breeze #3daee9;
-@define-color theme_button_decoration_hover_backdrop_insensitive_breeze #335c72;
-@define-color theme_button_decoration_hover_breeze #3daee9;
-@define-color theme_button_decoration_hover_insensitive_breeze #335c72;
-@define-color theme_button_foreground_active_backdrop_breeze #fcfcfc;
-@define-color theme_button_foreground_active_backdrop_insensitive_breeze #6e7173;
-@define-color theme_button_foreground_active_breeze #fcfcfc;
-@define-color theme_button_foreground_active_insensitive_breeze #6e7173;
-@define-color theme_button_foreground_backdrop_breeze #fcfcfc;
-@define-color theme_button_foreground_backdrop_insensitive_breeze #727679;
-@define-color theme_button_foreground_insensitive_breeze #727679;
-@define-color theme_button_foreground_normal_breeze #fcfcfc;
-@define-color theme_fg_color_breeze #fcfcfc;
-@define-color theme_header_background_backdrop_breeze #2a2e32;
-@define-color theme_header_background_breeze #31363b;
-@define-color theme_header_background_light_breeze #2a2e32;
-@define-color theme_header_foreground_backdrop_breeze #fcfcfc;
-@define-color theme_header_foreground_breeze #fcfcfc;
-@define-color theme_header_foreground_insensitive_backdrop_breeze #fcfcfc;
-@define-color theme_header_foreground_insensitive_breeze #fcfcfc;
-@define-color theme_hovering_selected_bg_color_breeze #3daee9;
-@define-color theme_selected_bg_color_breeze #3daee9;
-@define-color theme_selected_fg_color_breeze #fcfcfc;
-@define-color theme_text_color_breeze #fcfcfc;
-@define-color theme_titlebar_background_backdrop_breeze #2a2e32;
-@define-color theme_titlebar_background_breeze #31363b;
-@define-color theme_titlebar_background_light_breeze #2a2e32;
-@define-color theme_titlebar_foreground_backdrop_breeze #fcfcfc;
-@define-color theme_titlebar_foreground_breeze #fcfcfc;
-@define-color theme_titlebar_foreground_insensitive_backdrop_breeze #fcfcfc;
-@define-color theme_titlebar_foreground_insensitive_breeze #fcfcfc;
-@define-color theme_unfocused_base_color_breeze #1b1e20;
-@define-color theme_unfocused_bg_color_breeze #2a2e32;
-@define-color theme_unfocused_fg_color_breeze #fcfcfc;
-@define-color theme_unfocused_selected_bg_color_alt_breeze #1f485e;
-@define-color theme_unfocused_selected_bg_color_breeze #1f485e;
-@define-color theme_unfocused_selected_fg_color_breeze #fcfcfc;
-@define-color theme_unfocused_text_color_breeze #fcfcfc;
-@define-color theme_unfocused_view_bg_color_breeze #1a1d1f;
-@define-color theme_unfocused_view_text_color_breeze #656768;
-@define-color theme_view_active_decoration_color_breeze #3daee9;
-@define-color theme_view_hover_decoration_color_breeze #3daee9;
-@define-color tooltip_background_breeze #31363b;
-@define-color tooltip_border_breeze #64686b;
-@define-color tooltip_text_breeze #fcfcfc;
-@define-color unfocused_borders_breeze #5f6265;
-@define-color unfocused_insensitive_borders_breeze #3a3d41;
-@define-color warning_color_backdrop_breeze #f67400;
-@define-color warning_color_breeze #f67400;
-@define-color warning_color_insensitive_backdrop_breeze #633914;
-@define-color warning_color_insensitive_breeze #633914;
diff --git a/home/config/gtk/gtk-3.0/gtk.css b/home/config/gtk/gtk-3.0/gtk.css
deleted file mode 100644
index c9763f7..0000000
--- a/home/config/gtk/gtk-3.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import 'colors.css'; \ No newline at end of file
diff --git a/home/config/gtk/gtk-3.0/settings.ini b/home/config/gtk/gtk-3.0/settings.ini
index 5760a02..4ad5cd2 100644
--- a/home/config/gtk/gtk-3.0/settings.ini
+++ b/home/config/gtk/gtk-3.0/settings.ini
@@ -1,9 +1,9 @@
[Settings]
gtk-application-prefer-dark-theme=true
gtk-enable-animations=true
-gtk-theme-name=Mint-Y-Dark-Teal
-gtk-icon-theme-name=Mint-Y-Teal
-gtk-cursor-theme-name=breeze_cursors
+gtk-theme-name=Orchis-Teal-Dark
+gtk-icon-theme-name=Adwaita
+gtk-cursor-theme-name=Adwaita
gtk-cursor-theme-size=24
gtk-decoration-layout=icon:minimize,maximize,close
gtk-font-name=Noto Sans, 10
diff --git a/home/config/gtk/gtk-4.0/colors.css b/home/config/gtk/gtk-4.0/colors.css
deleted file mode 100644
index 821726e..0000000
--- a/home/config/gtk/gtk-4.0/colors.css
+++ /dev/null
@@ -1,84 +0,0 @@
-@define-color borders_breeze #5f6265;
-@define-color content_view_bg_breeze #1b1e20;
-@define-color error_color_backdrop_breeze #da4453;
-@define-color error_color_breeze #da4453;
-@define-color error_color_insensitive_backdrop_breeze #592930;
-@define-color error_color_insensitive_breeze #592930;
-@define-color insensitive_base_color_breeze #1a1d1f;
-@define-color insensitive_base_fg_color_breeze #656768;
-@define-color insensitive_bg_color_breeze #282c30;
-@define-color insensitive_borders_breeze #3a3d41;
-@define-color insensitive_fg_color_breeze #6e7173;
-@define-color insensitive_selected_bg_color_breeze #282c30;
-@define-color insensitive_selected_fg_color_breeze #6e7173;
-@define-color insensitive_unfocused_bg_color_breeze #282c30;
-@define-color insensitive_unfocused_fg_color_breeze #6e7173;
-@define-color insensitive_unfocused_selected_bg_color_breeze #282c30;
-@define-color insensitive_unfocused_selected_fg_color_breeze #6e7173;
-@define-color link_color_breeze #1d99f3;
-@define-color link_visited_color_breeze #9b59b6;
-@define-color success_color_backdrop_breeze #27ae60;
-@define-color success_color_breeze #27ae60;
-@define-color success_color_insensitive_backdrop_breeze #1e4d34;
-@define-color success_color_insensitive_breeze #1e4d34;
-@define-color theme_base_color_breeze #1b1e20;
-@define-color theme_bg_color_breeze #2a2e32;
-@define-color theme_button_background_backdrop_breeze #31363b;
-@define-color theme_button_background_backdrop_insensitive_breeze #2f3338;
-@define-color theme_button_background_insensitive_breeze #2f3338;
-@define-color theme_button_background_normal_breeze #31363b;
-@define-color theme_button_decoration_focus_backdrop_breeze #3daee9;
-@define-color theme_button_decoration_focus_backdrop_insensitive_breeze #335c72;
-@define-color theme_button_decoration_focus_breeze #3daee9;
-@define-color theme_button_decoration_focus_insensitive_breeze #335c72;
-@define-color theme_button_decoration_hover_backdrop_breeze #3daee9;
-@define-color theme_button_decoration_hover_backdrop_insensitive_breeze #335c72;
-@define-color theme_button_decoration_hover_breeze #3daee9;
-@define-color theme_button_decoration_hover_insensitive_breeze #335c72;
-@define-color theme_button_foreground_active_backdrop_breeze #fcfcfc;
-@define-color theme_button_foreground_active_backdrop_insensitive_breeze #6e7173;
-@define-color theme_button_foreground_active_breeze #fcfcfc;
-@define-color theme_button_foreground_active_insensitive_breeze #6e7173;
-@define-color theme_button_foreground_backdrop_breeze #fcfcfc;
-@define-color theme_button_foreground_backdrop_insensitive_breeze #727679;
-@define-color theme_button_foreground_insensitive_breeze #727679;
-@define-color theme_button_foreground_normal_breeze #fcfcfc;
-@define-color theme_fg_color_breeze #fcfcfc;
-@define-color theme_header_background_backdrop_breeze #2a2e32;
-@define-color theme_header_background_breeze #31363b;
-@define-color theme_header_background_light_breeze #2a2e32;
-@define-color theme_header_foreground_backdrop_breeze #fcfcfc;
-@define-color theme_header_foreground_breeze #fcfcfc;
-@define-color theme_header_foreground_insensitive_backdrop_breeze #fcfcfc;
-@define-color theme_header_foreground_insensitive_breeze #fcfcfc;
-@define-color theme_hovering_selected_bg_color_breeze #3daee9;
-@define-color theme_selected_bg_color_breeze #3daee9;
-@define-color theme_selected_fg_color_breeze #fcfcfc;
-@define-color theme_text_color_breeze #fcfcfc;
-@define-color theme_titlebar_background_backdrop_breeze #2a2e32;
-@define-color theme_titlebar_background_breeze #31363b;
-@define-color theme_titlebar_background_light_breeze #2a2e32;
-@define-color theme_titlebar_foreground_backdrop_breeze #fcfcfc;
-@define-color theme_titlebar_foreground_breeze #fcfcfc;
-@define-color theme_titlebar_foreground_insensitive_backdrop_breeze #fcfcfc;
-@define-color theme_titlebar_foreground_insensitive_breeze #fcfcfc;
-@define-color theme_unfocused_base_color_breeze #1b1e20;
-@define-color theme_unfocused_bg_color_breeze #2a2e32;
-@define-color theme_unfocused_fg_color_breeze #fcfcfc;
-@define-color theme_unfocused_selected_bg_color_alt_breeze #1f485e;
-@define-color theme_unfocused_selected_bg_color_breeze #1f485e;
-@define-color theme_unfocused_selected_fg_color_breeze #fcfcfc;
-@define-color theme_unfocused_text_color_breeze #fcfcfc;
-@define-color theme_unfocused_view_bg_color_breeze #1a1d1f;
-@define-color theme_unfocused_view_text_color_breeze #656768;
-@define-color theme_view_active_decoration_color_breeze #3daee9;
-@define-color theme_view_hover_decoration_color_breeze #3daee9;
-@define-color tooltip_background_breeze #31363b;
-@define-color tooltip_border_breeze #64686b;
-@define-color tooltip_text_breeze #fcfcfc;
-@define-color unfocused_borders_breeze #5f6265;
-@define-color unfocused_insensitive_borders_breeze #3a3d41;
-@define-color warning_color_backdrop_breeze #f67400;
-@define-color warning_color_breeze #f67400;
-@define-color warning_color_insensitive_backdrop_breeze #633914;
-@define-color warning_color_insensitive_breeze #633914;
diff --git a/home/config/gtk/gtk-4.0/gtk.css b/home/config/gtk/gtk-4.0/gtk.css
deleted file mode 100644
index c9763f7..0000000
--- a/home/config/gtk/gtk-4.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import 'colors.css'; \ No newline at end of file
diff --git a/home/config/gtk/gtk-4.0/settings.ini b/home/config/gtk/gtk-4.0/settings.ini
index 06ae2ef..ff3511f 100644
--- a/home/config/gtk/gtk-4.0/settings.ini
+++ b/home/config/gtk/gtk-4.0/settings.ini
@@ -1,9 +1,9 @@
[Settings]
gtk-application-prefer-dark-theme=true
gtk-enable-animations=true
-gtk-theme-name=Mint-Y-Dark-Teal
-gtk-icon-theme-name=Mint-Y-Teal
-gtk-cursor-theme-name=breeze_cursors
+gtk-theme-name=Orchis-Teal-Dark
+gtk-icon-theme-name=Adwaita
+gtk-cursor-theme-name=Adwaita
gtk-cursor-theme-size=24
gtk-decoration-layout=icon:minimize,maximize,close
gtk-font-name=Noto Sans, 10
diff --git a/home/config/hypr/config.d/plugins.conf b/home/config/hypr/config.d/plugins.conf
index 83ce9d0..1d6c18b 100644
--- a/home/config/hypr/config.d/plugins.conf
+++ b/home/config/hypr/config.d/plugins.conf
@@ -1,3 +1,3 @@
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhy3.so
-exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprbars.so
+#exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprbars.so
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprexpo.so
diff --git a/home/config/hypr/config.d/theme.conf b/home/config/hypr/config.d/theme.conf
index 9fb2d0e..5076cfb 100644
--- a/home/config/hypr/config.d/theme.conf
+++ b/home/config/hypr/config.d/theme.conf
@@ -33,17 +33,17 @@ plugin {
}
}
- hyprbars {
- bar_height = 24
- bar_part_of_window = true
- bar_color = $base_color
- col.text = $text_color
- bar_text_size = 9
- bar_text_font = JetBrains Mono Nerd Font Mono Bold
- bar_button_padding = 12
- bar_padding = 10
- bar_precedence_over_border = true
- }
+ #hyprbars {
+ # bar_height = 24
+ # bar_part_of_window = true
+ # bar_color = $base_color
+ # col.text = $text_color
+ # bar_text_size = 9
+ # bar_text_font = JetBrains Mono Nerd Font Mono Bold
+ # bar_button_padding = 12
+ # bar_padding = 10
+ # bar_precedence_over_border = true
+ #}
}
decoration {
diff --git a/home/config/zsh/zprofile b/home/config/zsh/zprofile
index a39a880..4387fab 100644
--- a/home/config/zsh/zprofile
+++ b/home/config/zsh/zprofile
@@ -31,7 +31,7 @@ export LD=$(which gcc)
# ricing
export QT_QPA_PLATFORM_THEME=gtk2
-export GTK_THEME=Mint-Y-Dark-Pink
+export GTK_THEME=Orchis-Teal-Dark
export XCURSOR_THEME=Adwaita
export XCURSOR_SIZE=24
diff --git a/home/home.scm b/home/home.scm
index 749da5b..53c1fe8 100644
--- a/home/home.scm
+++ b/home/home.scm
@@ -45,7 +45,6 @@
; gtk
"wxwidgets"
- "matcha-theme"
; desktop programs
"gnome-keyring"
@@ -126,6 +125,7 @@
; gtk
lavanda-gtk-theme
+ orchis-theme-2024
mint-themes
; shell
@@ -166,7 +166,6 @@
("kitty" ,(local-file "config/kitty" #:recursive? #t))
("ranger" ,(local-file "config/ranger" #:recursive? #t))
("mako" ,(local-file "config/mako" #:recursive? #t))
- ("gtk-2.0" ,(local-file "config/gtk/gtk-2.0" #:recursive? #t))
("gtk-3.0" ,(local-file "config/gtk/gtk-3.0" #:recursive? #t))
("gtk-4.0" ,(local-file "config/gtk/gtk-4.0" #:recursive? #t))
("Trolltech.conf" ,(local-file "config/gtk/Trolltech.conf"))
@@ -182,6 +181,7 @@
(service home-files-service-type
`((".local/share/nvim/site/autoload/plug.vim" ,(file-append vim-plug "/share/vim/plug.vim"))
(".ssh/config" ,(local-file "config/ssh/config"))
+ (".gtkrc-2.0" ,(local-file "config/gtk/gtk-2.0/settings"))
(".local/share/fonts" ,(local-file "local/fonts" #:recursive? #t))
(".local/share/applications" ,(local-file "local/applications" #:recursive? #t))
(".local/share/icons" ,(local-file "local/icons" #:recursive? #t))
diff --git a/modules/freya/packages/gnome-xyz.scm b/modules/freya/packages/gnome-xyz.scm
index a4d8732..c80b761 100644
--- a/modules/freya/packages/gnome-xyz.scm
+++ b/modules/freya/packages/gnome-xyz.scm
@@ -7,12 +7,14 @@
#:use-module (gnu packages web)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gnome-xyz)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix download)
#:use-module (guix build-system trivial)
#:use-module (guix utils))
+
(define-public lavanda-gtk-theme
(let ((commit "44c74ad34d272e07b91f779e62e63b6ef8645655"))
(package
@@ -64,6 +66,7 @@
(description "Lavanda gtk theme for linux desktops")
(license license:gpl3))))
+
(define-public mint-themes
(package
(name "mint-themes")
@@ -118,3 +121,27 @@
(description "A collection of Mint themes.")
(license license:gpl3+)))
+
+(define-public orchis-theme-2024
+ (package
+ (inherit orchis-theme)
+ (name "orchis-theme")
+ (version "2024-05-30")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/vinceliuice/Orchis-theme")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1qjw54wfi8f39cc6l53h2rx9sy3048r4jf21w18xp88ilznnv5qf"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments orchis-theme)
+ ((#:configure-flags flags ''())
+ #~(list "--dest" (string-append
+ (assoc-ref %outputs "out")
+ "/share/themes")
+ "--theme" "all"))))))