flake.lock

@@ -1143,8 +1143,7 @@
         "persist-retro": "persist-retro",
         "prism": "prism",
         "snowfall-lib": "snowfall-lib_2",
-        "sops-nix": "sops-nix",
+        "sops-nix": "sops-nix"
-        "yazi-flavors": "yazi-flavors"
       }
     },
     "snowfall-lib": {
@@ -1414,22 +1413,6 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
-    },
-    "yazi-flavors": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1713617364,
-        "narHash": "sha256-gT3aMiBspYypkMdx1TDVwElK7aotolE1JJuJtkC9RRc=",
-        "owner": "yazi-rs",
-        "repo": "flavors",
-        "rev": "55e4bf55fb07b41927a9dd3528a4fa1b269531af",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yazi-rs",
-        "repo": "flavors",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -20,11 +20,6 @@
       flake = false;
     };
 
-    yazi-flavors = {
-      url = "github:yazi-rs/flavors";
-      flake = false;
-    };
-
     nix-matlab.url = "gitlab:doronbehar/nix-matlab";
     nix-matlab.inputs.nixpkgs.follows = "nixpkgs";
 

homes/x86_64-linux/julian@aspi/default.nix

@@ -32,8 +32,7 @@
     };
     topgrade.enable = true;
     neovim.enable = true;
-    kitty.enable = true;
+    alacritty.enable = true;
-    yazi.enable = true;
     emacs.enable = true;
 
     i3.enable = true;

modules/home/alacritty/alacritty.toml

@@ -1,3 +1,8 @@
 import = [
     "~/.config/alacritty/theme/themes/smoooooth.toml"
 ]
+
+# [[keyboard.bindings]]
+# chars = "fzf-z \r"
+# key = "Z"
+# mods = "Control"

modules/home/fish/default.nix

@@ -40,10 +40,12 @@ in
 
     home.shellAliases = {
       g = "git status";
+      fd = "fd -HI";
       ls = "ls --color";
       la = "ls -Alh --color";
       grep = "grep --color";
       conf = "edit-config";
+      c = "fzf-z";
     };
 
     programs.starship = {
@@ -56,7 +58,18 @@ in
 
       interactiveShellInit = "set fish_greeting"; # Disable default greeting
 
+      plugins = [
+        {
+          name = "z";
+          src = pkgs.fishPlugins.z.src;
+        }
+      ];
+
       functions = {
+        fzf-z = ''
+          set dir $(z --list | fzf --tiebreak=index | sed -E 's/^[0-9\.]+[[:space:]]+//')
+          cd $dir
+        '';
         mkcd = ''
           mkdir $argv
           cd $argv

modules/home/i3/default.nix

@@ -43,7 +43,6 @@ in
     home.packages = with pkgs; [
       nitrogen
       xfce.xfce4-screenshooter
-      pulseaudio # For pactl commands
     ];
     xsession.enable = true; # Give gui programs access to sessionVariables
     # Prevent screen from going blank (check these settings with `xset q`)

modules/home/i3/i3/config

@@ -29,7 +29,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec $TERMINAL
+bindsym $mod+Return exec alacritty
 
 # kill focused window
 bindsym $mod+Shift+q kill

modules/home/kitty/default.nix

@@ -1,51 +0,0 @@
-{
-  # Snowfall Lib provides a customized `lib` instance with access to your flake's library
-  # as well as the libraries available from your flake's inputs.
-  lib,
-  # An instance of `pkgs` with your overlays and packages applied is also available.
-  pkgs,
-  # You also have access to your flake's inputs.
-  inputs,
-
-  # Additional metadata is provided by Snowfall Lib.
-  system, # The system architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
-  format, # A normalized name for the system target (eg. `iso`).
-  virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
-  systems, # An attribute map of your defined hosts.
-
-  # All other arguments come from the module system.
-  config,
-  ...
-}:
-
-let
-  cfg = config.modules.kitty;
-in
-{
-  options.modules.kitty = {
-    enable = lib.mkOption { default = false; };
-  };
-
-  config = lib.mkIf cfg.enable {
-    programs.kitty = {
-      enable = true;
-      shellIntegration.enableFishIntegration = true;
-      theme = "Catppuccin-Mocha";
-      settings = {
-        enable_audo_bell = false;
-        confirm_os_window_close = 0; # disabled
-      };
-      font = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-        size = 12;
-      };
-    };
-    home.shellAliases = {
-      y = "ya"; # Yazi shell wrapper (cd on quit)
-    };
-
-    systemd.user.sessionVariables.TERMINAL = "kitty";
-  };
-}

modules/home/nix-helper/default.nix

@@ -32,11 +32,6 @@ in
       FLAKE = "/home/julian/.dotfiles";
     };
 
