mint themes, other fixes

certs/freya_ca.crt

@@ -1,11 +1,11 @@
------BEGIN CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
-MIIBnDCCAUKgAwIBAgIRANSS7G2uorge5TXlGr7z2qswCgYIKoZIzj0EAwIwLDEQ
+MIIBnDCCAUKgAwIBAgIRAPVH+EAJd7BV1oocsZ1LQLEwCgYIKoZIzj0EAwIwLDEQ
-MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz
+MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz
-MTAwNDIxMzczMFoXDTMzMTAwMTIxMzczMFowLDEQMA4GA1UEChMHZnJleWFDQTEY
+MTAyODEzNDAzNVoXDTMzMTAyNTEzNDAzNVowLDEQMA4GA1UEChMHZnJleWFDQTEY
-MBYGA1UEAxMPZnJleWFDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+MBYGA1UEAxMPZnJleWFDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEvyoFgV7LYPyYzubVKEAmDRtp/1Fd/+/txbFBOXE0lX3EC0pPgfr2G8S7FC5P
+QgAEvVC5H2UQZQxMJxKnWkNF7kKNXVDpY2N81yFXRb+K/MKw3aQTI1ukJ6A3AmZP
-aNv+ZxmnSSI8vLJbVofLKNu3GaNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB
+P9urbt/wOHI2zBuodGi4gaLBSaNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB
-/wQIMAYBAf8CAQEwHQYDVR0OBBYEFIWAMA1zgd/KEOAV/26yfuJS48O1MAoGCCqG
+/wQIMAYBAf8CAQEwHQYDVR0OBBYEFGYaattGlZxu5noFWxAnLtpMqJvJMAoGCCqG
-SM49BAMCA0gAMEUCIQDX9oivOL5hueuikrAEoiVw0jwTOOQ51zEQD1v4Xlp1RQIg
+SM49BAMCA0gAMEUCIQCCyubbf8AUq+PPrnBRQ/WFYKH3mwUXcDT7VZoLm+/q+gIg
-LitR7EYp6R0ejK66ZSE0cUdsF/4WbgtrlS3p/MQgDdw=
+YdSLl4AnWfDLlaTTZspft2fq5rEFCB5N+4p/67vSsmY=
------END CERTIFICATE-----
+-----END CERTIFICATE-----

certs/freya_intermediate.crt

@@ -1,12 +1,12 @@
------BEGIN CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
-MIIBxTCCAWqgAwIBAgIQKD7wGJ+2vQCA1+8z2waLiTAKBggqhkjOPQQDAjAsMRAw
+MIIBxjCCAWugAwIBAgIRAKDzyQOSQ6q84fqZBGlmZQ8wCgYIKoZIzj0EAwIwLDEQ
-DgYDVQQKEwdmcmV5YUNBMRgwFgYDVQQDEw9mcmV5YUNBIFJvb3QgQ0EwHhcNMjMx
+MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz
-MDA0MjEzNzMxWhcNMzMxMDAxMjEzNzMxWjA0MRAwDgYDVQQKEwdmcmV5YUNBMSAw
+MTAyODEzNDAzNloXDTMzMTAyNTEzNDAzNlowNDEQMA4GA1UEChMHZnJleWFDQTEg
-HgYDVQQDExdmcmV5YUNBIEludGVybWVkaWF0ZSBDQTBZMBMGByqGSM49AgEGCCqG
+MB4GA1UEAxMXZnJleWFDQSBJbnRlcm1lZGlhdGUgQ0EwWTATBgcqhkjOPQIBBggq
-SM49AwEHA0IABAygCEQ06w0AKgqXVWCL1iX0oRqS6QEb0VY49zZimPRVmI+FdJ0O
+hkjOPQMBBwNCAAQnCVugNyAxPBHS8jiF5mJmUvFUbYSL5OWzkSCMjac3FXwLTqe8
-KB4kANOJABYyFfpzoK9omJXdz6BvsFHx6c+jZjBkMA4GA1UdDwEB/wQEAwIBBjAS
+AxPga5jHATf2Kt7laq5BYm7jB4M+TcJsdM3Mo2YwZDAOBgNVHQ8BAf8EBAMCAQYw
-BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBQFRP1PrOhDg13b9m/oPHg4IAuy
+EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUbDJYRGXitoGNJ9r+vbJp0lU5
-KjAfBgNVHSMEGDAWgBSFgDANc4HfyhDgFf9usn7iUuPDtTAKBggqhkjOPQQDAgNJ
+4VgwHwYDVR0jBBgwFoAUZhpq20aVnG7megVbECcu2kyom8kwCgYIKoZIzj0EAwID
-ADBGAiEAoY0OsXihuhxIQAx8Fp5agkE70UaOHmT5JLJhVGH7sQYCIQCzId4kEMJ8
+SQAwRgIhAOZHh1skE3xE9NHpTQS8cUqiJ+cBLwcIGUguKOUf5hj9AiEA3IoFdhsO
-N4/afVgJI7R5hHbcu1Wge40SSkMx1pplFA==
+hAErELhLd5FM3Yxl3j/TzHslvsD4QyeNhG4=
------END CERTIFICATE-----
+-----END CERTIFICATE-----

home/config/git/gitconfig

@@ -3,6 +3,6 @@
 	email = freya@freyacat.org
 	name = Freya Murphy
 [commit]
-	gpgsign = false
+	gpgsign = true
 [init]
 	defaultBranch = main

home/config/gnupg/gpg-agent.conf

@@ -1,2 +1,3 @@
 enable-ssh-support
 display :0
