From aaca1164a80c00e6bdda8b2bc8b06f588e92bb19 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Thu, 21 Jul 2022 04:32:01 +0200 Subject: Complete Refactor --- channels.scm | 12 +++---- home-configuration.scm | 88 ++++++++++++++++------------------------------ system-configuration.scm | 90 ++++++++++++++++-------------------------------- 3 files changed, 64 insertions(+), 126 deletions(-) diff --git a/channels.scm b/channels.scm index 9f30b45..7e5a736 100644 --- a/channels.scm +++ b/channels.scm @@ -1,7 +1,5 @@ -%default-channels - -;(list -; (channel -; (branch "trezor-fix") -; (name 'guix) -; (url "file:///home/marek/src/guix"))) +( cons + ( channel + ( name 'jeko ) + ( url "https://framagit.org/Jeko/guix-jeko-channel.git" ) ) + %default-channels ) diff --git a/home-configuration.scm b/home-configuration.scm index 26bd67f..8948d7f 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -1,59 +1,31 @@ -;; This "home-environment" file can be passed to 'guix home reconfigure' -;; to reproduce the content of your profile. This is "symbolic": it only -;; specifies package names. To reproduce the exact same profile, you also -;; need to capture the channels being used, as returned by "guix describe". -;; See the "Replicating Guix" section in the manual. +( use-modules + ( gnu home ) + ( gnu home services shells ) + ( gnu packages ) + ( gnu services ) + ( guix gexp ) ) -(use-modules - (gnu home) - (gnu home services shells) - (gnu packages) - (gnu services) - (guix gexp)) - -(home-environment - (packages - (map - (compose list specification->package+output) - (list - "cpupower" - "dconf-editor" - "evolution" - "font-google-noto" - "git" - "git-lfs" - "gnome-shell-extensions" - "gnome-tweaks" - "gst-plugins-bad" - "gst-plugins-base" - "gst-plugins-good" - "gst-plugins-ugly" - "libreoffice" - "protonvpn-cli" - "pwgen" - "seahorse" - ;"trezor-agent" - ))) - - (services - (list - (service home-bash-service-type - (home-bash-configuration - (environment-variables - '(("EDITOR" . "nano") - ("NVM_DIR" . "$HOME/src/nvm") - ("GUILE_AUTO_COMPILE" . "1"))) - - (aliases - '(("grep" . "grep --color=auto") - ("ll" . "ls -l") - ("ls" . "ls -p --color=auto"))) - - (bash-profile - (list - (local-file "/home/marek/src/guix-config/.bash_profile" "bash_profile"))) - - (bashrc - (list - (local-file "/home/marek/src/guix-config/.bashrc" "bashrc") - (local-file "/home/marek/src/guix-config/nvm_init" "nvm_init")))))))) +( home-environment + ( packages + ( map + ( compose list specification->package+output ) + ( list "cpupower" "dconf-editor" "font-google-noto" "git" "git-lfs" "gnome-tweaks" "libreoffice" "pwgen" "seahorse" "trezor-agent" ) ) ) + ( services + ( list + ( service home-bash-service-type + ( home-bash-configuration + ( environment-variables + '(( "EDITOR" . "nano" ) + ( "NVM_DIR" . "$HOME/src/nvm" ) + ( "GUILE_AUTO_COMPILE" . "0" ) ) ) + ( aliases + '(( "grep" . "grep --color=auto" ) + ( "ll" . "ls -l" ) + ( "ls" . "ls -p --color=auto" ) ) ) + ( bash-profile + ( list + ( local-file "/home/marek/src/guix-config/.bash_profile" "bash_profile" ) ) ) + ( bashrc + ( list + ( local-file "/home/marek/src/guix-config/.bashrc" "bashrc" ) + ( local-file "/home/marek/src/guix-config/nvm_init" "nvm_init" ) ) ) ) ) ) ) ) diff --git a/system-configuration.scm b/system-configuration.scm index 5e4e148..38091a3 100644 --- a/system-configuration.scm +++ b/system-configuration.scm @@ -1,72 +1,41 @@ -;; This is an operating system configuration generated -;; by the graphical installer. +( use-modules ( gnu ) ) -( use-modules - ( gnu ) ) - -( use-service-modules - cups - desktop - networking - ssh - xorg ) - -( define keyboard-layouts ( keyboard-layout "pl" ) ) - -( define user-accounts - ( cons* - ( user-account - ( name "marek" ) - ( comment "Marek Paśnikowski" ) - ( group "users" ) - ( home-directory "/home/marek" ) - ( supplementary-groups - '("wheel" - "netdev" - "audio" - "video" ) ) ) - %base-user-accounts ) ) - -( define package-list - ( append - ( map - ( compose list specification->package+output ) - ( list - "nss-certs" - "trezord" - "trezord-udev-rules" ) ) - %base-packages ) ) - -( define service-list - ( append - ( list - ( service cups-service-type ) - ( service openssh-service-type ) - ( service gnome-desktop-service-type ) - ( set-xorg-configuration - ( xorg-configuration - ( keyboard-layout keyboard-layouts ) ) ) ) - %desktop-services ) ) +( use-service-modules cups desktop networking ssh xorg ) ( operating-system ( locale "pl_PL.utf8" ) ( timezone "Europe/Warsaw" ) - ( keyboard-layout keyboard-layouts ) + ( keyboard-layout ( keyboard-layout "pl" ) ) ( host-name "aisaka" ) - ( users user-accounts ) - ( packages package-list ) - ( services service-list ) + ( users + ( cons* + ( user-account + ( name "marek" ) + ( comment "Marek Paśnikowski" ) + ( group "users" ) + ( home-directory "/home/marek" ) + ( supplementary-groups '( "wheel" "netdev" "audio" "video" ) ) ) + %base-user-accounts ) ) + ( packages + ( append + ( map + ( compose list specification->package+output ) + ( list "guile-spec" "nss-certs" "trezord" "trezord-udev-rules" ) ) + %base-packages ) ) + ( services + ( append + ( list + ( service cups-service-type ) + ( service openssh-service-type ) + ( service gnome-desktop-service-type ) + ( set-xorg-configuration ( xorg-configuration ( keyboard-layout keyboard-layout ) ) ) ) + %desktop-services ) ) ( bootloader ( bootloader-configuration ( bootloader grub-bootloader ) - ( targets - ( list "/dev/sda" ) ) + ( targets ( list "/dev/sda" ) ) ( keyboard-layout keyboard-layout ) ) ) - ( swap-devices - ( list - ( swap-space - ( target - ( uuid "73bed3f9-be07-40ad-a228-577cd24f2e1d" ) ) ) ) ) + ( swap-devices ( list ( swap-space ( target ( uuid "73bed3f9-be07-40ad-a228-577cd24f2e1d" ) ) ) ) ) ( mapped-devices ( list ( mapped-device @@ -83,7 +52,6 @@ ( dependencies mapped-devices ) ) ( file-system ( mount-point "/boot" ) - ( device - ( uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587" 'ext4 ) ) + ( device ( uuid "4f77b5fc-56ad-43ae-b6ec-e5adc8c48587" 'ext4 ) ) ( type "ext4" ) ) %base-file-systems ) ) ) -- cgit v1.2.3