moved zsh and vscode server

configs/common.nix

@@ -1,6 +1,42 @@
 { config, pkgs, lib, ... }:
 
 {
+  imports =
+    [
+      (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master")
+    ];
+
+  services.vscode-server.enable = true;
+
+  programs.zsh = {
+    enable = true;
+
+    enableCompletion = true;
+    autosuggestions.enable = true;
+    syntaxHighlighting.enable = true;
+
+    ohMyZsh = {
+      enable = true;
+      theme = "agnoster";
+      customPkgs = [
+        pkgs.zsh-autosuggestions
+        pkgs.zsh-syntax-highlighting
+        pkgs.zsh-powerlevel10k
+      ];
+      plugins = [
+        "cp"
+        "common-aliases"
+        "docker "
+        "systemd"
+        "wd"
+        "kubectl"
+        "git"
+        # "zsh-autosuggestions"
+        # "zsh-syntax-highlightin"
+      ];
+    };
+  };
+
   boot.tmpOnTmpfs = true;
   environment.systemPackages = with pkgs; [
     ack
@@ -33,6 +69,7 @@
     wget
     zsh
   ];
+
   documentation.enable = false;
   documentation.nixos.enable = false;
   #documentation.man.enable = false;

configs/user.nix

@@ -18,47 +18,35 @@
   home-manager.users.alex = { pkgs, ... }: {
     home.packages = [
       pkgs.cryfs
-      pkgs.cinnamon.nemo
     ];
 
-    dconf.enable = true;
+    # dconf.enable = true;
-    dconf.settings = {
+    # dconf.settings = {
-      "org/gnome/desktop/wm/preferences".titlebar-font = "Liberation Sans Bold 9";
+    #   "org/gnome/desktop/wm/preferences".titlebar-font = "Liberation Sans Bold 9";
-      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+    #   "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-        binding = "<Super>Return";
+    #     binding = "<Super>Return";
-        command = "kitty";
+    #     command = "kitty";
-        name = "kitty";
+    #     name = "kitty";
-      };
-
-      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
-        binding = "<Shift><Super>Return";
-        command = "rofi -show drun";
-        name = "rofi -show drun";
-      };
-
-      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2" = {
-        binding = "<Super>Tab";
-        command = "rofi -show window";
-        name = "rofi -show window";
-      };
-
-      "org/gnome/settings-daemon/plugins/media-keys".custom-keybindings = [
-        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
-        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/"
-      ];
-
-      #   visual-bell = false;
-      #   titlebar-font = "Liberation Sans Bold 9";
     #   };
-      # "org/gnome/mutter" = {
+
-      #   button-mode = "programming";
+    #   "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
-      #   show-thousands = true;
+    #     binding = "<Shift><Super>Return";
-      #   base = 10;
+    #     command = "rofi -show drun";
-      #   word-size = 64;
+    #     name = "rofi -show drun";
-      #   window-position = lib.hm.gvariant.mkTuple [100 100];
+    #   };
+
+    #   "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2" = {
+    #     binding = "<Super>Tab";
+    #     command = "rofi -show window";
+    #     name = "rofi -show window";
+    #   };
+
+    #   "org/gnome/settings-daemon/plugins/media-keys".custom-keybindings = [
+    #     "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+    #     "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
+    #     "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/"
+    #   ];
     # };
-    };
 
     programs = {
       ssh = {

machine/desktop.nix

@@ -112,28 +112,6 @@ in
   # Enable sound.
   sound.enable = true;
 
-  programs.zsh = {
-    enable = true;
-
-    enableCompletion = true;
-    autosuggestions.enable = true;
-    syntaxHighlighting.enable = true;
-
-    ohMyZsh = {
-      enable = true;
-      theme = "agnoster";
-      plugins = [
-        "cp"
-        "common-aliases"
-        "docker "
-        "systemd"
-        "wd"
-        "kubectl"
-        "git"
-      ];
-    };
-  };
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;

machine/homeserver.nix

@@ -6,7 +6,6 @@
       /etc/nixos/hardware-configuration.nix
       ../configs/common.nix
       ../configs/virtualisation.nix
-      (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master")
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -21,33 +20,6 @@
   networking.useDHCP = false;
   networking.interfaces.enp3s0.useDHCP = true;
 
-  programs.zsh = {
-    enable = true;
-
-    enableCompletion = true;
-    autosuggestions.enable = true;
-    syntaxHighlighting.enable = true;
-
-    ohMyZsh = {
-      enable = true;
-      theme = "agnoster";
-      customPkgs = [
-        pkgs.zsh-autosuggestions
-        pkgs.zsh-syntax-highlighting
-        pkgs.zsh-powerlevel10k
-      ];
-      plugins = [
-        "cp"
-        "common-aliases"
-        "docker "
-        "systemd"
-        "wd"
-        "kubectl"
-        "git"
-      ];
-    };
-  };
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users = {
     defaultUserShell = pkgs.zsh;
@@ -146,10 +118,6 @@
   # };
 
   # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.vscode-server.enable = true;
-
   services.openssh.enable = true;
 
   services.netdata.enable = true;

machine/thinkpad.nix

@@ -164,30 +164,6 @@ in
     ];
   };
 
-  programs.zsh = {
-    enable = true;
-
-    enableCompletion = true;
-    autosuggestions.enable = true;
-    syntaxHighlighting.enable = true;
-
-    ohMyZsh = {
-      enable = true;
-      theme = "agnoster";
-      plugins = [
-        "cp"
-        "common-aliases"
-        "docker "
-        "systemd"
-        "wd"
-        "kubectl"
-#        "zsh-autosuggestions"
-#        "zsh-syntax-highlightin"
-        "git"
-      ];
-    };
-  };
-
   environment.systemPackages = with pkgs; [
     nvidia-offload
     xorg.xf86videointel

machine/vps.nix

@@ -6,7 +6,6 @@
       /etc/nixos/hardware-configuration.nix
       ../configs/common.nix
       ../configs/virtualisation.nix
-      (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master")
     ];
 
   # Use the GRUB 2 boot loader.
@@ -20,7 +19,6 @@
   time.timeZone = "Europe/Berlin";
   networking.useDHCP = false;
   networking.interfaces.ens3.useDHCP = true;
-  services.vscode-server.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users = {
@@ -32,28 +30,6 @@
     };
   };
 
-  programs.zsh = {
-    enable = true;
-
-    enableCompletion = true;
-    autosuggestions.enable = true;
-    syntaxHighlighting.enable = true;
-
-    ohMyZsh = {
-      enable = true;
-      theme = "agnoster";
-      plugins = [
-        "cp"
-        "common-aliases"
-        "docker "
-        "systemd"
-        "wd"
-        "kubectl"
-        "git"
-      ];
-    };
-  };
-
   # List packages installed in system profile. To search, run:
   environment.systemPackages = with pkgs; [
     docker-compose