before update

Czichy · Feb 28, 2025 · 47c2056 · 47c2056
1 parent 0d05fbe
commit 47c2056
Show file tree

Hide file tree

Showing 12 changed files with 622 additions and 47 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -184,10 +184,10 @@
     power-meter = {
       url = "github:czichy/power-meter";
     };
-    # zen-browser = {
-    #   url = "github:fufexan/zen-browser-flake";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    zen-browser = {
+      url = "github:0xc000022070/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   # NOTE Here you can add additional binary cache substituers that you trust.

diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
@@ -33,9 +33,11 @@ in {
 
     # -- programs --
     programs_bitwarden = importApply ./programs/bitwarden.nix {inherit localFlake;};
+
     programs_browsers_firefox = importApply ./programs/browsers/firefox {inherit localFlake;};
     programs_browsers_vivaldi = importApply ./programs/browsers/vivaldi.nix {inherit localFlake;};
     # programs_browsers_zen = importApply ./programs/browsers/zen-browser {inherit localFlake;};
+
     programs_btop = importApply ./programs/btop.nix {inherit localFlake;};
     programs_tmux = importApply ./programs/tmux.nix {inherit localFlake;};
     programs_zellij = importApply ./programs/zellij.nix {inherit localFlake;};
@@ -56,8 +58,11 @@ in {
     programs_newsboat = importApply ./programs/newsboat.nix {inherit localFlake;};
     programs_pywal = importApply ./programs/pywal.nix {inherit localFlake;};
     programs_ragenix = importApply ./programs/ragenix.nix {inherit localFlake inputs;};
+
     programs_shells_zsh = importApply ./programs/shells/zsh {inherit localFlake;};
     programs_shells_nushell = importApply ./programs/shells/nushell {inherit localFlake;};
+    programs_shells_fish = importApply ./programs/shells/fish {inherit localFlake;};
+
     programs_ssh = importApply ./programs/ssh.nix {
       inherit secretsPath pubkeys;
       inherit localFlake;

diff --git a/modules/home-manager/profiles/graphical-hyprland/default.nix b/modules/home-manager/profiles/graphical-hyprland/default.nix
@@ -93,35 +93,7 @@ in {
         noto-fonts # noto fonts: great for fallbacks
         noto-fonts-extra
         noto-fonts-cjk-sans
-
-        # (pkgs.rustPlatform.buildRustPackage rec {
-        #   pname = "swayosd";
-        #   version = "5c2176ae6a01a18fdc2b0f5d5f593737b5765914";
-
-        #   src = pkgs.fetchFromGitHub {
-        #     owner = "ErikReider";
-        #     repo = pname;
-        #     rev = version;
-        #     hash = "sha256-rh42J6LWgNPOWYLaIwocU1JtQnA5P1jocN3ywVOfYoc=";
-        #   };
-
-        #   cargoSha256 = "f/MaNADm/jkEqofd5ixQBcsPr3mjt4qTMRrr0A0J5sI=";
-
-        #   nativeBuildInputs = with pkgs; [pkg-config];
-        #   buildInputs = with pkgs; [
-        #     glib
-        #     atk
-        #     gtk3
-        #     gtk-layer-shell
-        #     pulseaudio
-        #   ];
-
-        #   meta = with lib; {
-        #     description = "A GTK based on screen display for keyboard shortcuts like caps-lock and volume";
-        #     homepage = "https://github.com/ErikReider/SwayOSD";
-        #     license = licenses.gpl3;
-        #   };
-        # })
+        swayosd
       ];
 
       fonts.fontconfig.enable = _ true;

diff --git a/modules/home-manager/profiles/headless.nix b/modules/home-manager/profiles/headless.nix
@@ -48,8 +48,9 @@ in {
         profiles.minimal.enable = _ true;
 
         programs = {
-          shells.nushell.enable = _ true;
-          starship.enable = _ true;
+          # shells.nushell.enable = _ true;
+          shells.fish.enable = _ true;
+          # starship.enable = _ true;
           editors.helix.enable = _ true;
           file-managers.yazi.enable = _ true;
 

diff --git a/modules/home-manager/programs/shells/fish/bindings.nix b/modules/home-manager/programs/shells/fish/bindings.nix
@@ -0,0 +1,28 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  useHelix = config.programs.helix.enable;
+in {
+  programs.fish = {
+    interactiveShellInit = ''
+      fish_vi_key_bindings
+      ${lib.optionalString useHelix "fish_helix_key_bindings"}
+      set fish_cursor_default     block      blink
+      set fish_cursor_insert      line       blink
+      set fish_cursor_replace_one underscore blink
+      set fish_cursor_visual      block
+    '';
+    plugins = lib.optional useHelix {
+      name = "fish-helix";
+      src = pkgs.fetchFromGitHub {
+        owner = "sshilovsky";
+        repo = "fish-helix";
+        rev = "8a5c7999ec67ae6d70de11334aa888734b3af8d7";
+        hash = "sha256-04cL9/m5v0/5dkqz0tEqurOY+5sDjCB5mMKvqgpV4vM=";
+      };
+    };
+  };
+}