From 160be4bd907f76e6f82c65ff7aa03ddc57efcb6d Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sun, 29 Jan 2023 15:44:57 -0800
Subject: [PATCH] fix: clean-up

---
 kat/base16.nix          |  1 -
 kat/gui/konashow.nix    |  8 ++++----
 kat/gui/mako.nix        |  2 +-
 kat/gui/waybar.nix      |  2 +-
 lib.nix                 |  7 -------
 modules/home/base16.nix |  4 ++--
 nixos/common/access.nix |  2 +-
 nixos/common/boot.nix   |  4 ++--
 nixos/common/getty.nix  |  6 +-----
 nixos/x11.nix           | 16 ----------------
 outputs.nix             |  2 +-
 11 files changed, 13 insertions(+), 41 deletions(-)
 delete mode 100644 lib.nix
 delete mode 100644 nixos/x11.nix

diff --git a/kat/base16.nix b/kat/base16.nix
index 1a6df9e0..5bd16e77 100644
--- a/kat/base16.nix
+++ b/kat/base16.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   ...
 }: let
diff --git a/kat/gui/konashow.nix b/kat/gui/konashow.nix
index 1a34dce8..4043db49 100644
--- a/kat/gui/konashow.nix
+++ b/kat/gui/konashow.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, nixos, lib, ... }: {
+{ config, lib, ... }: {
   # TODO: fix lib use
   home.packages = [
     config.services.konawall.konashow
@@ -9,12 +9,12 @@
     interval = "30m";
     mode = "shuffle";
     commonTags = [ "width:>=1600" ];
-    tagList = map (lib.toList) [
-      ([
+    tagList = map lib.toList [
+      [
         "score:>=50"
         #"no_humans"
         #"rating:s"
-      ])
+      ]
     ];
   };
 }
diff --git a/kat/gui/mako.nix b/kat/gui/mako.nix
index b2ff644d..deeb3044 100644
--- a/kat/gui/mako.nix
+++ b/kat/gui/mako.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: let
+{ config, pkgs, ... }: let
   inherit (config.base16) palette;
 in {
   systemd.user.services = {
diff --git a/kat/gui/waybar.nix b/kat/gui/waybar.nix
index dd5e0c1a..cfa7209a 100644
--- a/kat/gui/waybar.nix
+++ b/kat/gui/waybar.nix
@@ -1,4 +1,4 @@
-{ config, kittywitch, lib, pkgs, ... }:
+{ kittywitch, pkgs, ... }:
 
 {
   xdg.configFile."waybar/style.css" = { inherit (kittywitch.sassTemplate { name = "waybar-style"; src = ./waybar.sass; }) source; };
diff --git a/lib.nix b/lib.nix
deleted file mode 100644
index ca979ac1..00000000
--- a/lib.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}:
-inputs.utils.lib.eachDefaultSystem (system: {
-})
diff --git a/modules/home/base16.nix b/modules/home/base16.nix
index 4b9c51e1..7d6f8196 100644
--- a/modules/home/base16.nix
+++ b/modules/home/base16.nix
@@ -13,11 +13,11 @@ in with lib; {
     sass = {
       variables = mkOption {
         type = attrsOf str;
-        default = (cfg.palette // cfg.palette' // {
+        default = cfg.palette // cfg.palette' // {
           term_font = "Iosevka";
           font = "Iosevka";
           font_size = "12px";
-        });
+        };
       };
       css_style = mkOption {
         type = enum [ "nested" "compressed" "compact" "expanded" ];
diff --git a/nixos/common/access.nix b/nixos/common/access.nix
index eaab32c9..a26643cc 100644
--- a/nixos/common/access.nix
+++ b/nixos/common/access.nix
@@ -5,7 +5,7 @@ inherit (lib.attrsets) mapAttrsToList;
 commonUser = {
   shell = pkgs.zsh;
   openssh.authorizedKeys.keys = concatLists (mapAttrsToList
-        (name: user:
+        (_: user:
          if elem "wheel" user.extraGroups then
          user.openssh.authorizedKeys.keys
          else
diff --git a/nixos/common/boot.nix b/nixos/common/boot.nix
index b0bb66ea..318a2223 100644
--- a/nixos/common/boot.nix
+++ b/nixos/common/boot.nix
@@ -3,7 +3,7 @@
   inherit (std) list;
 in {
   boot = mkMerge [
-    ({
+    {
       kernel.sysctl = {
         "fs.inotify.max_user_watches" = 524288;
         "net.core.rmem_max" = 16777216;
@@ -20,7 +20,7 @@ in {
       tmpOnTmpfs = true;
       tmpOnTmpfsSize = "80%";
       kernelPackages = mkIf (list.elem "zfs" config.boot.supportedFilesystems) (mkDefault config.boot.zfs.package.latestCompatibleLinuxPackages);
-    })
+    }
     (mkIf (list.elem "zfs" config.boot.supportedFilesystems) {
       kernelPackages = mkDefault config.boot.zfs.package.latestCompatibleLinuxPackages;
       zfs.enableUnstable = true;
diff --git a/nixos/common/getty.nix b/nixos/common/getty.nix
index 90e2913f..288b1b00 100644
--- a/nixos/common/getty.nix
+++ b/nixos/common/getty.nix
@@ -1,8 +1,4 @@
-{ config, lib, pkgs, std, ... }: let
-  inherit (std) string;
-  inherit (lib.modules) mkForce;
-in
-{
+_: {
   console = {
     font = "Tamzen7x14";
     earlySetup = true;
diff --git a/nixos/x11.nix b/nixos/x11.nix
deleted file mode 100644
index e516853e..00000000
--- a/nixos/x11.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, pkgs, ... }: {
-  services.xserver = {
-    enable = true;
-    autorun = false;
-    exportConfiguration = true;
-    in {
-      startx.enable = true;
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    xorg.xinit
-    xsel
-    scrot
-  ];
-}
diff --git a/outputs.nix b/outputs.nix
index b4098b76..ffcb1233 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,7 +1,7 @@
 {inputs}: let
   std = import ./std.nix {inherit inputs;};
   tree = import ./tree.nix {inherit inputs;};
-  lib = inputs.nixpkgs.lib;
+  inherit (inputs.nixpkgs) lib;
   systems = import ./systems {inherit inputs tree lib std;};
   shells = import ./shells {inherit inputs tree lib std pkgs;};
   inherit (import ./pkgs.nix {inherit inputs tree;}) pkgs;