flake: clean up modules

users/infinidoge/default.nix

@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 let
   inherit (lib) flatten optional mkIf;
   ifGraphical = lib.optionals config.info.graphical;

users/modules/functionality/bindmounts.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 # Modified from https://github.com/nix-community/impermanence/blob/master/home-manager.nix
 

users/modules/global/flameshot.nix

@@ -1,4 +1,4 @@
-{ config, main, pkgs, lib, ... }:
+{ main, ... }:
 {
   services.flameshot = {
     enable = main.info.graphical;

users/modules/global/git.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     gh
     git-absorb

users/modules/global/htop.nix

@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
   programs.htop = {
     enable = true;
     settings = {

users/modules/global/keychain.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   programs.keychain = {
     enable = true;

users/modules/global/kitty.nix

@@ -1,23 +1,21 @@
-{ main, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
-  config = {
-    programs.kitty = {
-      enable = true;
-      font = {
-        package = (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; });
-        name = "DejaVuSansMono";
-        size = 12;
-      };
-      settings = {
-        confirm_os_window_close = 0;
-        scrollback_lines = 100000;
-      };
-      #theme = "Doom One";
+  programs.kitty = {
+    enable = true;
+    font = rec {
+      package = (pkgs.nerdfonts.override { fonts = [ name ]; });
+      name = "DejaVuSansMono";
+      size = 12;
     };
+    settings = {
+      confirm_os_window_close = 0;
+      scrollback_lines = 100000;
+    };
+    #theme = "Doom One";
+  };
 
-    home.shellAliases = {
-      #ssh = "kitty +kitten ssh";
-      icat = "kitty +kitten icat";
-    };
+  home.shellAliases = {
+    #ssh = "kitty +kitten ssh";
+    icat = "kitty +kitten icat";
   };
 }

users/modules/global/music.nix

@@ -1,4 +1,4 @@
-{ main, config, lib, pkgs, ... }:
+{ main, lib, pkgs, ... }:
 lib.mkIf main.info.graphical
 {
   services = {

users/modules/global/neovim.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   programs.nixvim = {
     enable = true;

users/modules/global/obs-studio.nix

@@ -1,4 +1,4 @@
-{ pkgs, main, config, ... }:
+{ main, pkgs, ... }:
 
 {
   programs.obs-studio = {

users/modules/global/shells/all.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-  imports = [
-    ./bash.nix
-    ./fish.nix
-    ./ion.nix
-    ./nushell.nix
-    ./zsh.nix
-  ];
-}

users/modules/global/shells/bash.nix

@@ -1,15 +1,10 @@
-{ config, pkgs, lib, ... }: {
-  imports = [ ./common.nix ];
-
-  programs = {
-    bash = {
-      enable = true;
-      enableVteIntegration = true;
-      initExtra = ''
-        source <(${lib.getExe config.programs.kitty.package} + complete setup bash)
-      '';
-    };
-
-    starship.enableBashIntegration = true;
+{ config, lib, ... }:
+{
+  programs.bash = {
+    enable = true;
+    enableVteIntegration = true;
+    initExtra = ''
+      source <(${lib.getExe config.programs.kitty.package} + complete setup bash)
+    '';
   };
 }

users/modules/global/shells/common.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.nix-index = {
     enable = true;
     enableBashIntegration = false;

users/modules/global/shells/fish.nix

@@ -1,17 +1,12 @@
-{ config, lib, pkgs, ... }: {
-  imports = [ ./common.nix ];
-
-  programs = {
-    fish = {
-      enable = true;
-      functions = { };
-      shellAbbrs = { };
-      interactiveShellInit = ''
-        kitty + complete setup fish | source
-        set -U fish_greeting
-      '';
-    };
-
-    starship.enableFishIntegration = lib.mkIf config.programs.starship.enable true;
+{ config, lib, ... }:
+{
+  programs.fish = {
+    enable = true;
+    functions = { };
+    shellAbbrs = { };
+    interactiveShellInit = ''
+      kitty + complete setup fish | source
+      set -U fish_greeting
+    '';
   };
 }

users/modules/global/shells/ion.nix

@@ -1,11 +1,6 @@
-{ config, pkgs, ... }: {
-  imports = [ ./common.nix ];
-
-  programs = {
-    ion = {
-      enable = true;
-    };
-
-    starship.enableIonIntegration = true;
+{ ... }:
+{
+  programs.ion = {
+    enable = true;
   };
 }

users/modules/global/shells/nushell.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.nushell = {
     enable = true;
     extraConfig = ''

users/modules/global/shells/zsh.nix

@@ -1,118 +1,113 @@
-{ config, lib, pkgs, main, ... }: {
-  imports = [ ./common.nix ];
+{ config, main, pkgs, ... }:
+{
+  programs.zsh = rec {
+    enable = true;
 
-  programs = {
-    zsh = rec {
-      enable = true;
+    enableCompletion = true;
+    enableVteIntegration = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
 
-      enableCompletion = true;
-      enableVteIntegration = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
+    # defaultKeymap = "emacs";
 
-      # defaultKeymap = "emacs";
+    initExtraFirst = ''
+      [[ $TERM == "tramp" ]] && unsetopt zle && PS1='$ ' && return
+    '';
 
-      initExtraFirst = ''
-        [[ $TERM == "tramp" ]] && unsetopt zle && PS1='$ ' && return
-      '';
+    initExtra = ''
+      ${pkgs.kitty}/bin/kitty + complete setup zsh | source /dev/stdin
+      ${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin
 
-      initExtra = ''
-        ${pkgs.kitty}/bin/kitty + complete setup zsh | source /dev/stdin
-        ${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin
+      functions -c precmd precmd_any_nix_shell
 
-        functions -c precmd precmd_any_nix_shell
+      precmd() {
+        precmd_any_nix_shell
 
-        precmd() {
-          precmd_any_nix_shell
-
-          if [[ -s ~/TODO.txt && ! -v __TODO_PRINTED ]] then
-            export __TODO_PRINTED=1
-            if [[ "$(cat ~/TODO.txt)" != "" ]] then
-              echo TODO:
-              \cat ~/TODO.txt
-            fi
+        if [[ -s ~/TODO.txt && ! -v __TODO_PRINTED ]] then
+          export __TODO_PRINTED=1
+          if [[ "$(cat ~/TODO.txt)" != "" ]] then
+            echo TODO:
+            \cat ~/TODO.txt
           fi
-        }
+        fi
+      }
 
-        if [[ "$(basename "$(readlink "/proc/$PPID/exe")")" == ".kitty-wrapped" ]]; then
-          PATH=$(echo "$PATH" | sed 's/\/nix\/store\/[a-zA-Z._0-9+-]\+\/bin:\?//g' | sed 's/:$//')
+      if [[ "$(basename "$(readlink "/proc/$PPID/exe")")" == ".kitty-wrapped" ]]; then
+        PATH=$(echo "$PATH" | sed 's/\/nix\/store\/[a-zA-Z._0-9+-]\+\/bin:\?//g' | sed 's/:$//')
+      fi
+
+      j() {
+        if [[ $# -eq 0 ]] then
+          \builtin cd -- "$(fd -H -t d | fzf --filepath-word)"
+        else
+          \builtin cd -- "$(fd -H -t d | fzf --filepath-word -1 -q "$*")"
+        fi
+      }
+
+      alias "jh"="cd ~ && j"
+      alias "gj"="gcd && j"
+
+      mktmpunzip() {
+        dir=$(mktemp -t -d unzip.XXX)
+        if ! file=$(realpath -e "$1"); then
+          echo "error: file does not exist"
+          return 1
+        fi
+        shift 1
+        unzip "$file" "$@" -d "$dir"
+        \builtin cd $dir
+        mv $file .
+      }
+
+      mktmpclone() {
+        location="$1"
+        if [ "$2" != "" ]; then
+          dirspec="$2.XXX"
+          shift 2
+        else
+          dirspec="clone.XXX"
+          shift 1
+        fi
+        if ! dir=$(mktemp -t -d "$dirspec"); then
+          echo "error: couldn't create temp directory"
+          return 1
         fi
 
-        j() {
-          if [[ $# -eq 0 ]] then
-            \builtin cd -- "$(fd -H -t d | fzf --filepath-word)"
-          else
-            \builtin cd -- "$(fd -H -t d | fzf --filepath-word -1 -q "$*")"
-          fi
-        }
+        git clone "$location" "$dir" "$@"
+        \builtin cd "$dir"
+      }
+    '';
 
-        alias "jh"="cd ~ && j"
-        alias "gj"="gcd && j"
+    dotDir = ".config/zsh";
 
-        mktmpunzip() {
-          dir=$(mktemp -t -d unzip.XXX)
-          if ! file=$(realpath -e "$1"); then
-            echo "error: file does not exist"
-            return 1
-          fi
-          shift 1
-          unzip "$file" "$@" -d "$dir"
-          \builtin cd $dir
-          mv $file .
-        }
+    history.path = "$HOME/${dotDir}/.zsh_history";
 
-        mktmpclone() {
-          location="$1"
-          if [ "$2" != "" ]; then
-            dirspec="$2.XXX"
-            shift 2
-          else
-            dirspec="clone.XXX"
-            shift 1
-          fi
-          if ! dir=$(mktemp -t -d "$dirspec"); then
-            echo "error: couldn't create temp directory"
-            return 1
-          fi
-
-          git clone "$location" "$dir" "$@"
-          \builtin cd "$dir"
-        }
-      '';
-
-      dotDir = ".config/zsh";
-
-      history.path = "$HOME/${dotDir}/.zsh_history";
-
-      shellAliases = main.environment.shellAliases // config.home.shellAliases // {
-        lsdiskw = "while true; do clear; lsdisk; sleep 1; done";
-      };
-
-      oh-my-zsh = {
-        enable = true;
-        plugins = [
-          # Display
-          "colorize"
-          "colored-man-pages"
-
-          # zsh modifications
-          "zsh-interactive-cd"
-          "sudo"
-
-          # Aliases
-          "alias-finder"
-
-          # Applications
-          ## Python
-          "pip"
-          ## Git
-          "gitignore"
-          ## Vim
-          "fancy-ctrl-z"
-        ];
-      };
+    shellAliases = main.environment.shellAliases // config.home.shellAliases // {
+      lsdiskw = "while true; do clear; lsdisk; sleep 1; done";
     };
 
-    starship.enableZshIntegration = lib.mkIf config.programs.starship.enable true;
+    oh-my-zsh = {
+      enable = true;
+      plugins = [
+        # Display
+        "colorize"
+        "colored-man-pages"
+
+        # zsh modifications
+        "zsh-interactive-cd"
+        "sudo"
+
+        # Aliases
+        "alias-finder"
+
+        # Applications
+        ## Python
+        "pip"
+        ## Git
+        "gitignore"
+        ## Vim
+        "fancy-ctrl-z"
+      ];
+    };
   };
 }

users/modules/global/ssh.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.ssh = {
     enable = true;
     controlMaster = "auto";

users/modules/global/starship.nix

@@ -1,7 +1,7 @@
-{ ... }: {
+{ ... }:
+{
   programs.starship = {
     enable = true;
-    enableBashIntegration = true;
 
     settings =
       let

users/modules/global/themeing.nix

@@ -1,4 +1,4 @@
-{ lib, main, config, pkgs, ... }:
+{ config, main, lib, pkgs, ... }:
 lib.mkIf main.info.graphical
 {
   gtk = {

users/modules/global/tmux.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.tmux = {
     enable = true;
     mouse = true;

users/root/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   users.users.root = {
     shell = pkgs.zsh;
     hashedPasswordFile = lib.mkIf config.modules.secrets.enable config.secrets.root-password;