From ebfdcf5c3a3b2a907fcbdb05116e691cb470b0ba Mon Sep 17 00:00:00 2001
From: MysteryBirb <mysterybirb@noreply.codeberg.org>
Date: Wed, 7 Oct 2026 08:39:59 +0200
Subject: [PATCH] Added system config and updated a few things to guix

---
 bash/.bashrc                   |   4 +-
 guix/.config/guix/channels.scm |  19 ++++++
 guix/.config/guix/system.scm   | 110 +++++++++++++++++++++++++++++++++
 zgit                           |   2 +-
 4 files changed, 132 insertions(+), 3 deletions(-)
 create mode 100644 guix/.config/guix/channels.scm
 create mode 100644 guix/.config/guix/system.scm

diff --git a/bash/.bashrc b/bash/.bashrc
index 6f7b584..81b09aa 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -8,8 +8,8 @@
 export VISUAL=nvim
 export EDITOR=nvim
 
-alias gx="sudoedit /etc/config.scm"
-alias gxsw="sudo guix system reconfigure /etc/config.scm"
+alias gx="nvim /home/$(whoami)/.config/guix/system.scm"
+alias gxsw="sudo guix system reconfigure /home/$(whoami)/.config/guix/system.scm"
 
 alias frep="grep -rnwe"
 
diff --git a/guix/.config/guix/channels.scm b/guix/.config/guix/channels.scm
new file mode 100644
index 0000000..08b3a76
--- /dev/null
+++ b/guix/.config/guix/channels.scm
@@ -0,0 +1,19 @@
+(cons*
+ (channel
+	(name 'mangowm)
+	(url "https://github.com/mangowm/mango.git")
+	(branch "main"))
+
+ (channel
+	(name 'nonguix)
+	(url "https://gitlab.com/nonguix/nonguix")
+	(introduction
+	 (make-channel-introduction
+		"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
+		(openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5"))))
+
+ (channel
+	(name 'guix-minecraft)
+	(url "https://github.com/Blixodus/guix-minecraft.git")
+	(branch "master"))
+	%default-channels)
diff --git a/guix/.config/guix/system.scm b/guix/.config/guix/system.scm
new file mode 100644
index 0000000..9d6279f
--- /dev/null
+++ b/guix/.config/guix/system.scm
@@ -0,0 +1,110 @@
+(use-modules (gnu) (gnu system nss) #|(nongnu packages game-client)|# (mangowm) (minecraft minecraft))
+(use-service-modules ssh networking desktop)
+(use-package-modules bootloaders rust admin wm vim 
+										 fonts terminals version-control librewolf xdisorg 
+										 image image-viewers linux glib 
+										 gnome pulseaudio cinnamon package-management
+										 game-development emacs emacs-xyz kde-systemtools
+										 screen gcc cmake qt
+										 gnome-xyz kde-frameworks kde-plasma nwg-shell
+										 java)
+
+(operating-system
+ (host-name "headlights")
+ (timezone "Europe/Berlin")
+ (locale "en_GB.utf8")
+ (keyboard-layout (keyboard-layout "de"))
+
+ (bootloader (bootloader-configuration
+							(bootloader grub-efi-bootloader)
+							(targets '("/boot/efi"))))
+
+ (file-systems (append (list
+												(file-system
+												 (device "/dev/vda2")
+												 (mount-point "/")
+												 (type "ext4"))
+												(file-system
+												 (device "/dev/vda1")
+												 (mount-point "/boot/efi")
+												 (type "vfat")))
+											 %base-file-systems))
+
+(swap-devices (list
+							 (swap-space
+								(target "/swapfile")
+								(dependencies (filter (file-system-mount-point-predicate "/")
+																			file-systems)))))
+ 
+ (users (cons
+				 (user-account
+					(name "Zoe")
+					(group "users")
+					(supplementary-groups '("wheel" "netdev" "audio" "video")))
+				 %base-user-accounts))
+
+ (packages (append (list
+										;; Base
+										binutils
+										git
+										raylib
+										vim
+										neovim
+										emacs
+										emacs-vterm
+										libvterm
+										rust
+										gcc
+										cmake
+										fzf
+										stow
+										screen
+										btop
+										foot
+										dbus
+										pipewire
+										wireplumber
+										;; "Rice"
+										mangowm-git
+										quickshell
+										swaybg
+										swayimg
+										rofi
+										pavucontrol
+										mako
+										fastfetch
+										hyfetch
+										grim
+										slurp
+										qt6ct
+										qt5ct
+										dolphin
+										nemo
+										;; Icons / Theme
+										guix-icons
+										libadwaita
+										adwaita-icon-theme
+										breeze
+										breeze-gtk
+										breeze-icons
+										oxygen-icons
+										nwg-look
+										;; Fonts
+										gnome-font-viewer
+										font-iosevka
+										font-google-noto
+										font-google-noto-sans-cjk
+										;; Misc
+										prismlauncher
+										openjdk
+										librewolf
+										)
+									 %base-packages))
+
+ (services (append (list
+										(service openssh-service-type)
+										(service dhcpcd-service-type)
+										(service elogind-service-type)
+										(service upower-service-type))
+									 %base-services))
+)
diff --git a/zgit b/zgit
index 6ac34e1..57d4342 100755
--- a/zgit
+++ b/zgit
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This is just to update my git repo a tiny bit faster
 
 usage() { echo "Usage: $0 [-a \"<string>\"] [-s <file>]" 1>&2; exit 1; }