diff --git a/configs/starship.toml b/configs/starship.toml
new file mode 100644
index 0000000..50df12f
--- /dev/null
+++ b/configs/starship.toml
@@ -0,0 +1,14 @@
+"$schema" = 'https://starship.rs/config-schema.json'
+
+format = '${custom.tztime}$all$directory$character'
+
+add_newline = true # Inserts a blank line between shell prompts
+
+[character]
+success_symbol = '[➜](bold green)'
+error_symbol = "[➜](bold red)"
+
+[custom.tztime]
+command = 'date +"%a %d %b %H:%M%p"'
+when = "true"
+format = '\[$symbol($output)\] (purple)'
diff --git a/machines/MacBookPro12.1-hardware-configuration.nix b/machines/MacBookPro12.1-hardware-configuration.nix
index 861c0ff..072a5bb 100644
--- a/machines/MacBookPro12.1-hardware-configuration.nix
+++ b/machines/MacBookPro12.1-hardware-configuration.nix
@@ -37,4 +37,5 @@
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
+  hardware.opengl.enable = true;
 }
diff --git a/modules/console.nix b/modules/console.nix
index 05f636c..d13201f 100644
--- a/modules/console.nix
+++ b/modules/console.nix
@@ -10,12 +10,16 @@
       vimAlias = true;
     };
     ssh.startAgent = true;
-    starship.enable = true;
+    starship = {
+      enable = true;
+      settings = with builtins; fromTOML (readFile ../configs/starship.toml);
+    };
     zsh = {
       enable = true;
       autosuggestions.enable = true;
       shellAliases = {
-        nixedit = "sudo micro /etc/nixos/configuration.nix";
+        ls = "ls --hyperlink=auto";
+        nixedit = "codium /etc/nixos";
         nixupdate = "sudo nixos-rebuild switch";
         nixclean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc";
       };
diff --git a/modules/desktop.nix b/modules/desktop.nix
index e300ee6..757b522 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -11,7 +11,7 @@ in
   security.rtkit.enable = true;
 
   services = {
-    blueman.enable = true;
+    #blueman.enable = true;
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -38,11 +38,15 @@ in
         khelpcenter
         plasma-browser-integration
       ];
+      desktopManager.gnome.enable = true;
+
       # libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
     };
   };
 
   programs = {
+    # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867
+    ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
     dconf.enable = true;
     firefox.enable = true;
     chromium = {
@@ -83,6 +87,7 @@ in
     (vscode-with-extensions.override {
       vscode = vscodium;
       vscodeExtensions = with vscode-extensions; [
+        ms-ceintl.vscode-language-pack-fr
         mkhl.direnv
         jnoortheen.nix-ide
         dracula-theme.theme-dracula
@@ -101,23 +106,45 @@ in
       enableWideVine = true; # DRM support
     })
     bitwarden
-    chromium
     element-desktop
     filezilla
+    gimp-with-plugins
+    gnome.gnome-tweaks
     inkscape-with-extensions
     inter
-    gimp-with-plugins
+    kitty
+    kitty-themes
     libsForQt5.ark
+    libsForQt5.bismuth
     mattermost-desktop
     nextcloud-client
     signal-desktop
     tdesktop
     thunderbird
     vlc
-    vscodium
+    unstable.hyprland
     unstable.obsidian
   ];
 
+  environment.gnome.excludePackages = (with pkgs; [
+    gnome-photos
+    gnome-tour
+  ]) ++ (with pkgs.gnome; [
+    cheese # webcam tool
+    gnome-music
+    gedit # text editor
+    epiphany # web browser
+    geary # email reader
+    gnome-characters
+    tali # poker game
+    iagno # go game
+    hitori # sudoku game
+    atomix # puzzle game
+    yelp # Help view
+    gnome-contacts
+    gnome-initial-setup
+  ]);
+  
   # Do not restart the display manager automatically
   systemd.services.display-manager.restartIfChanged = lib.mkForce false;
 
diff --git a/modules/home-config.nix b/modules/home-config.nix
index fe8af94..96df9fe 100644
--- a/modules/home-config.nix
+++ b/modules/home-config.nix
@@ -39,15 +39,15 @@
       };
     };
 
-    # programs.git = {
-    #   enable = true;
-    #   userName = "Florian Schmitt";
-    #   userEmail = "mrflos@gmail.com";
-    #   extraConfig = {
-    #     pull.rebase = true;
-    #     init.defaultBranch = "main";
-    #   };
-    # };
+    programs.git = {
+      enable = true;
+      userName = "Florian Schmitt";
+      userEmail = "mrflos@gmail.com";
+      extraConfig = {
+        pull.rebase = true;
+        init.defaultBranch = "main";
+      };
+    };
     
     programs.thunderbird = {
       enable = true;
@@ -55,6 +55,41 @@
         isDefault = true;
       };
     };
+
+
+    gtk = {
+      enable = true;
+
+      iconTheme = {
+        name = "Papirus-Dark";
+        package = pkgs.papirus-icon-theme;
+      };
+
+      theme = {
+        name = "palenight";
+        package = pkgs.palenight-theme;
+      };
+
+      cursorTheme = {
+        name = "Numix-Cursor";
+        package = pkgs.numix-cursor-theme;
+      };
+
+      gtk3.extraConfig = {
+        Settings = ''
+          gtk-application-prefer-dark-theme=1
+        '';
+      };
+
+      gtk4.extraConfig = {
+        Settings = ''
+          gtk-application-prefer-dark-theme=1
+        '';
+      };
+    };
+
+    home.sessionVariables.GTK_THEME = "palenight";
+
   };
 
   users.users.mrflos = {
diff --git a/modules/local-dev.nix b/modules/local-dev.nix
index ec71d53..513c615 100644
--- a/modules/local-dev.nix
+++ b/modules/local-dev.nix
@@ -118,7 +118,9 @@
     (import (fetchTarball https://github.com/cachix/devenv/archive/v0.6.2.tar.gz)).default
     direnv
     docker-compose
+    nodejs
     virt-manager
+    yarn
     zola
   ];
 }
\ No newline at end of file