1 files changed, 5 insertions, 75 deletions

diff --git a/modules/common/default.nix b/modules/common/default.nix
index f9831351..4855c7ab 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -13,15 +13,6 @@
   config,
   pkgs,
   lib,
-  # Needed for nixos-shell
-  libraries,
-  modules,
-  openPRsNixpkgs,
-  packageSets,
-  system,
-  self,
-  externalDependencies,
-  externalBinaries,
   ...
 }: {
   # TODO(@bpeetz): Move this file to default options in their respective modules. <2025-05-31>
@@ -50,49 +41,7 @@
       ];
     };
 
-    nixos-shell = {
-      enable = lib.mkDefault true;
-      configuration = {
-        specialArgs = {
-          inherit
-            libraries
-            modules
-            ;
-        };
-        value = lib.mkMerge [
-          {
-            _module.args = {
-              inherit
-                # extra package sources
-                openPRsNixpkgs
-                packageSets
-                # extra information
-                system
-                # nix registry
-                self
-                externalDependencies
-                # bins
-                # TODO: Integrate these into `pkgs/by-name` <2024-05-22>
-                externalBinaries
-                ;
-            };
-          }
-
-          {
-            require = [
-              ./nixos_shell_configuration.nix
-
-              ../../modules
-              ../../modules/common
-            ];
-          }
-        ];
-      };
-      mounts = {};
-    };
-
     polkit.enable = true;
-    power.enable = true;
     xdg.enable = true;
 
     services = {
@@ -147,27 +96,14 @@
               config.home-manager.users.soispha.home.file);
         in
           [
-            # TODO(@bpeetz): Move these to their respective modules <2025-05-09>
-            # Already synchronized by TaskChampion sync server
-            "~/.local/share/task"
-            # Already synchronized by atuin sync server
-            "~/.local/share/atuin"
+            # TODO(@bpeetz): Move that to its respective module (after migrating it to
+            # by-name) <2025-05-09>
             # Already synchronized by mbsync
             "~/.local/share/maildir"
-
-            # Should not be synchronized
-            "~/.local/share/unison"
-
-            # These are just to big to be synchronized (# TODO: Work around that <2024-08-31> )
-            "~/media/music/beets.old"
-            "~/media/music/deerix"
-            "~/.local/share/Steam"
           ]
           ++ homeManagerSymlinks;
 
         pathsToSync = [
-          "~/.local/state/mpv"
-          "~/.local/state/nvim"
           "~/.local/share"
           "~/.local/.Trash-1000"
 
@@ -194,12 +130,12 @@
         enable = true;
         enableAge = lib.mkDefault true;
       };
-      cargo.enable = true;
       direnv.enable = true;
       git.enable = true;
       imv.enable = true;
       less.enable = true;
       lf.enable = true;
+      ly.enable = lib.mkDefault true;
       gpg.enable = true;
       river = {
         enable = lib.mkDefault true;
@@ -263,17 +199,10 @@
             pointer-1133-49970-Logitech_Gaming_Mouse_G502 = [["pointer-accel" "0"] ["accel-profile" "none"]];
             pointer-12951-6505-ZSA_Technology_Labs_Moonlander_Mark_I = [["pointer-accel" "0"] ["accel-profile" "none"]];
           };
-          backgroundStart = [
-            # TODO(@bpeetz): Move these to systemd units/their own modules <2025-05-18>
-
-            ["${lib.getExe pkgs.swaybg}" "--image" "${./abstract-nord.png}"]
-            pkgs.swayidle
-            pkgs.alacritty
-          ];
         };
       };
       mpv.enable = true;
-      steam.enable = false;
+      steam.enable = true;
       ssh.enable = true;
       swaylock.enable = true;
       timewarrior.enable = true;
@@ -291,6 +220,7 @@
       yt.enable = true;
       zathura.enable = true;
       zsh.enable = true;
+      fish.enable = true;
     };
 
     version.enable = true;