4 files changed, 6 insertions, 21 deletions
diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix
index 347f9596ed20..1e5ed98255b1 100644
--- a/users/glittershark/system/home/default.nix
+++ b/users/glittershark/system/home/default.nix
@@ -5,12 +5,7 @@ with lib;
 rec {
   nixpkgs = import pkgs.nixpkgsSrc {};
 
-  home-manager = (fetchTarball {
-    url = "https://github.com/rycee/home-manager/archive/152769aed96d4d6f005ab40daf03ec4f5102c763.tar.gz";
-    sha256 = "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc";
-  });
-
-  home = confPath: (import "${home-manager}/modules" {
+  home = confPath: (import "${nixpkgs.home-manager.src}/modules" {
     pkgs = nixpkgs;
     configuration = { config, lib, ... }: {
       imports = [confPath];
diff --git a/users/glittershark/system/system/modules/kernel.nix b/users/glittershark/system/system/modules/kernel.nix
index bffd98c96c3c..dcde951b6152 100644
--- a/users/glittershark/system/system/modules/kernel.nix
+++ b/users/glittershark/system/system/modules/kernel.nix
@@ -11,20 +11,13 @@ let
       name = "linux-ck-patch-${mm}-ck1.xz";
       # example: http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
       url = "http://ck.kolivas.org/patches/${mj}.0/${mm}/${mm}-ck1/patch-${mm}-ck1.xz";
-      sha256 = "01jyg9x2ligr0gjic8lg4f7hw3isz94kqwdbzdk9n8nghklh38p4";
+      sha256 = "0cv1ayj9akl83q2whabj8v3qygkkfwvzcjqx539sw6j3r9qhrs64";
     };
 
     unpackPhase = ''
       ${pkgs.xz}/bin/unxz -kfdc $src > patch-${mm}-ck1
     '';
 
-    patches = [
-      (builtins.fetchurl {
-        url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_ck1_for_5.7.14.patch\?h\=linux-ck";
-        sha256 = "0l8f2kph4f2lvcjn0s2fg6n9xa6f4khjz7rqc4zxk58r7fh4s5v4";
-      })
-    ];
-
     installPhase = ''
       cp patch-${mm}-ck1 $out
     '';
diff --git a/users/multi/whitby/home-manager.nix b/users/multi/whitby/home-manager.nix
index da748cc25b6b..8d34f6ebd110 100644
--- a/users/multi/whitby/home-manager.nix
+++ b/users/multi/whitby/home-manager.nix
@@ -1,11 +1,6 @@
 { config ? throw "not a readTree target", ... }:
 
 let
-  homeManagerSrc = (fetchTarball {
-      url = "https://github.com/nix-community/home-manager/archive/9b1b55ba0264a55add4b7b4e022bdc2832b531f6.tar.gz";
-      sha256 = "1lvnprvqfsjhi811ldagvfy4ilysxdj4arzi0f0gskll6czwjdr7";
-  });
-
   depot = import <depot> {};
   pkgs = import <nixpkgs> {};
 
@@ -14,7 +9,10 @@ in
 
 {
   programs = {
-    home-manager = { enable = true; path = homeManagerSrc; };
+    home-manager = {
+      enable = true;
+      path = pkgs.home-manager.src;
+    };
 
     bash = {
       enable = true;
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 97655543193c..e9381bb076d3 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -280,7 +280,6 @@ in depot.lib.fix(self: {
       rustup
       screen
       scrot
-      sourcetrail
       spotify
       steam
       tokei