zsh additions + qol changes (#1)

* flake changes

* hm enable by default, omp home-manager

* zsh plugins

nix/flake.nix

@@ -19,14 +19,17 @@
       hosts = [
         {
           name = "wsl-kumatani";
+          architecture = "x86_64-linux";
           isWSL = true;
         }
         {
           name = "wsl-usahara";
+          architecture = "x86_64-linux";
           isWSL = true;
         }
         {
           name = "tux";
+          architecture = "x86_64-linux";
         }
       ];
     in
@@ -41,7 +44,7 @@
                 hostname = host.name;
               };
             };
-            system = "x86_64-linux";
+            system = host.architecture;
             modules = [
               ./hosts/${host.name}/configuration.nix
               ./modules/default.nix

nix/hosts/tux/configuration.nix

@@ -42,7 +42,6 @@
     nerd-fonts.jetbrains-mono
   ];
 
-  hm.enable = true;
   i3.enable = true;
   kanata.enable = true;
 

nix/hosts/wsl-kumatani/configuration.nix

@@ -16,7 +16,6 @@
   wsl.enable = true;
   wsl.defaultUser = "luca";
   networking.hostName = meta.hostname;
-  hm.enable = true;
   users.users.luca = {
     shell = pkgs.zsh;
     openssh.authorizedKeys.keys = config.authorized_ssh;

nix/hosts/wsl-usahara/configuration.nix

@@ -16,7 +16,6 @@
   wsl.enable = true;
   wsl.defaultUser = "luca";
   networking.hostName = meta.hostname;
-  hm.enable = true;
   users.users.luca = {
     shell = pkgs.zsh;
     openssh.authorizedKeys.keys = config.authorized_ssh;

nix/modules/commonPackages.nix

@@ -14,7 +14,6 @@
       curl
       stow
       gh
-      oh-my-posh
       neovim
       ripgrep
       git

nix/modules/hm.nix

@@ -6,7 +6,9 @@
 }:
 {
   options = {
-    hm.enable = lib.mkEnableOption "enable home-manager";
+    hm.enable = lib.mkEnableOption "enable home-manager" // {
+      default = true;
+    };
   };
 
   config = lib.mkIf config.hm.enable {

nix/users/luca/home.nix

@@ -6,8 +6,9 @@
 
   programs = {
     git = import ./git.nix;
-    zsh = import ./zsh.nix;
+    zsh = import ./zsh.nix { inherit pkgs; };
     tmux = import ./tmux.nix { inherit pkgs; };
+    oh-my-posh = import ./omp.nix;
   };
 
   home.packages = with pkgs; [

nix/users/luca/omp.nix

@@ -0,0 +1,7 @@
+{
+  enable = true;
+  enableZshIntegration = true;
+  settings = builtins.fromTOML (
+    builtins.unsafeDiscardStringContext (builtins.readFile ../../../.config/ohmyposh/zen.toml)
+  );
+}

nix/users/luca/zsh.nix

@@ -1,9 +1,23 @@
+{ pkgs, ... }:
 {
   enable = true;
   enableCompletion = true;
   autosuggestion.enable = true;
+  history.size = 1000;
   envExtra = ''
     . "$HOME/.rokit/env"
-    eval "$(oh-my-posh init zsh -c ~/.config/ohmyposh/zen.toml)"
   '';
+  oh-my-zsh = {
+    enable = true;
+    plugins = [
+      "git"
+    ];
+  };
+  plugins = [
+    {
+      name = "fzf-tab";
+      src = pkgs.zsh-fzf-tab;
+      file = "share/fzf-tab/fzf-tab.plugin.zsh";
+    }
+  ];
 }