configs/thilo-laptop/home.nix

@@ -16,7 +16,7 @@
         isGraphical = true;
       };
 
-      home.pointerCursor = {
+      xsession.pointerCursor = {
         name = "Bibata-Modern-Classic";
         package = pkgs.bibata-cursors;
         size = 28;

configs/thilo-laptop/nixos.nix

@@ -30,6 +30,7 @@
       enable = true;
       displayManager.sddm.enable = true;
       displayManager.defaultSession = "plasma";
+      desktopManager.plasma6.enable = true;
       xkb = {
         variant = "";
         layout = "us";
@@ -41,7 +42,6 @@
     };
     blueman.enable = true;
     fwupd.enable = true;
-    desktopManager.plasma6.enable = true;
   };
 
   programs.kdeconnect.enable = true;

home-manager/modules/machine.nix

@@ -1,7 +1,6 @@
 { lib, pkgs, config, ... }:
 with lib; {
   imports = [
-    ./../programs/atuin.nix
     ./../programs/alacritty.nix
     ./../programs/bat.nix
     ./../programs/beets.nix
@@ -22,7 +21,6 @@ with lib; {
     ./../programs/mpv.nix
     ./../programs/syncthing.nix
     ./../programs/hstr.nix
-    ./../programs/thefuck.nix
     ./../../nix.nix
     ./packages.nix
   ];

home-manager/modules/packages.nix

@@ -65,6 +65,7 @@ in {
         inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
         inputs.dagger.packages.x86_64-linux.dagger
         unzip
+        gh
         nil
         nixd
         unrar

home-manager/programs/atuin.nix

@@ -1,3 +0,0 @@
-{
-  programs.atuin = { enable = true; };
-}

home-manager/programs/git.nix

@@ -28,7 +28,4 @@
     };
   };
   programs.git-credential-oauth = { enable = true; };
-  programs.gh.enable = true;
-  programs.gh-dash.enable = true;
-  programs.lazygit.enable = true;
 }

home-manager/programs/thefuck.nix

@@ -1,3 +0,0 @@
-{
-  programs.thefuck = { enable = true; };
-}

home-manager/programs/zsh.nix

@@ -1,6 +1,25 @@
 { pkgs, ... }:
-
-{
+let
+  omz-plugins = [
+    "git"
+    "archlinux"
+    "composer"
+    "colored-man-pages"
+    "extract"
+    "gradle"
+    "node"
+    "npm"
+    "rbenv"
+    "sudo"
+    "direnv"
+    "docker"
+    "docker-compose"
+    "golang"
+    "pip"
+    "history"
+    "vagrant"
+  ];
+in {
   programs.zsh = {
     enable = true;
     autosuggestion.enable = true;
@@ -17,22 +36,18 @@
       undo-git-reset-head = "git reset 'HEAD@{1}'";
       update-local = "bash $HOME/.dotfiles/install";
     };
+    zplug = {
+      enable = true;
+      plugins = map (x: {
+        name = "plugins/${x}";
+        tags = [ "from:oh-my-zsh" ];
+      }) omz-plugins;
+    };
     initExtra = ''
+      eval $(${pkgs.thefuck}/bin/thefuck --alias)
       [ -d ~/.npm-global ] || mkdir ~/.npm-global
       ${pkgs.nodejs}/bin/npm config set prefix '~/.npm-global'
       export PATH=~/.npm-global/bin:$PATH
     '';
-    plugins = [
-      {
-        name = "zsh-nix-shell";
-        file = "nix-shell.plugin.zsh";
-        src = pkgs.fetchFromGitHub {
-          owner = "chisui";
-          repo = "zsh-nix-shell";
-          rev = "v0.8.0";
-          sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-        };
-      }
-    ];
   };
 }