From 45c5478c8f34737cabe90de2d7a613db5b24a9de Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 11 Oct 2023 07:37:34 -0600
Subject: [PATCH] all: deal with a few warnings, cleanup a bit

---
 configs/manager.nix          |  2 +-
 configs/neovim.nix           | 14 ++++++++------
 configs/tailnet.nix          |  2 +-
 default.nix                  |  2 +-
 gui/default.nix              | 10 ++++++----
 pkgs/bandcamp-downloader.nix |  9 +++++----
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/configs/manager.nix b/configs/manager.nix
index f3f751c..fcfefda 100644
--- a/configs/manager.nix
+++ b/configs/manager.nix
@@ -25,7 +25,7 @@ with lib; {
     };
   };
 
-  imports = [ ./tailnet.nix ];
+  #imports = [ ./tailnet.nix ];
 
   config = mkIf config.nixManager.enable {
     sops.defaultSopsFile = config.xin-secrets.manager;
diff --git a/configs/neovim.nix b/configs/neovim.nix
index 4b8d0b9..8317f28 100644
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -1,6 +1,8 @@
-{ pkgs, ... }:
-with pkgs; let
-  parchment = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+{ pkgs, isUnstable, ... }:
+with pkgs;
+let
+  vimBuildTool = if isUnstable then pkgs.vimUtils.buildVimPlugin else pkgs.vimUtils.buildVimPluginFrom2Nix;
+  parchment = vimBuildTool rec {
     pname = "parchment";
     version = "0.4.0";
     src = pkgs.fetchFromGitHub {
@@ -10,7 +12,7 @@ with pkgs; let
       sha256 = "sha256-ZphConCGZR3EG6dd8Ji7U9Qtm21SoWMk60XD4X+My1g=";
     };
   };
-  vacme = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+  vacme = vimBuildTool rec {
     pname = "vacme";
     version = "2017-01-14";
     src = pkgs.fetchFromGitHub {
@@ -20,7 +22,7 @@ with pkgs; let
       sha256 = "sha256-eea0Ntr3gCmF6iZ0adZaVswWH70K9IJZ4SAyVSdFp3E=";
     };
   };
-  obsidian = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+  obsidian = vimBuildTool rec {
     pname = "obsidian-nvim";
     version = "1.7.0"; # 1.8.0 has breaking changes
     src = pkgs.fetchFromGitHub {
@@ -32,7 +34,7 @@ with pkgs; let
     };
     dependencies = with vimPlugins; [ nvim-cmp tabular ];
   };
-  neogen = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
+  neogen = vimBuildTool rec {
     pname = "neogen";
     version = "2023-01-16";
     src = pkgs.fetchFromGitHub {
diff --git a/configs/tailnet.nix b/configs/tailnet.nix
index 0a79591..44718c7 100644
--- a/configs/tailnet.nix
+++ b/configs/tailnet.nix
@@ -101,5 +101,5 @@ with lib; {
       sopsFile = config.xin-secrets.manager;
     };
   };
-  #systemd.services = mkIf enabled (listToAttrs (builtins.map xinlib.jobToService jobs));
+  systemd.services = mkIf enabled (listToAttrs (builtins.map xinlib.jobToService jobs));
 }
diff --git a/default.nix b/default.nix
index b02c2a3..2a016f8 100644
--- a/default.nix
+++ b/default.nix
@@ -221,7 +221,7 @@ in
     };
 
     services.logrotate.checkConfig =
-      todo "logrotate disabled: https://github.com/NixOS/nix/issues/8502" false;
+      todo "logrotate.checkConfig disabled: https://github.com/NixOS/nix/issues/8502" false;
 
     services = {
       openssh = {
diff --git a/gui/default.nix b/gui/default.nix
index b1be777..381de41 100644
--- a/gui/default.nix
+++ b/gui/default.nix
@@ -2,6 +2,7 @@
 , lib
 , pkgs
 , xinlib
+, isUnstable
 , ...
 }:
 let
@@ -32,6 +33,10 @@ let
       path = [ promnesia hpi ];
     }
   ];
+  fontSet = with pkgs; [
+    go-font
+    #(callPackage ../pkgs/kurinto.nix {})
+  ];
 in
 with lib; {
   imports = [ ./gnome.nix ./kde.nix ./xfce.nix ./arcan.nix ];
@@ -67,10 +72,7 @@ with lib; {
       # TODO: TEMP FIX
       systemd.services.NetworkManager-wait-online.serviceConfig.ExecStart =
         lib.mkForce [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
-      fonts.fonts = with pkgs; [
-        go-font
-        #(callPackage ../pkgs/kurinto.nix {})
-      ];
+      fonts = if isUnstable then { packages = fontSet; } else { fonts = fontSet; };
       sound.enable = true;
       environment.systemPackages = with pkgs; (xinlib.filterList [
         arcanPackages.all-wrapped
diff --git a/pkgs/bandcamp-downloader.nix b/pkgs/bandcamp-downloader.nix
index 523be3e..26b0a49 100644
--- a/pkgs/bandcamp-downloader.nix
+++ b/pkgs/bandcamp-downloader.nix
@@ -1,12 +1,11 @@
 { lib
-, poetry-core
-, fetchFromGitHub
-, buildPythonPackage
 , beautifulsoup4
 , browser-cookie3
+, buildPythonPackage
 , certifi
 , charset-normalizer
 , cryptography
+, fetchFromGitHub
 , idna
 , importlib-metadata
 , jaraco_classes
@@ -15,6 +14,7 @@
 , lz4
 , more-itertools
 , pbkdf2
+, poetry-core
 , pyaes
 , pycparser
 , pycryptodome
@@ -40,7 +40,6 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    setuptools
     beautifulsoup4
     browser-cookie3
     certifi
@@ -54,11 +53,13 @@ buildPythonPackage rec {
     lz4
     more-itertools
     pbkdf2
+    poetry-core
     pyaes
     pycparser
     pycryptodome
     requests
     secretstorage
+    setuptools
     soupsieve
     tqdm
     urllib3