4 files changed, 37 insertions, 4 deletions
diff --git a/nixos/profiles/common/basics.nix b/nixos/profiles/common/basics.nix
index aa6eff9..4ef0c14 100644
--- a/nixos/profiles/common/basics.nix
+++ b/nixos/profiles/common/basics.nix
@@ -3,7 +3,8 @@
 {
   environment.systemPackages = with pkgs; [
     git
-    vim
+    # lowPrio because we use vim-full in the workstation profile
+    (lowPrio vim)
 
     file
     htop
diff --git a/nixos/profiles/common/default.nix b/nixos/profiles/common/default.nix
index 2b07724..a508a32 100644
--- a/nixos/profiles/common/default.nix
+++ b/nixos/profiles/common/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  sources = import ../../npins;
+  sources = import <top/npins>;
 in
 {
   imports = [
diff --git a/nixos/profiles/common/nixpkgs/overlays.nix b/nixos/profiles/common/nixpkgs/overlays.nix
index 613338f..2834325 100644
--- a/nixos/profiles/common/nixpkgs/overlays.nix
+++ b/nixos/profiles/common/nixpkgs/overlays.nix
@@ -1,4 +1,37 @@
 # https://nixos.org/manual/nixpkgs/stable/#sec-overlays-definition
+{ pkgs, ... }:
 [
+  # features
+  (final: prev: {
+    scc = prev.scc.overrideAttrs (old: {
+      # https://github.com/boyter/scc/pull/622
+      src = pkgs.fetchFromGitHub {
+        owner = "boyter";
+        repo = "scc";
+        rev = "b73ea06bdc5890821d03502a2cfc4224b19a9b67";
+        hash = "sha256-vcuoKrvludBE0KpXVLkKzB38n0mZJWVB8bYrgJDHKfY=";
+      };
+    });
+  })
+  (final: prev: {
+    skim = prev.skim.overrideAttrs (old: {
+      patches = old.patches ++ [
+        # https://github.com/skim-rs/skim/issues/803
+        ../../workstation/patches/skim-blank.patch
+      ];
+    });
+  })
 
+  # bug fixes
+  (final: prev: {
+    sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
+      patches = old.patches ++ [
+        # https://github.com/swaywm/sway/pull/8761
+        (pkgs.fetchpatch {
+          url = "https://github.com/swaywm/sway/commit/af7c6ec7b1daeeec67dd17e27fb75f1f1c347327.patch";
+          hash = "sha256-DxN/3IdswZ6q/ksBVr+wgwGe7ScJeg8gFHYQdQAueww=";
+        })
+      ];
+    });
+  })
 ]
diff --git a/nixos/profiles/common/sanix.nix b/nixos/profiles/common/sanix.nix
index a20db24..626aa73 100644
--- a/nixos/profiles/common/sanix.nix
+++ b/nixos/profiles/common/sanix.nix
@@ -2,14 +2,13 @@
   # Use the Nixpkgs config and overlays from the local files for this NixOS build
   nixpkgs = {
     config = import ./nixpkgs/config.nix;
-    overlays = import ./nixpkgs/overlays.nix;
+    overlays = import ./nixpkgs/overlays.nix { inherit pkgs; };
   };
 
   # Makes commands default to the same Nixpkgs, config, overlays and NixOS configuration
   nix.nixPath = [
     "nixpkgs=${pkgs.path}"
     "nixos-config=${toString <nixos-config>}"
-    "nixpkgs-overlays=${toString ./nixpkgs/overlays.nix}"
   ];
   environment.variables.NIXPKGS_CONFIG = lib.mkForce (toString ./nixpkgs/config.nix);