refactor!: remove unused modules, bindings, etc.

2023-04-10 15:12:45 +02:00 · 2023-04-10 15:12:45 +02:00 · 5fc963c537
commit 5fc963c537
parent b1a6d5016a
48 changed files with 93 additions and 540 deletions
--- a/modules/config/default.nix
+++ b/modules/config/default.nix
@ -1,9 +1,3 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
-
 {
  imports = [
    ./bin
--- a/modules/config/nix.nix
+++ b/modules/config/nix.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , inputs
 , ...
 }:
--- a/modules/config/shell.nix
+++ b/modules/config/shell.nix
@ -1,13 +1,8 @@
-{ config
-, lib
-, pkgs
+{ lib
 , ...
 }:

 with lib;
-let
-  cfg = config.my.shell;
-in
 {
  options.my.shell = {
    abbreviations = mkOption {
--- a/modules/config/theming/catppuccin.nix
+++ b/modules/config/theming/catppuccin.nix
@ -1,6 +1,4 @@
 { config
-, lib
-, pkgs
 , rosewater
 , flamingo
 , pink
@ -27,12 +25,9 @@
 , base
 , mantle
 , crust
+, ...
 }:

-with lib;
-let
-  cfg = config.my.theming;
-in
 {
  home-manager.users.moritz = {
    programs = {
--- a/modules/config/theming/default.nix
+++ b/modules/config/theming/default.nix
@ -1,7 +1,6 @@
 { config
 , lib
 , pkgs
-, inputs
 , ...
 }:

--- a/modules/config/theming/dracula.nix
+++ b/modules/config/theming/dracula.nix
@ -1,4 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ config
+, lib
+, ...
+}:

 with lib;
 let
--- a/modules/config/wallpapers.nix
+++ b/modules/config/wallpapers.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/default.nix
+++ b/modules/default.nix
@ -1,9 +1,3 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
-
 {
  imports = [
    ./config
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@ -1,5 +1,4 @@
-{ config
-, lib
+{ lib
 , pkgs
 , ...
 }:
--- a/modules/profiles/gaming.nix
+++ b/modules/profiles/gaming.nix
@ -1,6 +1,4 @@
-{ config
-, lib
-, pkgs
+{ pkgs
 , ...
 }: {
  programs.steam.enable = true;
--- a/modules/programs/adb.nix
+++ b/modules/programs/adb.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@ -1,16 +1,9 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
-
 {
  imports = [
    ./adb.nix
    ./bspwm
    ./code.nix
    ./direnv.nix
-    ./emacs.nix
    ./firefox.nix
    ./fish.nix
    ./git.nix
@ -31,7 +24,6 @@
    ./sway.nix
    ./thunar.nix
    ./nvim
-    ./xmonad
    ./zathura.nix
    ./zsh.nix
  ];
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@ -1,33 +0,0 @@
-{ config
-, lib
-, pkgs
-, inputs
-, ...
-}:
-
-with lib;
-let
-  cfg = config.my.programs.emacs;
-  myEmacs = pkgs.emacsPgtkWithPackages;
-in
-{
-  options.my.programs.emacs.enable = mkEnableOption "emacs";
-
-  config = mkIf cfg.enable {
-    my.shell.aliases = {
-      emacs = "emacsclient -nw -a 'emacs -nw'";
-    };
-    fonts.fonts = with pkgs; [
-      emacs-all-the-icons-fonts
-      (iosevka-bin.override { variant = "aile"; })
-    ];
-    users.users.moritz.packages = [ myEmacs ];
-    home-manager.users.moritz = {
-      home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];
-      services.emacs = {
-        enable = true;
-        package = myEmacs;
-      };
-    };
-  };
-}
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , inputs
 , ...
 }:
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@ -1,7 +1,6 @@
 { config
 , lib
 , pkgs
-, inputs
 , ...
 }:

--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/gpg.nix
+++ b/modules/programs/gpg.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/helix.nix
+++ b/modules/programs/helix.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/hub.nix
+++ b/modules/programs/hub.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/hyprland/config.nix
+++ b/modules/programs/hyprland/config.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

@ -161,7 +160,6 @@ in
  bind = $mainMod , B      , exec , rofi-bluetooth
  bind = $mainMod , C      , exec , rofi -show calc -modi calc -no-show-match -no-sort | wl-copy
  bind = $mainMod , D      , exec , hyprctl keyword general:layout dwindle
-  bind = $mainMod , E      , exec , emacsclient -c -a emacs
  bind = $mainMod , M      , exec , hyprctl keyword general:layout master
  bind = $mainMod , R      , exec , rofi -show combi
  bind = $mainMod , RETURN , exec , kitty
--- a/modules/programs/kakoune.nix
+++ b/modules/programs/kakoune.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/ledger/default.nix
+++ b/modules/programs/ledger/default.nix
@ -18,7 +18,7 @@ in
      };
      aliases =
        let
-          applyCommon = name: command: "${command} --payee note --strict --explicit";
+          applyCommon = _: command: "${command} --payee note --strict --explicit";
        in
        mapAttrs applyCommon {
          bal = "ledger bal";
--- a/modules/programs/python.nix
+++ b/modules/programs/python.nix
@ -9,7 +9,7 @@ let
  cfg = config.my.programs.python;

  pythonVersions = map (version: "3${toString version}") (range 8 11);
-  enabledVersions = filterAttrs (name: value: value.enable) cfg.versions;
+  enabledVersions = filterAttrs (_: value: value.enable) cfg.versions;

  pythonPackages = version: attrNames pkgs."python${version}Packages";

--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/xmonad/default.nix
+++ b/modules/programs/xmonad/default.nix
@ -1,50 +0,0 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
-
-with lib;
-let
-  cfg = config.my.programs.xmonad;
-in
-{
-  options.my.programs.xmonad.enable = mkEnableOption "xmonad";
-
-  config = lib.mkIf cfg.enable {
-    services = {
-      xserver = {
-        enable = true;
-        layout = "de";
-
-        displayManager = {
-          defaultSession = "none+xmonad";
-          autoLogin = {
-            enable = true;
-            user = "moritz";
-          };
-          lightdm.enable = true;
-        };
-        windowManager.xmonad.enable = true;
-      };
-    };
-    home-manager.users.moritz =
-      let
-        xmonadPackages = haskellPackages: [
-          haskellPackages.xmonad-contrib
-          haskellPackages.xmonad-extras
-          haskellPackages.xmonad
-          haskellPackages.xmobar
-        ];
-      in
-      {
-        xsession.windowManager.xmonad = {
-          enable = true;
-          enableContribAndExtras = true;
-          config = ./xmonad.hs;
-          # extraPackages = xmonadPackages;
-        };
-        programs.xmobar.enable = true;
-      };
-  };
-}
--- a/modules/programs/xmonad/xmonad.hs
+++ b/modules/programs/xmonad/xmonad.hs
@ -1,39 +0,0 @@
-import XMonad
-  ( Choose,
-    Default (def),
-    Full,
-    KeyMask,
-    Mirror,
-    Tall,
-    X,
-    XConfig (modMask, terminal),
-    mod4Mask,
-    spawn,
-    xmonad,
-  )
-import XMonad.Hooks.EwmhDesktops (ewmh)
-import XMonad.Util.EZConfig (additionalKeysP)
-
-myModMask :: KeyMask
-myModMask = mod4Mask
-
-myTerminal :: String
-myTerminal = "kitty"
-
-myKeys :: [(String, X ())]
-myKeys =
-  [ ("M-d", spawn "rofi -show combi"),
-    ("M-e", spawn "emacsclient -c -a emacs"),
-    ("M-f", spawn "firefox")
-  ]
-
-myConfig :: (XConfig (Choose Tall (Choose (Mirror Tall) Full)))
-myConfig =
-  def
-    { modMask = myModMask,
-      terminal = myTerminal
-    }
-    `additionalKeysP` myKeys
-
-main :: IO ()
-main = xmonad $ ewmh $ ewmhFullscreen myConfig
--- a/modules/programs/zathura.nix
+++ b/modules/programs/zathura.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/programs/zsh.nix
+++ b/modules/programs/zsh.nix
@ -1,7 +1,6 @@
 { config
 , lib
 , pkgs
-, inputs
 , ...
 }:

--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@ -1,8 +1,4 @@
-{ config
-, lib
-, pkgs
-, ...
-}: {
+{
  imports = [
    ./dunst.nix
    ./kdeconnect.nix
--- a/modules/services/gammastep.nix
+++ b/modules/services/gammastep.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:

 with lib;
 let
--- a/modules/services/kdeconnect.nix
+++ b/modules/services/kdeconnect.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/services/openconnect.nix
+++ b/modules/services/openconnect.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/services/wireguard.nix
+++ b/modules/services/wireguard.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }:

--- a/modules/virtualisation/default.nix
+++ b/modules/virtualisation/default.nix
@ -1,8 +1,3 @@
-{ config
-, lib
-, pkgs
-, ...
-}:
 {
  imports = [
    ./podman.nix
--- a/modules/virtualisation/podman.nix
+++ b/modules/virtualisation/podman.nix
@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ...
 }: