project-wide: Cleanup and services + private overhaul

profiles/common/nixos.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sources, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports = [ ./nixos ];

profiles/common/nixos/access.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sources, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   security.sudo.wheelNeedsPassword = lib.mkForce false;

profiles/common/nixos/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sources, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports = [

profiles/common/nixos/locale.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sources, ... }:
+{ config, pkgs, ... }:
 
 {
   i18n.defaultLocale = "en_GB.UTF-8";

profiles/common/nixos/system.nix

@@ -1,8 +1,6 @@
-{ config, lib, pkgs, sources, ... }:
+{ config, lib, pkgs, ... }:
 
 {
-  #imports = [ (sources.home-manager + "/nixos") ];
-
   boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
   services.journald.extraConfig = "SystemMaxUse=512M";
 }

profiles/gui/home/firefox/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sources, superConfig, ... }:
+{ config, lib, pkgs, superConfig, ... }:
 
 let
   commonSettings = {

profiles/gui/home/gpg.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sources, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   home.sessionVariables = {

profiles/gui/home/mpv.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, witch, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   programs.mpv = {
@@ -38,10 +38,7 @@
     enable = false;
     username = "kat";
     defaultRoom = "lounge";
-    server = {
-      host = "sync.kittywit.ch";
-      password = witch.secrets.hosts.athame.syncplay.password;
-    };
+    server = { host = "sync.kittywit.ch"; };
     # gui = false;
     config = {
       client_settings = {

profiles/gui/home/music.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, witch, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   programs.ncmpcpp = {
@@ -51,7 +51,7 @@
   };
   programs.beets = {
     enable = true;
-    package = pkgs.unstable.beets;
+    package = pkgs.beets;
     settings = {
       directory = "~/media-share/music";
       library = "~/.local/share/beets.db";

profiles/gui/home/weechat.nix

@@ -20,7 +20,7 @@
       '')
       (lib.mkAfter "/matrix connect kat")
     ];
-    packageUnwrapped = pkgs.unstable.weechat-unwrapped;
+    packageUnwrapped = pkgs.weechat-unwrapped;
     homeDirectory = "${config.xdg.dataHome}/weechat";
     plugins.python = {
       enable = true;
@@ -36,9 +36,11 @@
       vimode-git
       weechat-matrix
       weechat-notify-send
-      weechat-title
+      title
     ];
     config = {
+      logger.level.irc = 0;
+      logger.level.matrix = 0;
       weechat = {
         look = { mouse = true; };
         bar = {

profiles/gui/nixos/firefox.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, witch, ... }:
+{ config, pkgs, ... }:
 
 {
   xdg = {

profiles/kat/home/git.nix

@@ -4,9 +4,9 @@
   home.packages = with pkgs; [
     git-crypt
     gitAndTools.gitRemoteGcrypt
-    unstable.gitAndTools.gitAnnex
+    gitAndTools.gitAnnex
     git-revise
-    arc.pkgs.gitAndTools.git-annex-remote-b2
+    gitAndTools.git-annex-remote-b2
   ];
 
   programs.git = {

profiles/kat/home/vim/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, witch, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   home.sessionVariables.EDITOR = "vim";

profiles/sway/home/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, sources, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [ ./waybar ./mako.nix ./sway.nix ./swayidle.nix ./gammastep.nix ];

profiles/sway/nixos/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, sources, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [ ./sway.nix ];

profiles/sway/nixos/sway.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, sources, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.sway = {