about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-20T17·18+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·45+0300
commit87c141d3d76185526bb8684cb518f74cf8f878ff (patch)
tree7b50b57626924ff4ff2f90adcdb6df4961acf665 /users
parent43b1791ec601732ac31195df96781a848360a9ac (diff)
chore(3p/nixpkgs): Bump channels to 2021-09-20 r/2904
Included fixes:

* grfn/mugwump: removed superfluous Buildkite agent user
* tazjin/camden: Disabled bitlbee (user config is broken)
* grfn/home/vim: vimUtils expects a `pname`
* 3p/nixpkgs: Pick awscli2 from stable channel

Change-Id: I64ed726b3350f75c7a8a0e6552bcf1d8d9ba7d46
Diffstat (limited to 'users')
-rw-r--r--users/grfn/system/home/modules/vim.nix3
-rw-r--r--users/grfn/system/system/machines/mugwump.nix4
-rw-r--r--users/tazjin/nixos/camden/default.nix2
3 files changed, 3 insertions, 6 deletions
diff --git a/users/grfn/system/home/modules/vim.nix b/users/grfn/system/home/modules/vim.nix
index 87d4309333..b87cb09ad1 100644
--- a/users/grfn/system/home/modules/vim.nix
+++ b/users/grfn/system/home/modules/vim.nix
@@ -16,7 +16,8 @@
       # vim-colors-solarized
       # solarized
       (pkgs.vimUtils.buildVimPlugin {
-        name = "vim-colors-solarized";
+        pname = "vim-colors-solarized";
+        version = "git";
         src = pkgs.fetchFromGitHub {
           owner = "glittershark";
           repo = "vim-colors-solarized";
diff --git a/users/grfn/system/system/machines/mugwump.nix b/users/grfn/system/system/machines/mugwump.nix
index 6a95635c90..6e6deb6c2b 100644
--- a/users/grfn/system/system/machines/mugwump.nix
+++ b/users/grfn/system/system/machines/mugwump.nix
@@ -248,8 +248,4 @@ with lib;
     isSystemUser = true;
     extraGroups = [ "docker" ];
   };
-  users.users."buildkite-agent-mugwump-2" = {
-    isSystemUser = true;
-    extraGroups = [ "docker" ];
-  };
 }
diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix
index 19a42f163c..ebd4caac75 100644
--- a/users/tazjin/nixos/camden/default.nix
+++ b/users/tazjin/nixos/camden/default.nix
@@ -235,7 +235,7 @@ in lib.fix(self: {
   };
 
   services.bitlbee = {
-    enable = true;
+    enable = false;
     portNumber = 2337; # bees
   };