cleanup

2025-03-28 00:47:30 -06:00 · 2025-03-28 00:47:30 -06:00 · 90d8370b82
commit 90d8370b82
parent e854d2515d
34 changed files with 39 additions and 131 deletions
--- a/home-manager/cobray.nix
+++ b/home-manager/cobray.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  imports = [
--- a/home-manager/modules/dunst.nix
+++ b/home-manager/modules/dunst.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/home-manager/modules/fish.nix
+++ b/home-manager/modules/fish.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/home-manager/modules/ghostty.nix
+++ b/home-manager/modules/ghostty.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/home-manager/modules/lazygit.nix
+++ b/home-manager/modules/lazygit.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/home-manager/modules/nvim.nix
+++ b/home-manager/modules/nvim.nix
@ -1,5 +1,8 @@
-{ config, pkgs, lib, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
  home.packages = with pkgs; [
    neovim
    gnugrep
--- a/home-manager/modules/picom.nix
+++ b/home-manager/modules/picom.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/home-manager/modules/polybar.nix
+++ b/home-manager/modules/polybar.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/home-manager/modules/rofi.nix
+++ b/home-manager/modules/rofi.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/home-manager/modules/starship.nix
+++ b/home-manager/modules/starship.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/home-manager/modules/zellij.nix
+++ b/home-manager/modules/zellij.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  home.packages = with pkgs; [
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@ -2,10 +2,6 @@
 # your system. Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running 'nixos-help').
 {
-  config,
-  pkgs,
-  lib,
-  inputs,
  ...
 }: {
  imports = [
--- a/hosts/local-packages.nix
+++ b/hosts/local-packages.nix
@ -1,21 +1,24 @@
-{ config, pkgs, lib, ... }:
-let
-  customPkgs = import ../pkgs { inherit pkgs lib; };
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  customPkgs = import ../pkgs {inherit pkgs lib;};
 in {
  imports = [
    ../modules/python.nix
  ];
  python.enable = true;
  environment.systemPackages = with pkgs; [
-    (python311.withPackages (pyPkgs: with pyPkgs; [
-      requests
-      pip
-      virtualenv
-      ipython
-    ]))
+    (python311.withPackages (pyPkgs:
+      with pyPkgs; [
+        requests
+        pip
+        virtualenv
+        ipython
+      ]))
    python3Packages.pip
    black
-    ruff
    brave # TODO: make a module to save browser stuff
    vesktop
    git
@ -43,6 +46,7 @@ in {
    gawk
    obs-studio
    lazygit
+    lazydocker
    jdk17
    bun
    maven
--- a/modules/audio.nix
+++ b/modules/audio.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  security.rtkit.enable = true;
--- a/modules/bluetooth.nix
+++ b/modules/bluetooth.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  hardware.bluetooth = {
--- a/modules/boot.nix
+++ b/modules/boot.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  # Bootloader
--- a/modules/default.nix
+++ b/modules/default.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  imports = [
--- a/modules/docker.nix
+++ b/modules/docker.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  virtualisation.docker = {
--- a/modules/env.nix
+++ b/modules/env.nix
@ -1,5 +1,4 @@
 {
-  config,
  pkgs,
  lib,
  ...
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: let
  clear-sans = pkgs.stdenv.mkDerivation {
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@ -1,7 +1,4 @@
 {
-  config,
-  pkgs,
-  lib,
  inputs,
  ...
 }: {
--- a/modules/i3-xfce.nix
+++ b/modules/i3-xfce.nix
@ -1,5 +1,4 @@
 {
-  config,
  pkgs,
  lib,
  ...
--- a/modules/net.nix
+++ b/modules/net.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: {
  environment.systemPackages = with pkgs; [
--- a/modules/nixos.nix
+++ b/modules/nixos.nix
@ -1,7 +1,4 @@
 {
-  config,
-  pkgs,
-  lib,
  ...
 }: {
  nixpkgs.config.allowUnfree = true;
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@ -1,7 +1,6 @@
 {
  config,
  pkgs,
-  lib,
  ...
 }: {
  services.xserver.videoDrivers = ["nvidia"];
--- a/modules/python.nix
+++ b/modules/python.nix
@ -1,5 +1,4 @@
 { config, pkgs, lib, ... }:
-
 let
  customPkgs = pkgs.callPackage ../pkgs { inherit pkgs lib; };
  pipConf = pkgs.writeText "pip.conf" ''
@ -29,13 +28,14 @@ let
      pkgs.python311Packages.pynvml
      pkgs.python311Packages.pyqtgraph
      pkgs.python311Packages.pyqt6
-      pkgs.python311Packages.cppcheck
      pkgs.python311Packages.click
      pkgs.python311Packages.typer
      pkgs.python311Packages.rich
      pkgs.python311Packages.pyyaml
      pkgs.python311Packages.pytz
      pkgs.python311Packages.pillow
+      pkgs.python311Packages.jedi
+      pkgs.python311Packages.libcst
    ];
  };
 in {
@ -47,14 +47,13 @@ in {
      pythonEnv
      python3Packages.pip
      black
-      ruff
+      isort
      uv
      stdenv.cc.cc.lib
    ];
-    # Environment variables
    environment.variables = {
      PIP_PREFIX = "$HOME/.local";
-      PIP_CONFIG_FILE = "${pipConf}";  # Force pip to use our config
+      PIP_CONFIG_FILE = "${pipConf}";
      PYTHONPATH = "$HOME/.local/lib/python3.11/site-packages";
    };
    system.userActivationScripts.removeNumpy2 = ''
--- a/modules/steam.nix
+++ b/modules/steam.nix
@ -1,9 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
-  inputs,
-  system,
  ...
 }: {
  programs.steam = {
--- a/modules/timezone.nix
+++ b/modules/timezone.nix
@ -1,7 +1,4 @@
 {
-  config,
-  pkgs,
-  lib,
  ...
 }: {
  time.timeZone = "America/Edmonton";
--- a/modules/user.nix
+++ b/modules/user.nix
@ -1,7 +1,5 @@
 {
-  config,
  pkgs,
-  lib,
  ...
 }: let
  fish-rust = pkgs.callPackage ../pkgs/fish-rust {};
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -1,6 +1,7 @@
-{ pkgs ? import <nixpkgs> {}, lib ? pkgs.lib }:
-
-let
+{
+  pkgs ? import <nixpkgs> {},
+  lib ? pkgs.lib,
+}: let
  numpy-1 = pkgs.python311Packages.numpy.overridePythonAttrs (oldAttrs: rec {
    version = "1.26.4";
    src = pkgs.fetchPypi {
@ -16,9 +17,7 @@ let
      numpy = numpy-1;
    };
  };
-
 in {
-
  fish-rust = pkgs.callPackage ./fish-rust {};

  python-pymatting = pkgs.callPackage ./python-pymatting {
--- a/pkgs/python-opencv-headless/default.nix
+++ b/pkgs/python-opencv-headless/default.nix
@ -1,10 +1,10 @@
-{ lib
-, python311Packages
-, fetchPypi
-, stdenv
-, makeWrapper
-, cmake
-, pkg-config
+{ lib,
+python311Packages,
+fetchPypi,
+stdenv,
+makeWrapper,
+cmake,
+pkg-config
 }:

 python311Packages.buildPythonPackage rec {
--- a/pkgs/python-pymatting/default.nix
+++ b/pkgs/python-pymatting/default.nix
@ -34,6 +34,6 @@ python311Packages.buildPythonPackage rec {
    homepage = "https://github.com/pymatting/pymatting";
    license = licenses.mit;
    platforms = platforms.all;
-    maintainers = with maintainers; [ "Cobray" ];
+    maintainers = with maintainers; ["Cobray"];
  };
 }
--- a/pkgs/python-rembg/default.nix
+++ b/pkgs/python-rembg/default.nix
@ -1,8 +1,8 @@
-{ lib
-, python311Packages
-, fetchPypi
-, python-pymatting
-, python-opencv-headless
+{ lib,
+python311Packages,
+fetchPypi,
+python-pymatting,
+python-opencv-headless
 }:
 python311Packages.buildPythonPackage rec {
  pname = "rembg";
--- a/pkgs/tokyo-night/default.nix
+++ b/pkgs/tokyo-night/default.nix
@ -1,41 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  gtk-engine-murrine,
-  gnome-themes-extra,
-  bash,
-  sassc,
-}:
-stdenv.mkDerivation {
-  pname = "tokyo-night-gtk";
-  version = "main";
-
-  src = fetchFromGitHub {
-    owner = "Fausto-Korpsvart";
-    repo = "Tokyonight-GTK-Theme";
-    rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64";
-    sha256 = "0c7sp9n2pc70yy9msmbmcyhqbr63v1ssnsxk6vg10zwwc3wl19h0";
-  };
-
-  nativeBuildInputs = [bash sassc];
-  buildInputs = [gtk-engine-murrine gnome-themes-extra];
-  propagatedUserEnvPkgs = [gtk-engine-murrine];
-
-  buildPhase = ''
-    bash ./install.sh --dest $out/share/themes -n Tokyonight
-    bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm
-    bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm black
-    bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm black outline
-  '';
-
-  installPhase = "";
-
-  meta = with lib; {
-    description = "Tokyo Night GTK Theme";
-    homepage = "https://github.com/Fausto-Korpsvart/Tokyonight-GTK-Theme";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = ["Cobray"];
-  };
-}