From 12e25acdeb334916fdd269e9743d02019b365ba4 Mon Sep 17 00:00:00 2001 From: SqrtMinusOne Date: Tue, 22 Jun 2021 08:54:46 +0300 Subject: [PATCH] feat(guix): i3lock, nix fonts, some software --- .config/guix/manifests/console.scm | 1 + .config/guix/manifests/desktop.scm | 9 +++++---- .config/guix/systems/indigo.scm | 1 + .profile | 14 ++++++++++++-- Console.org | 15 +++++++++++++++ Desktop.org | 7 +++++-- Guix.org | 1 + 7 files changed, 40 insertions(+), 8 deletions(-) diff --git a/.config/guix/manifests/console.scm b/.config/guix/manifests/console.scm index bb62c1a..0dbe797 100644 --- a/.config/guix/manifests/console.scm +++ b/.config/guix/manifests/console.scm @@ -1,5 +1,6 @@ (specifications->manifest '( + "fzf" "neofetch" "osync" "nethogs" diff --git a/.config/guix/manifests/desktop.scm b/.config/guix/manifests/desktop.scm index 40ad434..e9e3b90 100644 --- a/.config/guix/manifests/desktop.scm +++ b/.config/guix/manifests/desktop.scm @@ -1,5 +1,8 @@ (specifications->manifest '( + "fontconfig" + "gnome-font-viewer" + "xdg-utils" "telegram-desktop" "keepassxc" "thunar" @@ -14,7 +17,6 @@ "xprop" "xrandr" "megacmd-1.4" - "xsettingsd" "activitywatch-bin" "flatpak" "zathura-djvu" @@ -33,7 +35,6 @@ "bind" "polybar" "i3-gaps" - "hicolor-icon-theme" + "xsettingsd" "papirus-icon-theme" - "matcha-theme" - "lxappearance")) + "matcha-theme")) diff --git a/.config/guix/systems/indigo.scm b/.config/guix/systems/indigo.scm index 09d6ea3..f34d157 100644 --- a/.config/guix/systems/indigo.scm +++ b/.config/guix/systems/indigo.scm @@ -23,6 +23,7 @@ (define %my-base-services (cons* (service openssh-service-type) + (screen-locker-service i3lock "i3lock") (extra-special-file "/lib64/ld-linux-x86-64.so.2" (file-append glibc "/lib/ld-linux-x86-64.so.2")) (service nix-service-type) (service cups-service-type diff --git a/.profile b/.profile index c0a2928..1dd4a16 100644 --- a/.profile +++ b/.profile @@ -33,13 +33,23 @@ fi # Guix settings:2 ends here # [[file:Console.org::*Guix settings][Guix settings:3]] -export GUIX_PACKAGE_PATH=~/guix-packages +if [ -d "$HOME/.guix-extra-profiles/desktop" ]; then + export FONTCONFIG_PATH="$HOME/.guix-extra-profiles/desktop/desktop/etc/fonts" +fi # Guix settings:3 ends here # [[file:Console.org::*Guix settings][Guix settings:4]] -export XDG_DATA_DIRS="$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share" +export GUIX_PACKAGE_PATH=~/guix-packages # Guix settings:4 ends here +# [[file:Console.org::*Guix settings][Guix settings:5]] +export XDG_DATA_DIRS="$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share" +# Guix settings:5 ends here + +# [[file:Console.org::*Guix settings][Guix settings:6]] +export XDG_DATA_DIRS="$XDG_DATA_DIRS:$HOME/.nix-profile/share/applications" +# Guix settings:6 ends here + # [[file:Console.org::*XResources][XResources:1]] xrdb ~/.Xresources # XResources:1 ends here diff --git a/Console.org b/Console.org index bd29147..04f1ef0 100644 --- a/Console.org +++ b/Console.org @@ -56,6 +56,7 @@ if [ -d "$HOME/bin" ] ; then export PATH="$HOME/bin/scripts:$PATH" fi #+end_src + ** Guix settings Enable extra profiles @@ -79,6 +80,13 @@ if [ -f /run/current-system/profile/etc/profile.d/nix.sh ]; then fi #+end_src +Use Guix fontconfig. Necessary for nix apps +#+begin_src sh +if [ -d "$HOME/.guix-extra-profiles/desktop" ]; then + export FONTCONFIG_PATH="$HOME/.guix-extra-profiles/desktop/desktop/etc/fonts" +fi +#+end_src + Set a folder for my packages. #+begin_src sh export GUIX_PACKAGE_PATH=~/guix-packages @@ -88,6 +96,11 @@ Make flatpak apps visible to launchers #+begin_src sh export XDG_DATA_DIRS="$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share" #+end_src + +Make nix apps visible to launchers +#+begin_src sh +export XDG_DATA_DIRS="$XDG_DATA_DIRS:$HOME/.nix-profile/share/applications" +#+end_src ** XResources | Guix dependency | |-----------------| @@ -678,6 +691,8 @@ key_bindings: | nethogs | A tool to group processed by used bandwidth | | osync | rsync wrapper | | neofetch | Fetch system info | +| fzf | fuzzy finder | +| p7zip | archiver | | Note | Description | |------+-----------------| diff --git a/Desktop.org b/Desktop.org index ad8e869..830e5a4 100644 --- a/Desktop.org +++ b/Desktop.org @@ -12,7 +12,6 @@ My general desktop environment configuration. Parts prefixed with (OFF) are not used, but kept for historic purposes. For some reason GitHub's org renderer ignores TODO status, hence such a prefix. Round brackets instead of square ones to prevent GitHub's org renderer from screwing up. - * Contents :PROPERTIES: :TOC: :include all :depth 3 @@ -180,7 +179,7 @@ Net/ThemeName "Matcha-dark-azul" Net/IconThemeName "Papirus-Dark" Gtk/DecorationLayout "menu:minimize,maximize,close" Gtk/FontName "Sans 12" -Gtk/MonospaceFontName "JetbrainsMono Nerd Mono 12" +Gtk/MonospaceFontName "JetBrainsMono Nerd Mono 12" Gtk/CursorThemeName "Adwaita" Xft/Antialias 1 Xft/Hinting 0 @@ -2051,6 +2050,7 @@ This section generates manifests for various desktop software that I'm using. | dev | conda | | dev | docker-compose | | dev | python | +| dev | postgresql | ** Manifests #+NAME: packages #+begin_src emacs-lisp :tangle no :var category="" @@ -2310,6 +2310,9 @@ Other desktop programs I use are listed below. | thunar | My preferred GUI file manager | | keepassxc | My preferred password manager | | telegram-desktop | telegram client | +| xdg-utils | gives xdg-open and stuff | +| gnome-font-viewer | view fonts | +| fontconfig | | #+NAME: packages #+begin_src emacs-lisp :tangle no diff --git a/Guix.org b/Guix.org index af986e2..fc827cd 100644 --- a/Guix.org +++ b/Guix.org @@ -249,6 +249,7 @@ Default services for each machine: (define %my-base-services (cons* (service openssh-service-type) + (screen-locker-service i3lock "i3lock") (extra-special-file "/lib64/ld-linux-x86-64.so.2" (file-append glibc "/lib/ld-linux-x86-64.so.2")) (service nix-service-type) (service cups-service-type