diff --git a/channels.scm b/channels.scm index 3def5e0..06dbde0 100644 --- a/channels.scm +++ b/channels.scm @@ -1,39 +1,64 @@ (list (channel - (name 'guix) - (url "https://git.savannah.gnu.org/git/guix.git") - (branch "master") - (introduction - (make-channel-introduction - "9edb3f66fd807b096b48283debdcddccfea34bad" - (openpgp-fingerprint - "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))) - (channel - (name 'artoria) - (url "https://git.bloodyno.se/lynn/artoria.git") - (branch "main") - (introduction - (make-channel-introduction - "56579fce18ab54c21442a98d923bd2bc6844d321" - (openpgp-fingerprint - "FE30 E8F6 522D 0615 35E0 E449 55E7 97F6 31DD A03C")))) + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (branch "master") + (introduction + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" + (openpgp-fingerprint + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))) (channel - (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") - (branch "master") - (introduction - (make-channel-introduction - "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - (openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + (name 'zzkt) + (url "https://gitlab.com/zzkt/guix") + (branch "endless") + (introduction + (make-channel-introduction + "fc0ada85de1980e1fc9ee50672d827c0c17c3e7d" + (openpgp-fingerprint + "24A7 4604 91E6 A60F 5BB4 A00F 989F 5E6E DB47 8160")))) (channel - (name 'michal_atlas) - (url "https://git.sr.ht/~michal_atlas/guix-channel") - (branch "master") - ;;(introduction - ;; (make-channel-introduction - ;; "d45185a2755daf831f1c3dc63efbf2bbbb29b99e" - ;; (openpgp-fingerprint - ;; "") - ;; )) - ) -) + (name 'benoitj) + (url "https://git.sr.ht/~benoit/my-guix-channel") + (branch "main") + (introduction + (make-channel-introduction + "37444eebf69f83f4accaa2c69562209d94f4e57a" + (openpgp-fingerprint + "C3B6 ED99 DF87 B208 0C79 C8AC F86B 0628 26D4 C20A")))) + (channel + (name 'nebula) + (url "https://git.sr.ht/~apoorv569/nebula") + (branch "master") + (introduction + (make-channel-introduction + "2f1be757b40f78456220823b71aace5277c5f33d" + (openpgp-fingerprint + "53B4 8418 D76A 3EF1 1BCC 92A8 4FDB 05CF 5D67 6283")))) + (channel + (name 'artoria) + (url "https://git.transistor.house/lynn/artoria.git") + (branch "main") + (introduction + (make-channel-introduction + "56579fce18ab54c21442a98d923bd2bc6844d321" + (openpgp-fingerprint + "FE30 E8F6 522D 0615 35E0 E449 55E7 97F6 31DD A03C")))) + (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + (branch "master") + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + (channel + (name 'atlas) + (url "https://git.sr.ht/~michal_atlas/guix-channel") + (branch "master") + (introduction + (make-channel-introduction + "f0e838427c2d9c495202f1ad36cfcae86e3ed6af" + (openpgp-fingerprint + "D451 85A2 755D AF83 1F1C 3DC6 3EFB F2BB BB29 B99E")))) + ) diff --git a/home-configuration.scm b/home-configuration.scm index a5f1382..3c1ed1f 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -10,6 +10,16 @@ (gnu packages vim) (gnu packages version-control) (gnu packages terminals) + (gnu packages web) + (gnu packages video) + (gnu packages fonts) + (gnu packages curl) + (benoitj packages fonts) + (nebula packages fonts) + (zzkt packages fonts) + ; (gnu packages font-nerd-fonts) + ; (nonguix packages) + (nongnu packages mozilla) (gnu services) (guix gexp) (guix store) @@ -24,19 +34,27 @@ ;; taken from https://git.sr.ht/~michal_atlas/dotfiles/tree/16ccb8dd549494fd4165f706c899b591903d1a6d/item/home.scm (define (file-fetch url hash) (with-store store - (run-with-store store - (url-fetch url 'sha256 - ; hash - (base64-decode hash) - )))) + (run-with-store store + (url-fetch url 'sha256 + ; hash + (base64-decode hash) + )))) (home-environment ;; Below is the list of packages that will show up in your ;; Home profile, under ~/.guix-home/profile. (packages (list - emacs - git - kitty + emacs + git + firefox + kitty + ;font-nerd-fonts-firacode + meslo-nerd-font + font-monaspace + font-google-noto-sans-cjk + font-google-noto-emoji + curl + mpv neovim)) ;; Below is the list of Home services. To search for available @@ -47,22 +65,22 @@ home-files-service-type `( (".face" ,(file-fetch - "https://marq42.xyz/mir-avatar-picrew-3.png" - ;; get below with `guix download URL --format=base64` - this took ages to work out + "https://marq42.xyz/mir-avatar-picrew-3.png" + ;; get below with `guix download URL --format=base64` - this took ages to work out "Psx4J7+7mMKqpsT/rl/Iv/XQnZlTJ1WSMpswuNDjv38=" )))) (service home-dconf-load-service-type #~`((org/gnome/shell - (disable-user-extensions #f) - (favorite-apps #( - "kitty.desktop" - "firefox.desktop" - "emacs.desktop" - "org.gnome.Settings.desktop" - "org.gnome.Nautilus.desktop" - "btop.desktop")) - ) - + (disable-user-extensions #f) + (favorite-apps #( + "kitty.desktop" + "firefox.desktop" + "emacs.desktop" + "org.gnome.Settings.desktop" + "org.gnome.Nautilus.desktop" + "btop.desktop")) + ) + (org/gnome/desktop/interface (color-scheme "prefer-dark")) (org/gnome/mutter @@ -70,18 +88,18 @@ (org/gnome/desktop/input-sources (xkb-options #("caps:escape"))) (org/gnome/desktop/wm/preferences - (focus-mode "sloppy")) + (focus-mode "sloppy")) (org/gnome/settings-daemon/plugins/power - (idle-dim #f) - (sleep-inactive-ac-type "nothing")) + (idle-dim #f) + (sleep-inactive-ac-type "nothing")) (org/gnome/gnome-system-monitor - (current-tab "resources")) + (current-tab "resources")) (org/gnome/desktop/interface (show-battery-percentage #t)) - (org/gnome/desktop/session - (idle-delay "uint32 0") - ;(idle-delay ,(int32->uint32 0)) - ) + ;; (org/gnome/desktop/session + ;; (idle-delay "uint32 0") + ;; ;(idle-delay ,(int32->uint32 0)) + ;; ) (org/gnome/desktop/background (picture-uri-dark #$(file-fetch "https://www.teahub.io/photos/full/154-1542362_mac-os-mojave-screenshot.jpg" @@ -89,7 +107,7 @@ "avrKrso2RJBM0X9BD8likF/7wV0SWMNgoLqtqAixLG8=" ))) (org/gnome/desktop/peripherals/touchpad - (tap-to-click #t)))) ; end gnome stuff + (tap-to-click #t)))) ; end gnome stuff ;; shell (service home-bash-service-type (home-bash-configuration diff --git a/machines.scm b/machines.scm new file mode 100644 index 0000000..743e792 --- /dev/null +++ b/machines.scm @@ -0,0 +1,13 @@ +(list (build-machine + ;; (name "unicron") + (name "192.168.1.3") + (systems (list "x86_64-linux" "i686-linux")) + (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALuQ9g+xYE7Wu5o+8GjtJXLEfOaJwgURMVaJIDb0e8T") + (user "root") + (speed 2.) ;incredibly fast! + + ;; Remember 'guix offload' is spawned by + ;; 'guix-daemon' as root. + (private-key "/root/.ssh/id_rsa") + ) + ) diff --git a/system.scm b/system.scm index 82b9405..058202c 100644 --- a/system.scm +++ b/system.scm @@ -48,7 +48,7 @@ (specification->package "eza") (specification->package "git") (specification->package "gparted") - (specification->package "firefox") + ;; (specification->package "firefox") ;; (specification->package "nss-certs") ;removed because version conflict ) %base-packages))