From 131ba517234e679e6517cd718741c6aaadacec49 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Sat, 9 Nov 2024 15:36:56 -0500 Subject: [PATCH] add some dev packages, clean up some things --- channels.scm | 8 ++++---- home/config/zsh/zshrc | 1 + home/home.scm | 3 +++ home/nix/home.nix | 5 ----- modules/freya/system.scm | 9 +-------- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/channels.scm b/channels.scm index 34f9bf0..79c7d17 100644 --- a/channels.scm +++ b/channels.scm @@ -3,7 +3,7 @@ (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (commit - "547d97180471e90e404a948015f65431961aa273") + "2a6d96425eea57dc6dd48a2bec16743046e32e06") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" @@ -11,10 +11,10 @@ "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))) (channel (name 'nonguix) - (url "https://gitlab.com/nonguix/nonguix") + (url "https://gitlab.com/nonguix/nonguix.git") (branch "master") (commit - "9f065c321e7d6b39f8610a8d65528f79a8733459") + "3b78eca656cf8a088ca8699a0563e67e2b61f2ac") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" @@ -25,7 +25,7 @@ (url "https://g.freya.cat/freya/sakura") (branch "main") (commit - "a329337cf72c12a4be43ff1c8543c3b69444ab02") + "92bd36b305b5899f3111be238e91050967673b8f") (introduction (make-channel-introduction "8fb2f9c2fa414754c41c1c73665e3e73e12693ab" diff --git a/home/config/zsh/zshrc b/home/config/zsh/zshrc index 733fc51..5c38bbc 100644 --- a/home/config/zsh/zshrc +++ b/home/config/zsh/zshrc @@ -16,6 +16,7 @@ fi PATH=$PATH:$HOME/.cargo/bin PATH=$PATH:/var/lib/flatpak/exports/bin +DOCKER_HOME="$HOME/.docker" # vim mode >:) # no ryan i am not copying you diff --git a/home/home.scm b/home/home.scm index 030d2f8..a69bbf0 100644 --- a/home/home.scm +++ b/home/home.scm @@ -95,6 +95,9 @@ "python-pynvim" "git" "openssl" + "openjdk" + "perl-image-exiftool" + "imagemagick" ; langs "gcc-toolchain" diff --git a/home/nix/home.nix b/home/nix/home.nix index e897caf..1971e58 100644 --- a/home/nix/home.nix +++ b/home/nix/home.nix @@ -19,11 +19,6 @@ starship discord thunderbird - - # devlopment - rustup - gcc - openssl ]; }; diff --git a/modules/freya/system.scm b/modules/freya/system.scm index 7294ef7..ce524c8 100644 --- a/modules/freya/system.scm +++ b/modules/freya/system.scm @@ -279,14 +279,7 @@ (auto-enable? #t))) ; yubikey (service pcscd-service-type) - (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")) - ; ld linux - (simple-service 'ld-service-type activation-service-type - #~(begin - (system* "mkdir" "-p" "/lib64") - (system* "ln" "-s" - (string-append #$glibc "/lib/ld-linux-x86-64.so.2") - "/lib64/ld-linux-x86-64.so.2")))) + (udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))) ;; append freya base services %base-freya-services))