nixfmt fix

base.nix

@@ -1,12 +1,4 @@
-{
+{ config, lib, pkgs, inputs, outputs, ... }: {
-  config,
-  lib,
-  pkgs,
-  inputs,
-  outputs,
-  ...
-}:
-{
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./modules/apps.nix
@@ -19,9 +11,7 @@
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;
-    extraSpecialArgs = {
+    extraSpecialArgs = { inherit inputs outputs; };
-      inherit inputs outputs;
-    };
     users.jawz = import ./home-manager.nix;
   };
   system.stateVersion = "24.05";
@@ -31,9 +21,7 @@
   };
   i18n = {
     defaultLocale = "en_CA.UTF-8";
-    extraLocaleSettings = {
+    extraLocaleSettings = { LC_MONETARY = "es_MX.UTF-8"; };
-      LC_MONETARY = "es_MX.UTF-8";
-    };
   };
   console = {
     font = "Lat2-Terminus16";
@@ -46,14 +34,12 @@
       enable = true;
       wheelNeedsPassword = false;
     };
-    pam.loginLimits = [
+    pam.loginLimits = [{
-      {
       domain = "*";
       type = "soft";
       item = "nofile";
       value = "8192";
-      }
+    }];
-    ];
   };
   nix = {
     optimise.automatic = true;
@@ -63,10 +49,7 @@
     };
     settings = {
       auto-optimise-store = true;
-      experimental-features = [
+      experimental-features = [ "nix-command" "flakes" ];
-        "nix-command"
-        "flakes"
-      ];
       substituters = [
         "https://nix-gaming.cachix.org"
         "https://nixpkgs-python.cachix.org"
@@ -85,9 +68,7 @@
       ];
     };
   };
-  documentation = {
+  documentation = { enable = false; };
-    enable = false;
-  };
   users.groups.piracy.gid = 985;
   environment = {
     systemPackages = with pkgs; [ wget ];
@@ -100,6 +81,7 @@
       XDG_STATE_HOME = "\${HOME}/.local/state";
 
       # DEV PATH
+      CARGO_HOME = "${XDG_DATA_HOME}/cargo";
       GEM_HOME = "${XDG_DATA_HOME}/ruby/gems";
       GEM_PATH = "${XDG_DATA_HOME}/ruby/gems";
       GEM_SPEC_CACHE = "${XDG_DATA_HOME}/ruby/specs";

gnome.nix

@@ -17,16 +17,14 @@
       };
     };
   };
