diff --git a/guix-config/channels-lock.scm b/guix-config/channels-lock.scm
index 725d3aa..e1898f2 100644
--- a/guix-config/channels-lock.scm
+++ b/guix-config/channels-lock.scm
@@ -3,7 +3,7 @@
         (url "https://git.guix.gnu.org/guix.git")
         (branch "master")
         (commit
-          "7c7bad305a66da1e83299ce7fa2e96c803667d0a")
+          "d644ca904bca9c67ee83594f607ed7ad79aa5961")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
diff --git a/guix-config/home/prompt.sh b/guix-config/home/prompt.sh
index a721cd7..eba4b3c 100644
--- a/guix-config/home/prompt.sh
+++ b/guix-config/home/prompt.sh
@@ -1 +1 @@
-export PS1='\[\033[38;2;166;227;161m\]\u\[\033[0m\]@\[\033[38;2;137;180;250m\]\h\[\033[0m\]:\[\033[38;2;249;226;175m\]\w${GUIX_ENVIRONMENT:+ [env]}\[\033[0m\]\[\033[38;2;222;221;218m\]   \[\033[0m\]'
+export PS1='\[\033[38;2;166;227;161m\]\u\[\033[0m\]@\[\033[38;2;137;180;250m\]\h\[\033[0m\]:\[\033[38;2;249;226;175m\]\w${GUIX_ENVIRONMENT:+ [env]}\[\033[0m\]\[\033[38;2;222;221;218m\] λ \[\033[0m\]'
diff --git a/guix-config/home/services/flatpak.scm b/guix-config/home/services/flatpak.scm
index 49e4019..7793dea 100644
--- a/guix-config/home/services/flatpak.scm
+++ b/guix-config/home/services/flatpak.scm
@@ -1,7 +1,6 @@
 (define-module (guix-config home services flatpak)
   #:use-module (gnu home services)
   #:use-module (gnu home services utils)
-  #:use-module (gnu home services shells)
   #:use-module (gnu services)
   #:use-module (gnu packages package-management)
   #:use-module (guix gexp)
@@ -44,13 +43,29 @@
          (run (string-append "flatpak install -y --user " app)))
        '#$(home-flatpak-configuration-apps config))))
 
-(define (home-flatpak-env config)
-   (home-bash-extension
-    (bashrc
-     (list
-      (file-append (home-flatpak-configuration-flatpak-package config)
-                                      "/etc/profile.d/flatpak.sh")))))
+(define (home-flatpak-service config)
+  (list
+   ;; 1. Ensure flatpak installed
+   (simple-service
+    'flatpak-packages
+    home-profile-service-type
+    (list (home-flatpak-configuration-flatpak-package config)))
 
+   ;; 2. Add flatpak apps to XDG_DATA_DIRS
+   ;; https://forum.systemcrafters.net/t/gnome-software-center-flatpak-support/1702/3
+   (simple-service 
+    'flatpak-env
+    home-shell-profile-service-type
+    (list (local-file
+           (string-append (getenv "HOME") "/.guix-profile/etc/profile.d/flatpak.sh")
+           "flatpak.sh")))
+
+
+   ;; 3. Activation phase
+   (simple-service
+    'flatpak-activation
+    home-activation-service-type
+    (home-flatpak-activation config))))
 
 (define home-flatpak-service-type
   (service-type
@@ -58,8 +73,6 @@
    (extensions
     (list (service-extension home-profile-service-type
                              (compose list home-flatpak-configuration-flatpak-package))
-	  (service-extension home-bash-service-type
-			     home-flatpak-env)
           (service-extension home-activation-service-type
                              home-flatpak-activation)))
    (default-value (home-flatpak-configuration))
diff --git a/guix-config/home/workstation.scm b/guix-config/home/workstation.scm
index 01b67a5..ecfc6a6 100644
--- a/guix-config/home/workstation.scm
+++ b/guix-config/home/workstation.scm
@@ -30,7 +30,6 @@
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages monitoring)
   #:use-module (gnu packages video)
-  #:use-module (gnu packages texlive)
   #:use-module (gnu services)
   #:use-module (guix gexp)
   #:use-module (gnu home services shells)
@@ -48,7 +47,6 @@
   #:use-module (gnu packages gimp)
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages wm)
-  #:use-module (gnu packages dns)
 )
 
 (define tune 
@@ -58,8 +56,6 @@
  ;; Below is the list of packages that will show up in your
  ;; Home profile, under ~/.guix-home/profile.
  (packages (list git
-		 texlive
-		 libnotify
 		 kitty
 		 btop
 		 fastfetch
@@ -84,8 +80,6 @@
 		 nautilus
 		 dankmaterialshell
 		 secretsd
-		 `(,isc-bind "utils") ;; dig for dns
-		 inetutils
 		 xournalpp))
 
  ;; Below is the list of Home services.  To search for available
@@ -122,9 +116,9 @@
                          (home-dotfiles-configuration
                           (directories '("../../files"))))
 		;(service home-secretsd-service-type)
-		(service home-flatpak-service-type
-			 (home-flatpak-configuration
-			  (apps '("io.ente.photos"))))
+		;(service home-flatpak-service-type
+		;	 (home-flatpak-configuration
+		;	  (apps '("in.cinny.Cinny"))))
 		(service home-emacs-service-type
 			 (home-emacs-configuration
 			  (emacs (tune guixmacs))
diff --git a/guix-config/system/anaconda.scm b/guix-config/system/anaconda.scm
index 8c63a0f..995a071 100644
--- a/guix-config/system/anaconda.scm
+++ b/guix-config/system/anaconda.scm
@@ -1,19 +1,10 @@
 (define-module (guix-config system anaconda)
   #:use-module (gnu)
-  #:use-module (guix transformations)
-  #:use-module (guix packages)
-  #:use-module (gnu packages linux)
   #:use-module (guix-config system base-system))
 
-(define tune 
-  (options->transformation '((tune . "alderlake"))))
-
 (operating-system 
  (inherit base-system)
   (host-name "anaconda")
-  (kernel (tune (package
-		 (inherit linux-libre)
-		 (properties '((tunable? . #t))))))
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)
                 (targets (list "/boot/efi"))