home/aliases/default.nix

@@ -1,26 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.home.aliases;
-in
-{
-  options.my.home.aliases = with lib; {
-    enable = my.mkDisableOption "shell aliases configuration";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home = {
-      shellAliases = {
-        # I like pretty colors
-        diff = "diff --color=auto";
-        grep = "grep --color=auto";
-        egrep = "egrep --color=auto";
-        fgrep = "fgrep --color=auto";
-        ls = "ls --color=auto";
-
-        # Well-known ls aliases
-        l = "ls -alh";
-        ll = "ls -l";
-      };
-    };
-  };
-}

home/default.nix

@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./aliases
     ./atuin
     ./bat
     ./bluetooth

home/vim/init.vim

@@ -48,8 +48,6 @@ set noswapfile
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Set the minimal amount of lignes under and above the cursor for context
 set scrolloff=5
-" More stable splits
-set splitkeep=screen
 " Always show status line
 set laststatus=2
 " Enable Doxygen highlighting

home/zsh/default.nix

@@ -88,6 +88,19 @@ in
         AGKOZAK_LEFT_PROMPT_ONLY = 1;
       };
 
+      shellAliases = {
+        # I like pretty colors
+        diff = "diff --color=auto";
+        grep = "grep --color=auto";
+        egrep = "egrep --color=auto";
+        fgrep = "fgrep --color=auto";
+        ls = "ls --color=auto";
+
+        # Well-known ls aliases
+        l = "ls -alh";
+        ll = "ls -l";
+      };
+
       # Enable VTE integration
       enableVteIntegration = true;
     };