-  environment.gnome.excludePackages =
+  environment.gnome.excludePackages = (with pkgs; [
-    (with pkgs; [
     gnome-photos
     gnome-tour
     gnome-text-editor
     gnome-connections
     # gnome-shell-extensions
     baobab
-    ])
+  ]) ++ (with pkgs.gnome; [
-    ++ (with pkgs.gnome; [
     # totem
     gnome-music
     epiphany
@@ -39,8 +37,7 @@
     enable = true;
     style = "adwaita";
   };
-  users.users.jawz.packages =
+  users.users.jawz.packages = with pkgs;
-    with pkgs;
     ([
       # ffmpegthumbnailer # generate thumbnails
       adw-gtk3 # theme legacy applications
@@ -49,8 +46,7 @@
       # gradience # theme customizer, allows you to modify adw-gtk3 themes
       # lm_sensors # for extension, displays cpu temp
       libgda # for pano shell extension
-    ])
+    ]) ++ (with pkgs.gnomeExtensions; [
-    ++ (with pkgs.gnomeExtensions; [
       appindicator # applets for open applications
       reading-strip # like putting a finger on every line I read
       tactile # window manager

home-manager.nix

@@ -1,22 +1,10 @@
-{
+{ config, lib, pkgs, inputs, outputs, ... }: {
-  config,
-  lib,
-  pkgs,
-  inputs,
-  outputs,
-  ...
-}:
-{
   home.stateVersion = "24.05";
 
   programs.bash = {
     enable = true;
     historyFile = "\${XDG_STATE_HOME}/bash/history";
-    historyControl = [
+    historyControl = [ "erasedups" "ignorespace" "ignoredups" ];
-      "erasedups"
-      "ignorespace"
-      "ignoredups"
-    ];
     shellAliases = {
       cp = "cp -i";
       mv = "mv -i";
@@ -63,9 +51,7 @@
       templates = "${config.xdg.dataHome}/Templates";
       videos = "${config.home.homeDirectory}/Videos";
     };
-    configFile = {
+    configFile = { "wgetrc".source = ../dotfiles/wget/wgetrc; };
-      "wgetrc".source = ../dotfiles/wget/wgetrc;
-    };
   };
   programs = {
     helix.enable = true;

hosts/workstation/configuration.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   imports = [
     # <agenix/modules/age.nix>
     ./hardware-configuration.nix
@@ -55,19 +49,15 @@
 
   networking = {
     hostName = "workstation";
-    firewall =
+    firewall = let
-      let
       openPorts = [
         6674 # ns-usbloader
       ];
-        openPortRanges = [
+      openPortRanges = [{
-          {
         from = 1714; # kdeconnect
         to = 1764; # kdeconnect
-          }
+      }];
-        ];
+    in {
-      in
-      {
       allowedTCPPorts = openPorts;
       allowedUDPPorts = openPorts;
       allowedTCPPortRanges = openPortRanges;
@@ -75,8 +65,7 @@
     };
   };
 
-  nix =
+  nix = let
-    let
     featuresList = [
       "nixos-test"
       "benchmark"
@@ -86,8 +75,7 @@
       "gccarch-skylake"
       "gccarch-alderlake"
     ];
-    in
+  in {
-    {
     distributedBuilds = true;
     settings = {
       cores = 16;
@@ -104,14 +92,11 @@
   users = {
     groups.nixremote.gid = 555;
     users = {
-      jawz.packages = (
+      jawz.packages = (with pkgs; [
-        with pkgs;
-        [
         gocryptfs # encrypted filesystem! shhh!!!
         torrenttools # create torrent files from the terminal!
         vcsi # video thumbnails for torrents, can I replace it with ^?
-        ]
+      ]);
-      );
       nixremote = {
         isNormalUser = true;
         createHome = true;

hosts/workstation/hardware-configuration.nix

@@ -1,15 +1,9 @@
-{
+{ config, pkgs, modulesPath, lib, ... }: {
-  config,
-  pkgs,
-  modulesPath,
-  lib,
-  ...
-}:
-{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
   nixpkgs.hostPlatform = "x86_64-linux";
   hardware = {
-    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    cpu.amd.updateMicrocode =
+      lib.mkDefault config.hardware.enableRedistributableFirmware;
     bluetooth = {
       enable = true;
       settings.General = {
@@ -55,31 +49,18 @@
       preLVM = true;
     };
     initrd = {
-      availableKernelModules = [
+      availableKernelModules =
-        "xhci_pci"
+        [ "xhci_pci" "ahci" "usbhid" "nvme" "usb_storage" "sd_mod" ];
-        "ahci"
-        "usbhid"
-        "nvme"
-        "usb_storage"
-        "sd_mod"
-      ];
       kernelModules = [ ];
     };
   };
 
-  fileSystems =
+  fileSystems = let
-    let
+    nfsMount = (server: nfsDisk: {
-      nfsMount = (
-        server: nfsDisk: {
       device = "${server}:/${nfsDisk}";
       fsType = "nfs";
-          options = [
+      options = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" ];
-            "x-systemd.automount"
+    });
-            "noauto"
-            "x-systemd.idle-timeout=600"
-          ];
-        }
-      );
     btrfsMount = subvol: {
       device = "/dev/mapper/nvme";
       fsType = "btrfs";
@@ -93,8 +74,7 @@
         "datacow"
       ] ++ (if subvol == "nixos" then [ "noatime" ] else [ ]);
     };
-    in
+  in {
-    {
     "/" = btrfsMount "nixos" // { };
     "/home" = btrfsMount "home" // { };
     "/mnt/games" = btrfsMount "games" // { };
@@ -113,8 +93,7 @@
     };
 
   };
-  swapDevices = [
+  swapDevices = [{
-    {
     device = "/dev/disk/by-partuuid/c1bd22d7-e62c-440a-88d1-6464be1aa1b0";
     randomEncryption = {
       enable = true;
@@ -122,6 +101,5 @@
       keySize = 512;
       sectorSize = 4096;
     };
-    }
+  }];
-  ];
 }

modules/apps/office.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.apps.office.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.office.enable {
     users.users.jawz.packages = with pkgs; [
@@ -17,8 +11,6 @@
       # wike # gtk wikipedia wow!
       # denaro # manage your finances
     ];
-    environment.variables = {
+    environment.variables = { CALIBRE_USE_SYSTEM_THEME = "1"; };
-      CALIBRE_USE_SYSTEM_THEME = "1";
-    };
   };
 }

modules/dev/docker.nix

@@ -1,16 +1,8 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.dev.docker.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.docker.enable {
-    users.users.jawz.packages =
+    users.users.jawz.packages = (with pkgs; [ dockfmt ])
-      (with pkgs; [ dockfmt ]) ++ (with pkgs.nodePackages; [ dockerfile-language-server-nodejs ]);
+      ++ (with pkgs.nodePackages; [ dockerfile-language-server-nodejs ]);
-  };
+    environment.variables.DOCKER_CONFIG = "\${XDG_CONFIG_HOME}/docker";
-  environment.variables = {
-    DOCKER_CONFIG = "${XDG_CONFIG_HOME}/docker";
   };
 }

modules/dev/haskell.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.dev.haskell.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.haskell.enable {
     users.users.jawz.packages = with pkgs; ([
@@ -12,9 +6,8 @@
       haskell-language-server # lsp
     ]);
     environment.variables = {
-      CABAL_DIR = "${XDG_CACHE_HOME}/cabal";
+      CABAL_DIR = "\${XDG_CACHE_HOME}/cabal";
-      CARGO_HOME = "${XDG_DATA_HOME}/cargo";
+      STACK_ROOT = "\${XDG_DATA_HOME}/stack";
-      STACK_ROOT = "${XDG_DATA_HOME}/stack";
       GHCUP_USE_XDG_DIRS = "true";
     };
   };

modules/dev/javascript.nix

@@ -1,28 +1,17 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.dev.javascript.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.javascript.enable {
     home-manager.users.jawz.programs.xdg.configFile = {
       "npm/npmrc".source = ../dotfiles/npm/npmrc;
-      "configstore/update-notifier-npm-check.json".source = ../dotfiles/npm/update-notifier-npm-check.json;
+      "configstore/update-notifier-npm-check.json".source =
+        ../dotfiles/npm/update-notifier-npm-check.json;
     };
-    users.users.jawz.packages = (with pkgs; [ nodejs ]) ++ (with pkgs.nodePackages; [ pnpm ]);
+    users.users.jawz.packages = (with pkgs; [ nodejs ])
+      ++ (with pkgs.nodePackages; [ pnpm ]);
     environment.variables = {
-      NPM_CONFIG_USERCONFIG = "${XDG_CONFIG_HOME}/npm/npmrc";
+      NPM_CONFIG_USERCONFIG = "\${XDG_CONFIG_HOME}/npm/npmrc";
-      PNPM_HOME = "${XDG_DATA_HOME}/pnpm";
+      PNPM_HOME = "\${XDG_DATA_HOME}/pnpm";
-      PATH = [
+      PATH = [ "\${XDG_DATA_HOME}/npm/bin" "\${XDG_DATA_HOME}/pnpm" ];
-        "${XDG_DATA_HOME}/npm/bin"
-        "${XDG_DATA_HOME}/pnpm"
-      ];
-    };
-    environment.variables = {
-      VISUAL = "emacsclient -ca emacs";
-      PATH = [ "${XDG_CONFIG_HOME}/emacs/bin" ];
     };
   };
 }

modules/dev/nix.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.dev.nix.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.nix.enable {
     users.users.jawz.packages = with pkgs; ([

modules/dev/python.nix

@@ -1,20 +1,13 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.dev.python.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.python.enable {
     home-manager.users.jawz.programs.xdg.configFile = {
       "python/pythonrc".source = ../dotfiles/pythonrc;
     };
-    users.users.jawz.packages =
+    users.users.jawz.packages = (with pkgs; ([
-      (with pkgs; ([
       pipenv # python development workflow for humans
-        (python3.withPackages (
+      (python3.withPackages (ps:
-          ps: with ps; [
+        with ps; [
           black # Python code formatter
           editorconfig # follow rules of contributin
           flake8 # wraper for pyflakes, pycodestyle and mccabe
@@ -25,14 +18,11 @@
           # nose # testing and running python scripts
           # poetry # dependency management made easy
           # pytest # framework for writing tests
-          ]
-        ))
         ]))
-      ++ (with pkgs.nodePackages; [
+    ])) ++ (with pkgs.nodePackages;
+      [
         pyright # LSP
       ]);
-    environment.variables = {
+    environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
-      PYTHONSTARTUP = "${XDG_CONFIG_HOME}/python/pythonrc";
-    };
   };
 }

modules/dev/sh.nix

@@ -1,18 +1,10 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.dev.sh.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.dev.sh.enable {
-    users.users.jawz.packages =
+    users.users.jawz.packages = (with pkgs; [
-      (with pkgs; [
       bashdb # autocomplete
       shellcheck # linting
       shfmt # a shell parser and formatter
-      ])
+    ]) ++ (with pkgs.nodePackages; [ bash-language-server ]);
-      ++ (with pkgs.nodePackages; [ bash-language-server ]);
   };
 }

modules/emacs.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.emacs.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.emacs.enable {
     home-manager.users.jawz = {
@@ -14,8 +8,7 @@
       };
       services.lorri.enable = true;
     };
-    users.users.jawz.packages =
+    users.users.jawz.packages = (with pkgs; ([
-      (with pkgs; ([
       fd # modern find, faster searches
       fzf # fuzzy finder! super cool and useful
       ripgrep # modern grep
@@ -32,17 +25,16 @@
       # lsps
       yaml-language-server
       markdownlint-cli
-      ]))
+    ])) ++ (with pkgs.nodePackages; [
-      ++ (with pkgs.nodePackages; [
       vscode-json-languageserver
       # linters
       prettier
     ]);
     services.emacs = {
       enable = true;
-      package =
+      package = with pkgs;
-        with pkgs;
+        ((emacsPackagesFor emacs-gtk).emacsWithPackages
-        ((emacsPackagesFor emacs-gtk).emacsWithPackages (epkgs: with epkgs; ([ vterm ])));
+          (epkgs: with epkgs; ([ vterm ])));
       defaultEditor = true;
     };
     home-manager.users.jawz.programs.bash.initExtra = ''

modules/scripts/download.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   imports = [ ./base.nix ];
   config = {
     home-manager.users.jawz = {
@@ -14,8 +8,10 @@
         };
         bash = {
           shellAliases = {
-            comic = ''download -u jawz -i "$(cat $LC | fzf --multi --exact -i)"'';
+            comic =
-            gallery = ''download -u jawz -i "$(cat $LW | fzf --multi --exact -i)"'';
+              ''download -u jawz -i "$(cat $LC | fzf --multi --exact -i)"'';
+            gallery =
+              ''download -u jawz -i "$(cat $LW | fzf --multi --exact -i)"'';
             dl = "download -u jawz -i";
           };
           initExtra = ''
@@ -34,19 +30,14 @@
       install = true;
       service = false;
       name = "download";
-      package =
+      package = with pkgs.python3Packages;
-        with pkgs.python3Packages;
         (buildPythonApplication rec {
           pname = "download";
           version = "2.5";
           src = ../../scripts/download/.;
           doCheck = false;
           buildInputs = [ setuptools ];
-          propagatedBuildInputs = [
+          propagatedBuildInputs = [ pyyaml types-pyyaml yt-dlp ];
-            pyyaml
-            types-pyyaml
-            yt-dlp
-          ];
         });
     };
   };

modules/scripts/find-dup-episode.nix

@@ -1,18 +1,11 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   imports = [ ./base.nix ];
   config.my.scripts.find-dup-episodes = {
     enable = true;
     install = true;
     service = false;
     name = "find-dup-episodes";
-    package = pkgs.writeScriptBin "find-dup-episodes" (
+    package = pkgs.writeScriptBin "find-dup-episodes"
-      builtins.readFile ../../scripts/find-dup-episodes.sh
+      (builtins.readFile ../../scripts/find-dup-episodes.sh);
-    );
   };
 }

modules/scripts/manage-library.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   imports = [ ./base.nix ];
   config.my.scripts.manage-library = {
     enable = true;
@@ -13,6 +7,7 @@
     name = "manage-library";
     timer = "00:30";
     description = "scans the library directory and sorts files";
-    package = pkgs.writeScriptBin "manage-library" (builtins.readFile ../../scripts/manage-library.sh);
+    package = pkgs.writeScriptBin "manage-library"
+      (builtins.readFile ../../scripts/manage-library.sh);
   };
 }

modules/scripts/nextcloud-cronjob.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   imports = [ ./base.nix ];
   config.my.scripts.nextcloud-cronjob = {
     enable = true;
@@ -13,8 +7,7 @@
     timer = "*:0/10";
     name = "nextcloud-cronjob";
     description = "runs tasks for nextcloud";
-    package = pkgs.writeScriptBin "nextcloud-cronjob" (
+    package = pkgs.writeScriptBin "nextcloud-cronjob"
-      builtins.readFile ../../scripts/nextcloud-cronjob.sh
+      (builtins.readFile ../../scripts/nextcloud-cronjob.sh);
-    );
   };
 }

modules/scripts/run.nix

@@ -1,16 +1,11 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   imports = [ ./base.nix ];
   config.my.scripts.run = {
     enable = true;
     install = true;
     service = false;
     name = "run";
-    package = pkgs.writeScriptBin "run" (builtins.readFile ../../scripts/run.sh);
+    package =
+      pkgs.writeScriptBin "run" (builtins.readFile ../../scripts/run.sh);
   };
 }

modules/scripts/sub-sync.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   imports = [ ./base.nix ];
   config.my.scripts.sub-sync = {
     enable = true;
@@ -13,6 +7,7 @@
     name = "sub-sync";
     timer = "22:00";
     description = "Syncronixes subtitles downloaded and modified the last day";
-    package = pkgs.writeScriptBin "sub-sync" (builtins.readFile ../../scripts/sub-sync.sh);
+    package = pkgs.writeScriptBin "sub-sync"
+      (builtins.readFile ../../scripts/sub-sync.sh);
   };
 }

modules/scripts/update-dns.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   imports = [ ./base.nix ];
   config.my.scripts.update-dns = {
     enable = true;
@@ -13,6 +7,7 @@
     name = "update-dns";
     timer = "*:0/30";
     description = "Updates the IP of all my domains";
-    package = pkgs.writeScriptBin "update-dns" (builtins.readFile ../../scripts/update-dns.sh);
+    package = pkgs.writeScriptBin "update-dns"
+      (builtins.readFile ../../scripts/update-dns.sh);
   };
 }

modules/shell/tools.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, ... }: {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
   options.my.shell.tools.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.shell.tools.enable {
     home-manager.users.jawz.programs = {
@@ -28,9 +22,7 @@
             uniq --count | sort -rn'';
         };
       };
-      xdg.configFile = {
+      xdg.configFile = { "htop/htoprc".source = ../dotfiles/htop/htoprc; };
-        "htop/htoprc".source = ../dotfiles/htop/htoprc;
-      };
       hstr.enable = true;
       htop = {
         enable = true;
@@ -77,10 +69,10 @@
       trash-cli # oop! did not meant to delete that
       jq # linting
     ];
-  };
     environment.variables = {
-    HISTFILE = "${XDG_STATE_HOME}/bash/history";
+      HISTFILE = "\${XDG_STATE_HOME}/bash/history";
       LESSHISTFILE = "-";
-    RIPGREP_CONFIG_PATH = "${XDG_CONFIG_HOME}/ripgrep/ripgreprc";
+      RIPGREP_CONFIG_PATH = "\${XDG_CONFIG_HOME}/ripgrep/ripgreprc";
+    };
   };
 }

pkgs/obs-studio.nix

@@ -1,16 +1,9 @@
-{
+{ pkgs, lib, config, ... }:
-  pkgs,
-  lib,
-  config,
-  ...
-}:
 
 with lib;
 
-let
+let cfg = config.programs.obs-studio;
-  cfg = config.programs.obs-studio;
+in {
-in
-{
   options.programs.obs-studio = {
     enable = mkEnableOption "OBS Studio program";