update configs and virt packages

10 files changed, 56 insertions, 38 deletions

diff --git a/channels.scm b/channels.scm
index 5e95e82..61d82c7 100644
--- a/channels.scm
+++ b/channels.scm
@@ -3,7 +3,7 @@
         (url "https://git.savannah.gnu.org/git/guix.git")
         (branch "master")
         (commit
-          "c3d48d024b95f57850ec429d7f326d817dda5090")
+          "e5f7c14ef6c951f02ca710fad1869db3aedff4b5")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,21 +14,9 @@
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
         (commit
-          "e2aa9e56d4d1888bf51d7671a18d304750373f89")
+          "e951cda078529d238f1bc942db1112f76a01a5f7")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
             (openpgp-fingerprint
-              "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
-      (channel
-        (name 'rosenthal)
-        (url "https://codeberg.org/hako/rosenthal.git")
-        (branch "trunk")
-        (commit
-          "129ca6fe164bf8b5a37357bab8c5229b611f1df2")
-        (introduction
-          (make-channel-introduction
-            "7677db76330121a901604dfbad19077893865f35"
-            (openpgp-fingerprint
-              "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
-      )
+              "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5")))))
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 0270199..89a2bc5 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -19,6 +19,7 @@
              (home-services pipewire)
              (home-packages mozillia)
              (home-packages vim)
+             (home-packages gcc)
              (home-packages audio))
 
 
@@ -32,7 +33,7 @@
                                                     "qrencode"
                                                     "sassc"
                                                     "binutils"
-                                                    "gcc-toolchain"
+                                                    ;"gcc-toolchain"
                                                     "clang-toolchain"
                                                     "libreoffice"
                                                     "gnupg"
@@ -68,10 +69,12 @@
                                                     "fd"
                                                     "nasm"
                                                     "node"
+                                                    "ncurses"
+                                                    "jq"
                                                     "tree-sitter-cli"
                                                     "python-pynvim"))
 
-            (list neovim-new easyeffects firefox-wayland-new)))
+            (list neovim-new easyeffects firefox-wayland-new gcc-new)))
 
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index e35ce28..e1c1d17 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -16,16 +16,23 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
+    # Main packages
     yt-dlp
     starship
     discord
     thunderbirdPackages.thunderbird-115
+    
+    # Rust
     rustup
     glibc
-    gcc
+    gcc-unwrapped
+
+    # Java
     jdk
     maven
+    jetbrains.idea-community
 
+    # Lua
     lua
     lua52Packages.dkjson
     lua52Packages.luaposix
diff --git a/home-config/ssh/config b/home-config/ssh/config
index d7db7a9..7ab6f9f 100644
--- a/home-config/ssh/config
+++ b/home-config/ssh/config
@@ -10,7 +10,7 @@ Host tardis
     Port 1111
 
 Host stationery
-    HostName stationery.lol
+    HostName stationery.faith
     User tylerm
 
 Host queeg
diff --git a/home-config/sway/config.d/idle b/home-config/sway/config.d/idle
index fb13083..7b94882 100644
--- a/home-config/sway/config.d/idle
+++ b/home-config/sway/config.d/idle
@@ -1,5 +1,5 @@
 # Turn off display after tiemout
 exec swayidle -w \
-    timeout 300 'swaylock -f -c 14171d' \
+    timeout 300 '~/.config/sway/lock.sh' \
     timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -f -c 14171d'
+    before-sleep '~/.config/sway/lock.sh'
diff --git a/home-config/sway/lock.sh b/home-config/sway/lock.sh
new file mode 100755
index 0000000..b84e3d0
--- /dev/null
+++ b/home-config/sway/lock.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+swaylock --indicator --clock -i ~/.config/sway/nya0.png --effect-blur 10x5
diff --git a/home-config/sway/power/layout b/home-config/sway/power/layout
index c40a736..89af53b 100644
--- a/home-config/sway/power/layout
+++ b/home-config/sway/power/layout
@@ -1,6 +1,6 @@
 {
     "label" : "lock",
-    "action" : "swaylock -f -c 242434",
+    "action" : "~/.config/sway/lock.sh",
     "text" : "Lock",
     "keybind" : "l"
 }
diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm
index 239f254..6900561 100644
--- a/modules/home-config/base-system.scm
+++ b/modules/home-config/base-system.scm
@@ -6,6 +6,7 @@
            #:use-module (gnu packages avahi)
            #:use-module (gnu packages shells)
            #:use-module (gnu packages tls)
+           #:use-module (gnu packages gcc)
            #:use-module (gnu packages security-token)
            #:use-module (gnu packages virtualization)
            #:use-module (guix packages)
@@ -118,20 +119,19 @@
          ;; services. run 'guix system search KEYWORD' in a terminal.
          (services
            (append (list
-
-                 ;; To configure OpenSSH, pass an 'openssh-configuration'
-                 ;; record as a second argument to 'service' below.
-                 (service openssh-service-type)
-                 (service pcscd-service-type)
-                 (service spice-vdagent-service-type)
-                 (service cups-service-type
-                      (cups-configuration
-                    (web-interface? #t)))
-                 ;; Avahi is only present for CUPS to support "automagic" printing
-                 (service avahi-service-type
-                      (avahi-configuration
-                    (publish? #f) ;; do not advertise this machiene
-                    (publish-workstation? #f))) ; do not advertise, I want this to be as silent as possible
+                ;; To configure OpenSSH, pass an 'openssh-configuration'
+                ;; record as a second argument to 'service' below.
+                (service openssh-service-type)
+                (service pcscd-service-type)
+                (service spice-vdagent-service-type)
+                (service cups-service-type
+                    (cups-configuration
+                      (web-interface? #t)))
+                ;; Avahi is only present for CUPS to support "automagic" printing
+                (service avahi-service-type
+                    (avahi-configuration
+                      (publish? #f) ;; do not advertise this machiene
+                      (publish-workstation? #f))) ; do not advertise, I want this to be as silent as possible
                (service docker-service-type)
                (service nix-service-type)
                (service libvirt-service-type
@@ -143,6 +143,11 @@
                (service bluetooth-service-type)
                (service pam-limits-service-type)
                (service fprintd-service-type)
+               ;; (service special-files-service-type
+               ;;          `(("/lib64" ,(directory-union "rustup-libs"
+               ;;                          (list
+               ;;                            (file-append glibc "/lib")
+               ;;                            (file-append gcc "/lib"))))))
                (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
 
            ;; This is the default list of services we
diff --git a/modules/home-packages/gcc.scm b/modules/home-packages/gcc.scm
new file mode 100644
index 0000000..5d6a208
--- /dev/null
+++ b/modules/home-packages/gcc.scm
@@ -0,0 +1,12 @@
+(define-module (home-packages gcc)
+  #:use-module (gnu)
+  #:use-module (guix packages)
+  #:use-module (gnu packages gcc))
+
+(define-public gcc-new
+    (package
+      (inherit gcc)
+      (name "gcc-new")
+      (outputs (package-outputs gcc))))
+
+
diff --git a/modules/home-packages/virtualization.scm b/modules/home-packages/virtualization.scm
index e87b0e0..e85b0af 100644
--- a/modules/home-packages/virtualization.scm
+++ b/modules/home-packages/virtualization.scm
@@ -19,7 +19,7 @@
       (substitute-keyword-arguments (package-arguments libvirt)
         ((#:phases phases)
          #~(modify-phases #$phases
-            (add-after 'install 'install-firmware
+            (add-after 'install 'install-uefi
                 (lambda _
                     (let ((fmw (string-append #$output "/share/qemu")))
                         (mkdir-p fmw)
@@ -38,7 +38,7 @@
         (substitute-keyword-arguments (package-arguments virt-manager)
          ((#:phases phases)
           #~(modify-phases #$phases
-             (add-after 'install 'install-firmware
+             (add-after 'install 'install-uefi
                  (lambda _
                    (let ((fmw (string-append #$output "/share/qemu")))
                      (mkdir-p fmw)