mint themes, other fixes

7 files changed, 21 insertions, 12 deletions

diff --git a/home/config/git/gitconfig b/home/config/git/gitconfig
index c7aa4a0..0260067 100644
--- a/home/config/git/gitconfig
+++ b/home/config/git/gitconfig
@@ -3,6 +3,6 @@
 	email = freya@freyacat.org
 	name = Freya Murphy
 [commit]
-	gpgsign = false
+	gpgsign = true
 [init]
 	defaultBranch = main
diff --git a/home/config/gnupg/gpg-agent.conf b/home/config/gnupg/gpg-agent.conf
index 230b310..1f7aaed 100644
--- a/home/config/gnupg/gpg-agent.conf
+++ b/home/config/gnupg/gpg-agent.conf
@@ -1,2 +1,3 @@
 enable-ssh-support
 display :0
+pinentry-program /run/current-system/profile/bin/pinentry
diff --git a/home/config/hypr/scripts.d/autostart.sh b/home/config/hypr/scripts.d/autostart.sh
index c101f8e..3290ab4 100755
--- a/home/config/hypr/scripts.d/autostart.sh
+++ b/home/config/hypr/scripts.d/autostart.sh
@@ -8,9 +8,9 @@ gnome-keyring-daemon --foreground &
 wl-clip-persist --clipboard both &
 
 gtk-launch discord &
-gtk-launch io.element.Element &
+gtk-launch element-desktop &
 gtk-launch org.gajim.Gajim &
-gtk-launch org.mozilla.Thunderbird &
+gtk-launch thunderbird &
 
 hyprpaper &
 hypridle &
diff --git a/home/config/sway/scripts.d/auto.sh b/home/config/sway/scripts.d/auto.sh
index 07a61fd..8a31ac2 100755
--- a/home/config/sway/scripts.d/auto.sh
+++ b/home/config/sway/scripts.d/auto.sh
@@ -6,9 +6,9 @@ autotiling-rs &
 /usr/bin/gnome-keyring-daemon --foreground &
 wl-clip-persist --clipboard both &
 
-#gtk-launch discord &
-#gtk-launch io.element.Element &
-#gtk-launch org.gajim.Gajim &
-#gtk-launch org.mozilla.Thunderbird &
+gtk-launch discord &
+gtk-launch element-desktop &
+gtk-launch org.gajim.Gajim &
+gtk-launch thunderbird &
 
 hypridle &
diff --git a/home/config/zsh/zprofile b/home/config/zsh/zprofile
index aa2c2ef..89ec646 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=Lavanda-Sea-Dark
+export GTK_THEME=Mint-Y-Dark-Pink
 export XCURSOR_THEME=Adwaita
 export XCURSOR_SIZE=24
 
@@ -49,6 +49,8 @@ export LIBRARY_PATH=$LIBRARY_PATH:$NIX_PROFILE/lib
 # local
 export LOCAL_PROFILE=$HOME/.local
 export XDG_DATA_DIRS=$XDG_DATA_DIRS:$LOCAL_PROFILE/share
+export XDG_DATA_DIRS=$XDG_DATA_DIRS:/var/lib/flatpak/exports/share
+export XDG_DATA_DIRS=$XDG_DATA_DIRS:$LOCAL_PROFILE/share/flatpak/exports/share
 export PATH=$PATH:$LOCAL_PROFILE/bin
 
 # certs
diff --git a/home/config/zsh/zshrc b/home/config/zsh/zshrc
index 29917c9..a75ba6e 100644
--- a/home/config/zsh/zshrc
+++ b/home/config/zsh/zshrc
@@ -15,6 +15,7 @@ then
 fi
 
 PATH=$PATH:$HOME/.cargo/bin
+PATH=$PATH:/var/lib/flatpak/exports/bin
 
 # vim mode >:)
 # no ryan i am not copying you
@@ -37,8 +38,8 @@ alias grep="grep --color=auto"
 alias diff="diff --color=auto"
 alias ccat="highlight --out-format=ansi"
 alias vim="nvim"
-alias show="kitten icat --align=left"
-alias ssh="kitten ssh"
+#alias show="kitten icat --align=left"
+#alias ssh="kitten ssh"
 
 # Have manpages use colors
 export LESS_TERMCAP_md=$'\e[1;36m'
@@ -84,7 +85,7 @@ bindkey "^F" range
 
 # GPG SETUP FOR SSH
 export GPG_TTY=$(tty)
-export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+#export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 
 # ricing
 export PF_CUSTOM_LOGOS="/home/freya/.config/zsh/pfetch_logos"
diff --git a/home/home.scm b/home/home.scm
index aa03ec0..03e90e5 100644
--- a/home/home.scm
+++ b/home/home.scm
@@ -46,6 +46,7 @@
                                                     "mako"
                                                     "grim"
                                                     "slurp"
+                                                    "gtk+:bin"
 
                                                     ; devtools
                                                     "qrencode"
@@ -89,6 +90,8 @@
                                                     "fd"
 
                                                     ; utilities
+                                                    "flatpak"
+                                                    "qbittorrent"
                                                     "syncthing"
                                                     "wine-staging"
                                                     "winetricks"))
@@ -97,6 +100,7 @@
                   easyeffects
                   firefox-wayland-new
                   lavanda-gtk-theme
+                  mint-themes
                   zsh-autosuggestions
                   freya-ca-certs
                   vim-plug)))
@@ -133,7 +137,8 @@
          (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"))
-                    (".gnupg/sshcontrol" ,(local-file "config/gnupg/sshcontrol"))
+                    ;(".gnupg/sshcontrol" ,(local-file "config/gnupg/sshcontrol"))
+                    ;(".gnupg/gpg-agent.conf" ,(local-file "config/gnupg/gpg-agent.conf"))
                     (".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))