zsh :3

Signed-off-by: Alex Stan <alex.stan.2010@proton.me>
flake.lock: Update
2024-11-21 21:33:09 +02:00 · 2024-07-03 11:06:03 +03:00 · 2024-07-02 12:39:40 +03:00
5 changed files with 111 additions and 40 deletions
--- a/flake.lock
+++ b/flake.lock
@ -65,11 +65,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1719245815,
-        "narHash": "sha256-BiDNkoh9a2dx2OTUFpzWhkGq5WfatG7sUX4Kw0Fdo7g=",
+        "lastModified": 1719911417,
+        "narHash": "sha256-1voeH5QpRIxl+JW5eJRYKpYqRQFsKiinMeUJ5ZQCS38=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "b6082d10feac69203dac419818daa47c5fe36464",
+        "rev": "a84a0ab3a00ec3042de1b7f14e910296970f38a2",
        "type": "github"
      },
      "original": {
@ -268,11 +268,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1719104979,
-        "narHash": "sha256-7gcMYBV2uYJyR01ILS6919t9wGGQtC5oTMLFTTEnOhM=",
+        "lastModified": 1719909389,
+        "narHash": "sha256-d6PZ7WpOV+yb4u4P+8vJ+xmRZbZxiQCpjNnqYoUTBQc=",
        "owner": "helix-editor",
        "repo": "helix",
-        "rev": "a982e5ce260e8191a2a24fa62e9e5bdf488bb5d4",
+        "rev": "fc97ecc3e3186b9dfe958869178bdb6b8cd7d8df",
        "type": "github"
      },
      "original": {
@ -289,11 +289,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719180626,
-        "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
+        "lastModified": 1719827439,
+        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
+        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
        "type": "github"
      },
      "original": {
@ -364,11 +364,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1719266290,
-        "narHash": "sha256-Uo5/BVrCzBTJySygnSzGNhb+pQe1YB5GJvMn9ExVIiw=",
+        "lastModified": 1719786368,
+        "narHash": "sha256-cXZ+LLf+fe/HUN4oiI+KAydOdbCzx+gJxwG4x5gE9iw=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "4dd2b5902e770eeaf84820eccfebb5451aedb6a5",
+        "rev": "d7ea1b7785f31e9fd6477490309721a19a835592",
        "type": "github"
      },
      "original": {
@ -445,11 +445,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718804078,
-        "narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=",
+        "lastModified": 1719316102,
+        "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "4f1351295c55a8f51219b25aa4a6497a067989d0",
+        "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
        "type": "github"
      },
      "original": {
@ -470,11 +470,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718119275,
-        "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=",
+        "lastModified": 1719067853,
+        "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "1419520d5f7f38d35e05504da5c1b38212a38525",
+        "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
        "type": "github"
      },
      "original": {
@ -548,11 +548,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719111455,
-        "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
+        "lastModified": 1719832725,
+        "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
+        "rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
        "type": "github"
      },
      "original": {
@ -634,11 +634,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1719145664,
-        "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=",
+        "lastModified": 1719895800,
+        "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e",
+        "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
        "type": "github"
      },
      "original": {
@ -649,11 +649,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1719075281,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "lastModified": 1719690277,
+        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
        "type": "github"
      },
      "original": {
@ -698,11 +698,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1719300525,
-        "narHash": "sha256-pXDgjMu9PlnSPe6mFjmCnLjSZP1voYVJiClIm7Yn/8g=",
+        "lastModified": 1719911046,
+        "narHash": "sha256-GMHbE8MbUK886x26Y/9uAtutxodlhHwfzDRuC6qLxHA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "db4b034aef336492d25f8be92d2a12cbdec0695f",
+        "rev": "8188fcb8f4b2525d89372d044168c6aac458453f",
        "type": "github"
      },
      "original": {
@ -714,11 +714,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1719122173,
-        "narHash": "sha256-aEMsNUtqSPwn6l+LIZ/rX++nCgun3E9M3uSZs6Rwb7w=",
+        "lastModified": 1719663039,
+        "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "906320ae02f769d13a646eb3605a9821df0d6ea2",
+        "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
        "type": "github"
      },
      "original": {
@ -730,11 +730,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1719075281,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "lastModified": 1719690277,
+        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -66,8 +66,9 @@
                    {
                        environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;    
                        nix.nixPath = [ 
-                            "nixpkgs=/etc/nix/inputs/nixpkgs"
-                            "nixos-config=/home/ultra/.nixdotfiles"
+                          "nixpkgs=/etc/nix/inputs/nixpkgs"
+                          "nixos=/etc/nix/inputs/nixpkgs"
+                          "nixos-config=/home/ultra/.nixdotfiles"
                        ];
                    }

--- a/hosts/hermes/configuration.nix
+++ b/hosts/hermes/configuration.nix
@ -127,7 +127,8 @@ in {
      qFlipper
      remmina
    ];
-    shell = pkgs.fish;
+    shell = pkgs.zsh;
+    ignoreShellProgramCheck = true; # I configured zsh with home-manager
  };

  environment.variables = {
@ -197,6 +198,7 @@ in {
  # NVIDIA
  hardware.opengl = {
    enable = true;
+    driSupport32Bit = true;
  };

  services.xserver.videoDrivers = [ "nvidia" ];
--- a/users/ultra/configs/emacs/init.el
+++ b/users/ultra/configs/emacs/init.el
@ -117,3 +117,5 @@

 (add-hook 'prog-mode-hoow 'rainbow-mode)
 
+(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)
+(define-key eshell-mode-map [remap eshell-pcomplete] 'helm-esh-pcomplete)
--- a/users/ultra/home.nix
+++ b/users/ultra/home.nix
@ -61,6 +61,11 @@ let
      geiser
      rainbow-delimiters
      rainbow-mode
+      esh-autosuggest
+      fish-completion
+      steam
+      zone-sl
+      helm
    ];
  });
  helix = inputs.helix.packages.${pkgs.system}.default;
