modules/common/shell/fish/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: {
+{ config, pkgs, ... }: {
 
   users.users.${config.user}.shell = pkgs.fish;
   programs.fish.enable =
@@ -11,10 +11,7 @@
 
     programs.fish = {
       enable = true;
-      shellAliases = {
+      shellAliases = { ls = "exa"; };
-        ls = "exa";
-        trash = lib.mkIf pkgs.stdenv.isLinux "${pkgs.trash-cli}/bin/trash-put";
-      };
       functions = {
         commandline-git-commits = {
           description = "Insert commit into commandline";
@@ -93,7 +90,6 @@
         sc = "systemctl";
         scs = "systemctl status";
         m = "make";
-        t = "trash";
 
         # Vim (overwritten by Neovim)
         v = "vim";

modules/darwin/homebrew.nix

@@ -45,6 +45,12 @@
       ];
     };
 
+    home-manager.users.${config.user} = {
+
+      programs.fish.shellAbbrs.t = "trash";
+
+    };
+
   };
 
 }

modules/nixos/gaming/steam.nix

@@ -5,20 +5,15 @@
   config = lib.mkIf (config.gaming.steam.enable && pkgs.stdenv.isLinux) {
     hardware.steam-hardware.enable = true;
     unfreePackages = [ "steam" "steam-original" "steamcmd" "steam-run" ];
-
-    programs.steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-    };
-
     environment.systemPackages = with pkgs; [
 
+      steam
+
       # Enable terminal interaction
       steamPackages.steamcmd
       steam-tui
 
     ];
-
   };
 
 }

modules/nixos/hardware/default.nix

@@ -3,7 +3,6 @@
   imports = [
     ./audio.nix
     ./boot.nix
-    ./disk.nix
     ./keyboard.nix
     ./monitors.nix
     ./mouse.nix

modules/nixos/hardware/disk.nix

@@ -1,7 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  # Enable fstrim, which tracks free space on SSDs for garbage collection
-  # More info: https://www.reddit.com/r/NixOS/comments/rbzhb1/if_you_have_a_ssd_dont_forget_to_enable_fstrim/
-  services.fstrim.enable = true;
-
-}