hosts/common.nix

@@ -65,10 +65,7 @@
   in {
 
     # Enable features in Nix commands
-    nix.extraOptions = ''
+    nix.extraOptions = "experimental-features = nix-command flakes";
-      experimental-features = nix-command flakes
-      warn-dirty = false
-    '';
 
     # Basic common system packages for all devices
     environment.systemPackages = with pkgs; [ git vim wget curl ];

modules/applications/kitty.nix

@@ -65,9 +65,6 @@
           # Window
           window_padding_width = 4;
 
-          tab_bar_edge = "top";
-          tab_bar_style = "slant";
-
           # macos_traditional_fullscreen = true;
         };
       };

modules/shell/fish/default.nix

@@ -7,11 +7,10 @@
   home-manager.users.${config.user} = {
 
     # Packages used in abbreviations and aliases
-    home.packages = with pkgs; [ curl exa ];
+    home.packages = with pkgs; [ curl ];
 
     programs.fish = {
       enable = true;
-      shellAliases = { ls = "exa"; };
       functions = {
         commandline-git-commits = {
           description = "Insert commit into commandline";
@@ -42,6 +41,7 @@
           description = "Tidy up JSON using jq";
           body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
         };
+        ls = { body = "${pkgs.exa}/bin/exa $argv"; };
         note = {
           description = "Edit or create a note";
           argumentNames = "filename";