Complete Refactor

1 files changed, 30 insertions, 58 deletions

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" ) ) ) ) ) ) ) )