diff --git a/Droidnix/README.org b/Droidnix/README.org
index a2efe8156..19dc758ee 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1773,87 +1773,99 @@ This sets up the emacs terminal
 { pkgs, ... }:
 
 {
-  programs.emacs = {
-    enable = true;
-    package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+  # NixOS Configuration
+  environment.systemPackages = with pkgs; [
+    # Add system-wide packages here, if any
+  ];
 
-    # Group related packages for clarity and easier maintenance
-    extraPackages = epkgs: with epkgs; [
-      # Tree-sitter and language support
-      manualPackages.treesit-grammars.with-all-grammars
-      rust-mode
-      rustic
-      nix-mode
-      hcl-mode
+  # Home Manager Configuration for the user 'henrov'
+  home-manager.users.henrov = {
+    programs.emacs = {
+      enable = true;
+      package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
 
-      # UI/UX and navigation
-      nerd-icons
-      doom-modeline
-      diminish
-      eldoc
-      eldoc-box
-      pulsar
-      which-key
-      avy
-      consult
-      vertico
-      marginalia
-      crux
-      shell-pop
+      # Group related packages for clarity and easier maintenance
+      extraPackages = epkgs: with epkgs; [
+        # Tree-sitter and language support
+        manualPackages.treesit-grammars.with-all-grammars
+        rust-mode
+        rustic
+        nix-mode
+        hcl-mode
 
-      # Completion and snippets
-      nerd-icons-corfu
-      corfu
-      cape
-      orderless
-      yasnippet
-      yasnippet-snippets
+        # UI/UX and navigation
+        nerd-icons
+        doom-modeline
+        diminish
+        eldoc
+        eldoc-box
+        pulsar
+        which-key
+        avy
+        consult
+        vertico
+        marginalia
+        crux
+        shell-pop
 
-      # Utilities and tools
-      rg
-      exec-path-from-shell
-      eat
-      f
-      gptel
-      nixpkgs-fmt
-      envrc
+        # Completion and snippets
+        nerd-icons-corfu
+        corfu
+        cape
+        orderless
+        yasnippet
+        yasnippet-snippets
 
-      # Theming
-      catppuccin-theme
+        # Utilities and tools
+        rg
+        exec-path-from-shell
+        eat
+        f
+        gptel
+        nixpkgs-fmt
+        envrc
 
-      # Git
-      magit
+        # Theming
+        catppuccin-theme
 
-      # Editing and workflow
-      expreg
-      vundo
-      puni
+        # Git
+        magit
 
-      # Error and side panel support
-      sideline
-      sideline-flymake
-      sideline-eglot
-    ];
-  };
+        # Editing and workflow
+        expreg
+        vundo
+        puni
 
-  # Home Manager session variables
-  home.sessionVariables = {
-    EDITOR = "emacs";
-    XDG_SCREENSHOTS_DIR = "~/screenshots";
-  };
-
-  # Home Manager file management
-  home.file = {
-    "emacs/early-init.el" = {
-      source = ./early-init.el;
-      target = ".emacs.d/early-init.el";
+        # Error and side panel support
+        sideline
+        sideline-flymake
+        sideline-eglot
+      ];
     };
-    "emacs/init.el" = {
-      source = ./init.el;
-      target = ".emacs.d/init.el";
+
+    # Home Manager session variables
+    home.sessionVariables = {
+      EDITOR = "emacs";
+      XDG_SCREENSHOTS_DIR = "~/screenshots";
+    };
+
+    # Home Manager file management
+    home.file = {
+      "emacs/early-init.el" = {
+        source = ./early-init.el;
+        target = ".emacs.d/early-init.el";
+      };
+      "emacs/init.el" = {
+        source = ./init.el;
+        target = ".emacs.d/init.el";
+      };
     };
   };
+
+  # If you need additional services or system configurations, add them here
+  services.nextcloud-client.enable = true;
 }
+
 #+END_SRC
 
 ** =generated/system/applications/terminal_shell/early-init.el=
diff --git a/Droidnix/generated/system/applications/terminal_shell/emacs.nix b/Droidnix/generated/system/applications/terminal_shell/emacs.nix
index 4fc67ae3c..95ab5dfc7 100644
--- a/Droidnix/generated/system/applications/terminal_shell/emacs.nix
+++ b/Droidnix/generated/system/applications/terminal_shell/emacs.nix
@@ -1,84 +1,95 @@
 { pkgs, ... }:
 
 {
-  programs.emacs = {
-    enable = true;
-    package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
+  # NixOS Configuration
+  environment.systemPackages = with pkgs; [
+    # Add system-wide packages here, if any
+  ];
 
-    # Group related packages for clarity and easier maintenance
-    extraPackages = epkgs: with epkgs; [
-      # Tree-sitter and language support
-      manualPackages.treesit-grammars.with-all-grammars
-      rust-mode
-      rustic
-      nix-mode
-      hcl-mode
+  # Home Manager Configuration for the user 'henrov'
+  home-manager.users.henrov = {
+    programs.emacs = {
+      enable = true;
+      package = pkgs.emacs-pgtk.override { withTreeSitter = true; };
 
-      # UI/UX and navigation
-      nerd-icons
-      doom-modeline
-      diminish
-      eldoc
-      eldoc-box
-      pulsar
-      which-key
-      avy
-      consult
-      vertico
-      marginalia
-      crux
-      shell-pop
+      # Group related packages for clarity and easier maintenance
+      extraPackages = epkgs: with epkgs; [
+        # Tree-sitter and language support
+        manualPackages.treesit-grammars.with-all-grammars
+        rust-mode
+        rustic
+        nix-mode
+        hcl-mode
 
-      # Completion and snippets
-      nerd-icons-corfu
-      corfu
-      cape
-      orderless
-      yasnippet
-      yasnippet-snippets
+        # UI/UX and navigation
+        nerd-icons
+        doom-modeline
+        diminish
+        eldoc
+        eldoc-box
+        pulsar
+        which-key
+        avy
+        consult
+        vertico
+        marginalia
+        crux
+        shell-pop
 
-      # Utilities and tools
-      rg
-      exec-path-from-shell
-      eat
-      f
-      gptel
-      nixpkgs-fmt
-      envrc
+        # Completion and snippets
+        nerd-icons-corfu
+        corfu
+        cape
+        orderless
+        yasnippet
+        yasnippet-snippets
 
-      # Theming
-      catppuccin-theme
+        # Utilities and tools
+        rg
+        exec-path-from-shell
+        eat
+        f
+        gptel
+        nixpkgs-fmt
+        envrc
 
-      # Git
-      magit
+        # Theming
+        catppuccin-theme
 
-      # Editing and workflow
-      expreg
-      vundo
-      puni
+        # Git
+        magit
 
-      # Error and side panel support
-      sideline
-      sideline-flymake
-      sideline-eglot
-    ];
-  };
+        # Editing and workflow
+        expreg
+        vundo
+        puni
 
-  # Home Manager session variables
-  home.sessionVariables = {
-    EDITOR = "emacs";
-    XDG_SCREENSHOTS_DIR = "~/screenshots";
-  };
-
-  # Home Manager file management
-  home.file = {
-    "emacs/early-init.el" = {
-      source = ./early-init.el;
-      target = ".emacs.d/early-init.el";
+        # Error and side panel support
+        sideline
+        sideline-flymake
+        sideline-eglot
+      ];
     };
-    "emacs/init.el" = {
-      source = ./init.el;
-      target = ".emacs.d/init.el";
+
+    # Home Manager session variables
+    home.sessionVariables = {
+      EDITOR = "emacs";
+      XDG_SCREENSHOTS_DIR = "~/screenshots";
+    };
+
+    # Home Manager file management
+    home.file = {
+      "emacs/early-init.el" = {
+        source = ./early-init.el;
+        target = ".emacs.d/early-init.el";
+      };
+      "emacs/init.el" = {
+        source = ./init.el;
+        target = ".emacs.d/init.el";
+      };
     };
   };
+
+  # If you need additional services or system configurations, add them here
+  services.nextcloud-client.enable = true;
 }