From f7c0143e182cdebff0a0821c4fd99e2958bd7ea3 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 30 Jun 2023 16:45:42 -0500 Subject: [PATCH] adding kalading drives and phinger-cursors --- guix/home.scm | 57 ++++++++++++++++++++--------- guix/kaladin.scm | 10 ++++- guix/pkgs/phinger-cursors-theme.scm | 35 ++++++++++++++++++ 3 files changed, 83 insertions(+), 19 deletions(-) create mode 100644 guix/pkgs/phinger-cursors-theme.scm diff --git a/guix/home.scm b/guix/home.scm index 0a14074..afa161e 100644 --- a/guix/home.scm +++ b/guix/home.scm @@ -7,6 +7,7 @@ (define-module (home) #:use-module (pkgs emacs-xyz) #:use-module (pkgs tridactyl-native) + #:use-module (pkgs phinger-cursors-theme) #:use-module (home-services pipewire) #:use-module (gnu home) #:use-module (gnu home services) @@ -57,6 +58,7 @@ "htop" "ripgrep" "bat" + "dutree" "alacritty" "libnotify" "nextcloud-client" @@ -71,6 +73,7 @@ "grim" "slurp" "imv" + "phinger-cursors-theme" "firefox" "openjdk" "kwallet" @@ -80,6 +83,8 @@ "kdeconnect" "dolphin" "ark" + "kdenlive" + "mediainfo" ;; "tridactyl-native" "qtwayland@5.15.8" ;; "qtwayland" @@ -221,21 +226,6 @@ (aliases '(("grep" . "grep --color=auto") ("gh" . "guix home -L ~/dotfiles/guix reconfigure ~/dotfiles/guix/home.scm") ("gs" . "sudo guix system -L /home/chris/dotfiles/guix reconfigure /home/chris/dotfiles/guix/$(hostname).scm"))) - (environment-variables - '(("QT_QPA_PLATFORM" . "wayland-egl") - ("QT_QPA_PLATFORMTHEME" . "qt5ct") - ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share") - ("RTC_USE_PIPEWIRE" . "true") - ("GDK_BACKEND" . "wayland") - ("WLR_DRM_NO_ATOMIC" . "1") - ("MOZ_ENABLE_WAYLAND" . "1") - ("WLR_BACKEND" . "vulkan") - ("WLR_RENDERER" . "vulkan") - ("SDL_VIDEODRIVER" . "wayland") - ("WLR_NO_HARDWARE_CURSORS" . "1") - ("GTK_USE_PORTAL" . "1") - ("EDITOR" . "emacsclient -t -a") - ("VISUAL" . "emacsclient -c -a"))) (bashrc (list (plain-file "blesh" "source $HOME/.guix-home/profile/share/blesh/ble.sh") (plain-file "home-manager" "source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh") ;;These need to be here so they are at the bottom and therefore after guix-defaults @@ -249,6 +239,16 @@ (simple-service 'extra-env-vars home-environment-variables-service-type `(("PATH" . "$PATH:/home/chris/bin:/home/chris/.nix-profile/bin") + ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share") + ("RTC_USE_PIPEWIRE" . "true") + ("GDK_BACKEND" . "wayland") + ("WLR_DRM_NO_ATOMIC" . "1") + ("WLR_BACKEND" . "vulkan") + ("WLR_RENDERER" . "vulkan") + ("WLR_NO_HARDWARE_CURSORS" . "1") + ("GTK_USE_PORTAL" . "1") + ("EDITOR" . "emacsclient -t -a") + ("VISUAL" . "emacsclient -c -a") ("QT_QPA_PLATFORM" . "wayland-egl") ("SDL_VIDEODRIVER" . "wayland") ("MOZ_ENABLE_WAYLAND" . "1") @@ -282,11 +282,34 @@ ("direnv/direnvrc" ,(plain-file "direnvrc" "\ use_guixs() { eval \"$(guix shell \"$@\" --search-paths)\" -}")))) +}")) + ("gtk-3.0/settings.ini" ,(plain-file "gtk3-settings.ini" "[Settings] +gtk-cursor-theme-name=phinger-cursors-light +gtk-cursor-theme-size=32 +gtk-application-prefer-dark-theme=true +gtk-button-images=true +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=true +gtk-font-name=VictorMono Nerd Font, 11 +gtk-icon-theme-name=Papirus-Dark +gtk-menu-images=true +gtk-modules=colorreload-gtk-module:window-decorations-gtk-module:appmenu-gtk-module +gtk-primary-button-warps-slider=true +gtk-shell-shows-menubar=1 +gtk-theme-name=Breeze +gtk-toolbar-style=3 +gtk-xft-dpi=98304 +")))) (simple-service 'scripts home-files-service-type `(("bin" ,(local-file "../scripts" #:recursive? #t)) - (".mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t)))) + (".mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t)) + (".Xresources" ,(plain-file "Xresources" "Xcursor.theme: phinger-cursors-light +Xcursor.size: 36 +")) + (".icons/default/index.theme" ,(plain-file "default.theme" "[icon theme] +Inherits=phinger-cursors-light +")))) (service home-gpg-agent-service-type (home-gpg-agent-configuration diff --git a/guix/kaladin.scm b/guix/kaladin.scm index 5c5343d..c43f098 100644 --- a/guix/kaladin.scm +++ b/guix/kaladin.scm @@ -40,12 +40,18 @@ "9b5a1a62-0de6-4e07-a541-634736980d10" 'btrfs)) (type "btrfs") - (options "noatime,ssd,space_cache,clear_cache,compress=zstd")) + (options "ssd,space_cache,clear_cache,compress=zstd")) (file-system - (mount-point "/home/chris/storage") + (mount-point "/run/media/chris/storage") (device (uuid "4c7d4273-7b72-4aa8-8e1c-e281543d06cb" 'btrfs)) (type "btrfs") (options "space_cache,clear_cache,compress=zstd")) + (file-system + (mount-point "/run/media/chris/backup") + (device (uuid + "4286b9ef-e8ed-49a0-9eec-91b8ee05b2cb" + 'ext4)) + (type "ext4")) %base-file-systems))) diff --git a/guix/pkgs/phinger-cursors-theme.scm b/guix/pkgs/phinger-cursors-theme.scm new file mode 100644 index 0000000..924f936 --- /dev/null +++ b/guix/pkgs/phinger-cursors-theme.scm @@ -0,0 +1,35 @@ +(define-module (pkgs phinger-cursors-theme) + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu services) + #:use-module (guix utils) + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system copy) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public phinger-cursors-theme + (package + (name "phinger-cursors-theme") + (version "1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/phisch/phinger-cursors/releases/download/v" version "/phinger-cursors-variants.tar.bz2")) + (sha256 + (base32 + "11ynfizxgfm0dy8i4s0dfws4g9chf12n41hzai8n936wxb3vb3r0")))) + (build-system copy-build-system) + (native-inputs (list tar bzip2)) + (arguments + '(#:install-plan + '(("../phinger-cursors" "share/icons/phinger-cursors") + ("../phinger-cursors-light" "share/icons/phinger-cursors-light")))) + (home-page "https://github.com/phisch/phinger-cursors") + (synopsis "Most likely the most over engineered cursor theme out there") + (description + "Say hello to your new cursor theme. Phinger cursors is most likely the most over engineered cursor theme out there.") + (license license:cc-by-sa4.0))) + +phinger-cursors-theme