+pinentry-program /run/current-system/profile/bin/pinentry

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 &

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 discord &
-#gtk-launch io.element.Element &
+gtk-launch element-desktop &
-#gtk-launch org.gajim.Gajim &
+gtk-launch org.gajim.Gajim &
-#gtk-launch org.mozilla.Thunderbird &
+gtk-launch thunderbird &
 
 hypridle &

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

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 show="kitten icat --align=left"
-alias ssh="kitten ssh"
+#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"

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))

modules/freya/packages/gnome-xyz.scm

@@ -1,11 +1,12 @@
 (define-module (freya packages gnome-xyz)
                #:use-module ((guix licenses) #:prefix license:)
                #:use-module (guix gexp)
+               #:use-module (gnu packages)
                #:use-module (gnu packages base)
                #:use-module (gnu packages version-control)
                #:use-module (gnu packages web)
                #:use-module (gnu packages bash)
-               #:use-module (gnu packages)
+               #:use-module (gnu packages compression)
                #:use-module (guix packages)
                #:use-module (guix git-download)
                #:use-module (guix download)
@@ -63,3 +64,57 @@
    (description "Lavanda gtk theme for linux desktops")
    (license license:gpl3))))
 
+(define-public mint-themes
+  (package
+   (name "mint-themes")
+   (version "2.1.7")
+   (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://packages.linuxmint.com/pool/main/m/mint-themes/mint-themes_"
+                          version "_all.deb"))
+      (sha256
+       (base32
+        "19d6b8pr45ga038cvqisa9hvgd3frys2wf218am3hrmair4r27bf"))
+      (file-name "source.deb")))
+   (build-system trivial-build-system)
+   (native-inputs
+     (list binutils
+           tar
+           xz))
+   (arguments
+     '(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+           (let* ((source (assoc-ref %build-inputs "source"))
+                  (bin (string-append
+                         (assoc-ref %outputs "out")
+                         "/share/themes"))
+                  (cwd (getcwd))
+                  (deb (string-append cwd
+                                      "/source.deb"))
+                  (data (string-append cwd
+                                       "/data.tar.xz"))
+                  (themes (string-append cwd
+                                         "/usr/share/themes"))
+                  (ar (string-append
+                        (assoc-ref %build-inputs "binutils")
+                        "/bin/ar"))
+                  (tar (string-append
+                         (assoc-ref %build-inputs "tar")
+                         "/bin/tar"))
+                  (xz-bin (string-append
+                            (assoc-ref %build-inputs "xz")
+                            "/bin")))
+             (setenv "PATH" (string-append (getenv "PATH") ":" xz-bin))
+             (copy-file source deb)
+             (invoke ar "x" deb "--output" cwd)
+             (invoke tar "xf" data "-C" cwd)
+             (mkdir-p bin)
+             (copy-recursively themes bin)))))
+   (home-page "https://github.com/linuxmint/mint-themes")
+   (synopsis "A collection of Mint themes.")
+   (description "A collection of Mint themes.")
+   (license license:gpl3+)))
+

modules/freya/packages/vim.scm

@@ -42,7 +42,7 @@
            (mkdir-p bin)
            (chdir source)
            (install-file "plug.vim" bin)))))
-   (home-page "https://github.com/vinceliuice/Lavanda-gtk-e")
+   (home-page "https://github.com/junegunn/vim-plug")
    (synopsis "Minimalist Vim Plugin Manager")
    (description "Minimalist Vim Plugin Manager")
    (license license:expat)))

modules/freya/packages/yarn.scm

@@ -0,0 +1,57 @@
+(define-module (freya packages yarn)
+	#:use-module (guix packages)
+	#:use-module (guix download)
+	#:use-module (guix build-system gnu)
+	#:use-module ((guix licenses) #:prefix license:)
+	#:use-module (guix utils)
+	#:use-module (gnu packages node))
+
+(define-public yarn
+  (package
+    (name "yarn")
+    (version "1.22.22")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/yarnpkg/yarn/releases/download/v"
+             version
+             "/yarn-v"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "181nvynhhrbga3c209v8cd9psk6lqjkc1s9wyzy125lx35j889l8"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'check)
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out               (assoc-ref %outputs "out"))
+                    (bin               (string-append out "/bin"))
+                    (libexec-yarn      (string-append out "/libexec/yarn"))
+                    (yarn-js           (string-append libexec-yarn "/bin/yarn.js")))
+               (mkdir-p bin)
+               (mkdir-p libexec-yarn)
+               (copy-recursively "./" libexec-yarn)
+               (symlink yarn-js (string-append bin "/yarn"))
+               (symlink yarn-js (string-append bin "/yarnpkg"))))))))
+
+    (inputs `(("node" ,node-lts)))
+    (synopsis "Fast, reliable, and secure dependency management")
+    (description
+     "Yarn is a fast, reliable, and secure dependency management.  Fast: Yarn
+caches every package it has downloaded, so it never needs to download the
+same package again.  It also does almost everything concurrently to maximize
+resource utilization.  This means even faster installs.  Reliable: Using a
+detailed but concise lockfile format and a deterministic algorithm for install
+operations, Yarn is able to guarantee that any installation that works on one
+system will work exactly the same on another system.
+Secure: Yarn uses checksums to verify the integrity of every installed package
+before its code is executed.")
+    (license license:bsd-2)
+    (home-page "https://yarnpkg.com")))

node_modules/.yarn-integrity

@@ -0,0 +1,10 @@
+{
+  "systemParams": "linux-x64-64",
+  "modulesFolders": [],
+  "flags": [],
+  "linkedModules": [],
+  "topLevelPatterns": [],
+  "lockfileEntries": {},
+  "files": [],
+  "artifacts": {}
+}