chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing up the guix config

Browse source
This commit is contained in:
Chris Cochrun 2023-10-18 10:13:18 -05:00
parent adc1daf421
commit a055f7e71e
9 changed files with 125 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.config/fish/config.fish
View file

@ -236,6 +236,6 @@ alias ytd "yt-dlp -o \"~/Videos/%(title)s.%(ext)s\" $1"
# end
# fm6000 -r -c blue
any-nix-shell fish --info-right | source
# any-nix-shell fish --info-right | source
direnv hook fish | source

10
.config/gtk-3.0/dist/gtk-dark.css vendored
View file

@ -6354,3 +6354,13 @@ TerminalNotebook.notebook {
color: mix(#f6f6f6,#282a36,0.15); }
TerminalNotebook.notebook .active-page, TerminalNotebook.notebook .active-page GtkLabel {
color: #f6f6f6; }
/*************
! Thunar
*************/
.thunar toolbar{
/* margin-top: 0px; */
/* padding-bottom: 6px; */
/* padding-left: 8px; */
/* padding-right: 8px; */
background-color: @dark_background_color; }

10
.config/gtk-3.20/dist/gtk-dark.css vendored
View file

@ -8513,3 +8513,13 @@ terminal-window scrollbar.vertical slider {
.raven-mpris {
background-color: rgba(40, 42, 54, 0.7); }
/*************
! Thunar
*************/
.thunar toolbar{
/* margin-top: 0px; */
/* padding-bottom: 6px; */
/* padding-left: 8px; */
/* padding-right: 8px; */
background-color: @dark_background_color; }

5
.config/hypr/hyprland.conf
View file

@ -148,7 +148,7 @@ bind = SUPER,w,exec,/home/chris/bin/window.sh
bind = SUPER,E,exec,/home/chris/bin/emacslof
bind = SUPER,d,exec,emacsclient -c -e '(dired-jump)'
bind = SUPER,v,exec,emacsclient -e '(chris/dired-open-videos)'
bind = SUPER,B,exec,/home/chris/bin/fflof
bind = SUPER,B,exec,/home/chris/bin/qblof
bind = SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer
bind = SUPERCTRL,i,exec,alacritty --class btop -e btop
bind = ,Print,exec,screenshot
@ -220,11 +220,10 @@ bindm=SUPER,mouse:273,resizewindow
# blurls=notifications
exec-once = /home/chris/bin/startup.sh
exec-once = swww init
exec-once = swww img /home/chris/pics/wallpapers/nixorange.webp -t grow --transition-bezier .14,0,.14,.99
exec-once = dunst
exec-once = hyprctl dispatch --batch "splitratio 1; splitration -0.35"
exec-once = dbus-update-activation-environment --all
exec-once = jellyfin-mpv-shim
exec-once = hyprctl setcursor phinger-cursors-light 24
exec-once = swaybg -i ~/pics/wallpapers/guix.svg
exec-once = swayidle -w timeout 300 'swaylock -S --effect-blur 20x3 --fade-in 1 --effect-vignette 0.5:1 --grace 60' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -S --effect-blur 20x3 --effect-vignette 0.5:1'

90
guix/channels.scm
View file

@ -1,44 +1,54 @@
(list (channel
(name 'rde)
(url "https://git.sr.ht/~abcdw/rde")
(branch "master")
(commit
"4384afa60786b9427874961fcb289eb0f7e06fb9")
(introduction
(make-channel-introduction
"257cebd587b66e4d865b3537a9a88cccd7107c95"
(openpgp-fingerprint
"2841 9AC6 5038 7440 C7E9 2FFA 2208 D209 58C1 DEB0"))))
(name 'rde)
(url "https://git.sr.ht/~abcdw/rde")
(branch "master")
(commit
"793aa8aeb73ea2da28b314da08d4c3296cb3ff4e")
(introduction
(make-channel-introduction
"257cebd587b66e4d865b3537a9a88cccd7107c95"
(openpgp-fingerprint
"2841 9AC6 5038 7440 C7E9 2FFA 2208 D209 58C1 DEB0"))))
(channel
(name 'rosenthal)
(url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk")
(commit
"b810c93083453d5912472c385fe6d5ab3d306b15")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
(name 'rosenthal)
(url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk")
(commit
"d47daea1e4f17fd897e2727584f2b042695fc780")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"
(openpgp-fingerprint
"13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))
(channel
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
(branch "master")
(commit
"e585f07f52122ac37e0cfd6995fd2f3e54184d5c")
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
(name 'nonguix)
(url "https://gitlab.com/nonguix/nonguix")
(branch "master")
(commit
"14656d642dc113c73f9b144ccba366376a274a2b")
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
(openpgp-fingerprint
"2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))))
;; (channel
;; (name 'emacs)
;; (url "https://github.com/babariviere/guix-emacs")
;; (commit
;; "a0c3bd55f9f8a33e65e28743d8d5df0c6deb5176")
;; (introduction
;; (make-channel-introduction
;; "72ca4ef5b572fea10a4589c37264fa35d4564783"
;; (openpgp-fingerprint
;; "261C A284 3452 FB01 F6DF 6CF4 F9B7 864F 2AB4 6F18"))))
(channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"a00e1ee3104936a46ab71507cc6287bbbe4dfa99")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"d389f6777359aa44ef9c71989fc1f49e6b222f1d")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))

34
guix/home.scm
View file

@ -11,6 +11,7 @@
#:use-module (pkgs qt5ct)
#:use-module (pkgs kdenlive)
#:use-module (home-services pipewire)
;; #:use-module (emacs packages melpa)
#:use-module (gnu home)
#:use-module (gnu home services)
#:use-module (gnu home services desktop)
@ -102,6 +103,7 @@
"brightnessctl"
"transmission"
"blesh"
"trash-cli"
;; Utilities and Libraries
"libva"
@ -123,18 +125,16 @@
"libimobiledevice"
"kio-extras"
"usbmuxd"
"darktable"
;; "nautilus"
"thunar"
"swaybg"
"dconf"
"dconf-editor"
;; "tracker"
;; "tracker-miners"
"gvfs"
;; "texlive"
"texlive"
;; "texlive-pdfx"
;; "texlive-latex-pdfx"
"trash-cli"
"jmtpfs"
"libmtp"
"xfconf"
@ -156,8 +156,8 @@
"libreoffice"
;; "nemo"
;; "tridactyl-native"
"qtwayland@5.15.8"
"qtdeclarative@5.15.8"
;; "qtwayland@5.15.8"
;; "qtdeclarative@5.15.8"
"egl-wayland"
"pinentry"
"pinentry-qt"
@ -177,9 +177,9 @@
"phinger-cursors-theme" ;; Personal package of cursors
"papirus-icon-theme"
"sound-theme-freedesktop"
"lightly"
;; Gui Apps
"lightly"
"nextcloud-client"
"dunst"
"rofi-wayland"
@ -190,18 +190,18 @@
"imv"
"mpv"
"mpv-mpris"
"firefox"
"icecat"
"firefox-wayland"
"qutebrowser"
"nyxt"
"breeze"
"kdeconnect"
"plasma"
;;"plasma"
"dolphin"
"darktable"
"thunar"
"dconf-editor"
"ark"
"kdenlive-fix" ;; Personal fixed kdenlive
;;"kdenlive-fix" ;; Personal fixed kdenlive
"gimp"
"distrobox"
"libreoffice"
@ -212,6 +212,7 @@
;; Fonts
"font-google-noto"
"font-google-noto-emoji"
"font-victor-mono"
;; Emacs and packages
"emacs-next-pgtk"
@ -248,7 +249,7 @@
"emacs-org-re-reveal"
"emacs-org-ql"
"emacs-org-msg"
"emacs-nov-el"
;; "emacs-nov-el"
"emacs-calfw"
"emacs-transmission"
"emacs-emojify"
@ -275,6 +276,7 @@
"emacs-pdf-tools"
"emacs-vterm"
"emacs-plz"
"emacs-empv"
"emacs-ement"
"emacs-bongo"
"emacs-emms"
@ -319,8 +321,8 @@
(home-bash-configuration
(guix-defaults? #t)
(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")
("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")
("ytd" . "yt-dlp -o \\\"~/vids/%(title)s.%(ext)s\\\" $1")
("yta" . "yt-dlp -o \\\"~/music/%(title)s.%(ext)s\\\" $1")))
(bashrc (list (plain-file "blesh" "source $HOME/.guix-home/profile/share/blesh/ble.sh")
@ -358,8 +360,8 @@
(service home-fish-service-type
(home-fish-configuration
(aliases '(("ls" . "exa -l")
("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")
("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")
("ec" . "emacsclient -t")
("ecc" . "emacsclient -c")
("mkdir" . "mkdir -p")

35
guix/pkgs/emacs-xyz.scm
View file

@ -2,9 +2,8 @@
(define-module (pkgs emacs-xyz)
#:use-module (gnu packages)
#:use-module (gnu packages vim)
#:use-module (gnu packages rust-apps)
#:use-module (gnu packages video)
#:use-module (gnu packages emacs)
#:use-module (gnu packages emacs-xyz)
#:use-module (gnu packages gnupg)
#:use-module (gnu services)
#:use-module (guix gexp)
@ -37,3 +36,33 @@
(description "\
This package adds the command dired-rsync which allows the user to copy
marked files in a dired buffer via rsync."))))
(define-public emacs-empv
(let ((commit "4af3b3624a4714558081d693c91602b9304e8fcb")
(revision "0"))
(package
(name "emacs-empv")
(version (git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/isamert/empv.el.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"07xwxqjzah7dg62q0sz6ii8gi1aianqzp51aqql7mg8hyssjzpyj"))))
(build-system emacs-build-system)
(arguments (list #:emacs emacs))
(propagated-inputs
(list emacs-consult
emacs-map
emacs-seq
emacs-s))
(license license:gpl3+)
(home-page "https://github.com/isamert/empv.el.git")
(synopsis "dired-rsync – asynchronous rsync from dired")
(description "\
This package adds the command empv for playing mpv videos from emacs."))))

1
modules/emacs.nix
View file

@ -142,6 +142,7 @@ with lib;
mastodon
qrencode
gcmh
mu4e
use-package
esh-autosuggest
melpaPackages.org-ai

2
scripts/qblof
View file

@ -30,7 +30,7 @@ if [ $(pgrep -c qutebrowser) -gt 0 ]; then
qbwin=$(echo $qbrg | sed 's/\(.*r\)\:.*/\1/')
# echo $ffwin
exec wlrctl toplevel focus "$qbwin"
exec hyprctl dispatch focuswindow qutebrowser
exit
fi
fi