-    home.shellAliases = {
-      "os" = "nh os switch";
-      "hs" = "nh home switch";
-    };
-
     home.packages = with pkgs; [ nh ];
   };
 }

modules/home/yazi/default.nix

@@ -1,111 +0,0 @@
-{
-  # Snowfall Lib provides a customized `lib` instance with access to your flake's library
-  # as well as the libraries available from your flake's inputs.
-  lib,
-  # An instance of `pkgs` with your overlays and packages applied is also available.
-  pkgs,
-  # You also have access to your flake's inputs.
-  inputs,
-
-  # Additional metadata is provided by Snowfall Lib.
-  system, # The system architecture for this host (eg. `x86_64-linux`).
-  target, # The Snowfall Lib target for this system (eg. `x86_64-iso`).
-  format, # A normalized name for the system target (eg. `iso`).
-  virtual, # A boolean to determine whether this system is a virtual target using nixos-generators.
-  systems, # An attribute map of your defined hosts.
-
-  # All other arguments come from the module system.
-  config,
-  ...
-}:
-
-let
-  cfg = config.modules.yazi;
-in
-{
-  options.modules.yazi = {
-    enable = lib.mkOption { default = false; };
-  };
-
-  config = lib.mkIf cfg.enable {
-    programs.zoxide.enable = true;
-    programs.zoxide.enableFishIntegration = true;
-
-    home.packages = with pkgs; [
-      exiftool
-      unar # extract archives
-      xdragon # dragndrop
-      poppler_utils # pdf preview
-      fd
-      ripgrep
-      fzf
-      jq # json preview
-      ffmpegthumbnailer
-      xclip
-    ];
-    programs.yazi.enable = true;
-    programs.yazi.enableFishIntegration = true;
-    programs.yazi.settings.manager = {
-      sort_by = "modified";
-      sort_reverse = true;
-      show_hidden = true;
-    };
-
-    programs.yazi.keymap = {
-      manager.prepend_keymap = [
-        # Override defaults
-        {
-          on = [ "e" ];
-          run = ''shell --orphan --confirm "thunar &"'';
-          desc = "Open gui file manager";
-        }
-        {
-          on = [ "<C-o>" ];
-          run = ''shell "$SHELL" --block --confirm'';
-          desc = "Open shell here";
-        }
-        {
-          on = [ "<C-n>" ];
-          run = ''shell 'dragon -x -i -T "$1"' --confirm'';
-          desc = "Dragndrop via dragon";
-        }
-        {
-          on = [ "<Enter>" ];
-          run = "plugin --sync smart-enter";
-          desc = "Enter the child directory, or open the file";
-        }
-      ];
-      input.prepend_keymap = [
-        {
-          on = [ "<Esc>" ];
-          run = "close";
-          desc = "Cancel input";
-        }
-      ];
-    };
-
-    programs.yazi.settings.opener = {
-      play = [
-        {
-          run = ''vlc "$1"'';
-          orphan = true;
-        }
-      ];
-    };
-
-    xdg.configFile."yazi/flavors" = {
-      source = "${inputs.yazi-flavors}";
-    };
-    xdg.configFile."yazi/plugins/smart-enter.yazi/init.lua".text = ''
-      return {
-        entry = function()
-          local h = cx.active.current.hovered
-          ya.manager_emit(h and h.cha.is_dir and "enter" or "open", { hovered = true })
-        end,
-      }
-    '';
-    programs.yazi.theme = {
-      flavor.use = "catppuccin-mocha";
-    };
-  };
-}