@ -123,7 +128,7 @@ in {
        zoom-us
        google-chrome
        zoxide
-        starship
+        # starship
        atuin
        clang
        (lib.hiPrio gcc)
@ -259,6 +264,7 @@ in {
        (inputs.nix-inst.packages.${pkgs.system}.default)
        dotnet-runtime_6
        tea
+        thefuck
      ];
        file = {
            "emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el;
@ -289,6 +295,66 @@ in {
      };
      home-manager.enable = true;
      # fish.enable = true;
+      zsh = {
+        enable = true;
+        enableCompletion = true;
+        autocd = true;
+        autosuggestion = {
+          enable = true;
+        };
+        syntaxHighlighting = {
+          enable = true;
+        };
+        shellAliases = {
+          cls = "clear";
+          hmup = "nh home switch ~/.nixdotfiles";
+          osup = "nh os switch ~/.nixdotfiles";
+          # emcc = "emacsclient -c";
+        };
+        oh-my-zsh = {
+          enable = true;
+          plugins = [ "git" "thefuck" "history-substring-search" "fzf" ];
+          theme = "cloud";
+        };
+        history = {
+          size = 256 * 1024;
+          path = "${config.xdg.dataHome}/zsh/history";
+          extended = true;
+        };
+        initExtra = ''
+          eval $(thefuck --alias)
+          eval $(starship init zsh)
+        '';
+        zsh-abbr = {
+          enable = true;
+          abbreviations = {
+            emcc = "emacsclient -c";
+            sam = "git commit -sam";
+            hmbk = "home-manager switch --flake ~/.nixdotfiles -b backup";
+          };
+        };
+      };
+
+      zoxide = {
+        enable = true;
+        enableNushellIntegration = true;
+        enableZshIntegration = true;
+      };
+
+      starship = {
+        enable = true;
+        settings = {
+          "$schema" = "https://starship.rs/config-schema.json";
+          add_newline = false;
+          character = {
+           success_symbol = "[➜](bold green)";
+           error_symbol = "[➜](bold red)";
+          };
+          format = ''
+            $directory$git$nodejs$container$sudo$nix_shell$character
+          '';
+        };
+      };

      # Helix config
      helix = {