diff --git a/homes/aarch64-linux/matt@pi5/default.nix b/homes/aarch64-linux/matt@pi5/default.nix index 7f0acd3..8ffb986 100755 --- a/homes/aarch64-linux/matt@pi5/default.nix +++ b/homes/aarch64-linux/matt@pi5/default.nix @@ -1,8 +1,5 @@ { - pkgs, - lib, config, - namespace, ... }: let diff --git a/homes/x86_64-linux/admin@nuc/default.nix b/homes/x86_64-linux/admin@nuc/default.nix index 70578c1..5a4d489 100755 --- a/homes/x86_64-linux/admin@nuc/default.nix +++ b/homes/x86_64-linux/admin@nuc/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: let shellAliases = { update-boot = "sudo nixos-rebuild boot --max-jobs 10"; diff --git a/homes/x86_64-linux/matt@desktop/default.nix b/homes/x86_64-linux/matt@desktop/default.nix index 316bf8a..630ed8a 100755 --- a/homes/x86_64-linux/matt@desktop/default.nix +++ b/homes/x86_64-linux/matt@desktop/default.nix @@ -1,4 +1,4 @@ -{ pkgs, namespace, ... }: +{ pkgs, ... }: let shellAliases = { update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3"; diff --git a/modules/home/programs/code/default.nix b/modules/home/programs/code/default.nix index 66010fc..fa34add 100644 --- a/modules/home/programs/code/default.nix +++ b/modules/home/programs/code/default.nix @@ -1,24 +1,11 @@ { config, - lib, pkgs, system, ... }: let isArm = "aarch64-linux" == system; - open-remote-ssh = pkgs.vscode-utils.buildVscodeExtension { - pname = "open-remote-ssh"; - version = "0.0.49"; - vscodeExtPublisher = "jeanp413"; - vscodeExtName = "open-remote-ssh"; - vscodeExtUniqueId = "jeanp413.open-remote-ssh"; - src = pkgs.fetchurl { - url = "https://open-vsx.org/api/jeanp413/open-remote-ssh/0.0.49/file/jeanp413.open-remote-ssh-0.0.49.vsix"; - sha256 = "sha256-QfJnAAx+kO2iJ1EzWoO5HLogJKg3RiC3hg1/u2Jm6t4"; - name = "open-remote-ssh.zip"; - }; - }; x86_only = with pkgs; [ vscode-extensions.redhat.vscode-xml ]; diff --git a/modules/home/programs/waybar/options.nix b/modules/home/programs/waybar/options.nix index 8571bc5..12d7099 100644 --- a/modules/home/programs/waybar/options.nix +++ b/modules/home/programs/waybar/options.nix @@ -1,36 +1,5 @@ { lib, ... }: with lib; -let - # nord = import ../../desktop/theme/nord.nix; - - # defaultOpacity = "opacity: 0.85;"; - # defaultBorderRadius = "border-radius: 1rem;"; - # defaultCenterOptions = '' - # padding-top: 0.2rem; - # padding-bottom: 0.2rem; - # padding-left: 0.5rem; - # padding-right: 0.5rem; - # margin: 3px 0; - # ''; - # borderRight = '' - # padding-top: 0.2rem; - # padding-bottom: 0.2rem; - # padding-left: 0.5rem; - # padding-right: 0.5rem; - # margin: 3px 0; - # border-radius: 0rem 1rem 1rem 0rem; - # margin-right: 0.5rem; - # ''; - # borderLeft = '' - # padding-top: 0.2rem; - # padding-bottom: 0.2rem; - # padding-left: 0.5rem; - # padding-right: 0.5rem; - # margin: 3px 0; - # border-radius: 1rem 0rem 0rem 1rem; - # margin-left: 0.5rem; - # ''; -in { options.mjallen.programs.waybar = { enable = mkEnableOption "enable waybar"; diff --git a/modules/home/programs/waybar/scripts/hass.nix b/modules/home/programs/waybar/scripts/hass.nix index 1bdff04..3e8e053 100755 --- a/modules/home/programs/waybar/scripts/hass.nix +++ b/modules/home/programs/waybar/scripts/hass.nix @@ -8,7 +8,7 @@ let cfg = config.mjallen.programs.waybar; - pythonEnv = pkgs.python3.withPackages (ps: [ + pythonEnv = pkgs.python3.withPackages (_ps: [ pkgs.${namespace}.homeassistant-api ]); diff --git a/modules/home/sops/default.nix b/modules/home/sops/default.nix index 34f1166..1c51dc2 100644 --- a/modules/home/sops/default.nix +++ b/modules/home/sops/default.nix @@ -8,7 +8,6 @@ let cfg = config.mjallen.sops; user = config.${namespace}.user.name; - hostname = config.${namespace}.network.hostname; in { imports = [ ./options.nix ]; diff --git a/modules/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix index a552bf8..4640192 100755 --- a/modules/nixos/gaming/default.nix +++ b/modules/nixos/gaming/default.nix @@ -62,7 +62,7 @@ in nixpkgs.config.packageOverrides = pkgs: { steam = pkgs.steam.override { extraPkgs = - pkgs: with pkgsVersion; [ + _pkgs: with pkgsVersion; [ xorg.libXcursor xorg.libXi xorg.libXinerama diff --git a/modules/nixos/nextcloud/default.nix b/modules/nixos/nextcloud/default.nix index 6ab0f0e..6a5650e 100755 --- a/modules/nixos/nextcloud/default.nix +++ b/modules/nixos/nextcloud/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, namespace, ... }: @@ -69,7 +68,6 @@ in { pkgs, lib, - namespace, ... }: { diff --git a/modules/nixos/ollama/default.nix b/modules/nixos/ollama/default.nix index 17cf37c..e1237cc 100755 --- a/modules/nixos/ollama/default.nix +++ b/modules/nixos/ollama/default.nix @@ -9,7 +9,7 @@ with lib; let cfg = config.${namespace}.services.ollama; - llamaPackage = pkgs.llama-cpp.overrideAttrs (old: { + llamaPackage = pkgs.llama-cpp.overrideAttrs (_old: { src = pkgs.fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; diff --git a/modules/nixos/orca/default.nix b/modules/nixos/orca/default.nix index e6fc881..2aea1f3 100644 --- a/modules/nixos/orca/default.nix +++ b/modules/nixos/orca/default.nix @@ -1,6 +1,5 @@ { lib, - pkgs, config, ... }: diff --git a/modules/nixos/paperless/default.nix b/modules/nixos/paperless/default.nix index 723708c..c9cc978 100755 --- a/modules/nixos/paperless/default.nix +++ b/modules/nixos/paperless/default.nix @@ -11,7 +11,6 @@ let paperlessPort = 28981; paperlessUserId = config.users.users.nix-apps.uid; paperlessGroupId = config.users.groups.jallen-nas.gid; - paperlessEnv = config.sops.templates."paperless.env".path; paperlessPkg = pkgs.paperless-ngx; in { diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix index 54501b9..c12c1dc 100644 --- a/modules/nixos/sops/default.nix +++ b/modules/nixos/sops/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { # Permission modes are in octal representation (same as chmod), # the digits represent: user|group|others diff --git a/overlays/jdk/default.nix b/overlays/jdk/default.nix index c11e07f..8e61a53 100644 --- a/overlays/jdk/default.nix +++ b/overlays/jdk/default.nix @@ -1,5 +1,5 @@ -{ inputs, ... }: -final: prev: { +{ ... }: +final: _prev: { jdk = final.openjdk17; openjdk8 = final.openjdk17; } diff --git a/overlays/waybar/default.nix b/overlays/waybar/default.nix index 2d37704..c09902f 100644 --- a/overlays/waybar/default.nix +++ b/overlays/waybar/default.nix @@ -1,5 +1,5 @@ { ... }: -final: prev: { +_final: prev: { waybar = prev.waybar.overrideAttrs (old: { mesonFlags = (old.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; }); diff --git a/packages/magicattr/default.nix b/packages/magicattr/default.nix index 0f2ac82..b569ceb 100644 --- a/packages/magicattr/default.nix +++ b/packages/magicattr/default.nix @@ -1,5 +1,4 @@ { - lib, python3Packages, fetchFromGitHub, ... diff --git a/systems/aarch64-darwin/macbook-pro/default.nix b/systems/aarch64-darwin/macbook-pro/default.nix index 8166bab..5f79faa 100755 --- a/systems/aarch64-darwin/macbook-pro/default.nix +++ b/systems/aarch64-darwin/macbook-pro/default.nix @@ -1,6 +1,4 @@ { - config, - inputs, pkgs, ... }: diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix index 8b2625f..b69c6ca 100755 --- a/systems/aarch64-linux/pi4/default.nix +++ b/systems/aarch64-linux/pi4/default.nix @@ -42,7 +42,7 @@ in # Configure nixpkgs nixpkgs = { overlays = lib.mkAfter [ - (self: super: { + (_self: _super: { # This is used in (modulesPath + "/hardware/all-firmware.nix") when at least # enableRedistributableFirmware is enabled # I know no easier way to override this package diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix index a990c1c..a3a53bc 100755 --- a/systems/aarch64-linux/pi5/boot.nix +++ b/systems/aarch64-linux/pi5/boot.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: let kernelBundle = pkgs.linuxAndFirmware.latest; in diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix index 4af6cb0..034fa55 100644 --- a/systems/aarch64-linux/pi5/default.nix +++ b/systems/aarch64-linux/pi5/default.nix @@ -47,7 +47,7 @@ in # Configure nixpkgs nixpkgs = { overlays = lib.mkAfter [ - (self: super: { + (_self: _super: { # This is used in (modulesPath + "/hardware/all-firmware.nix") when at least # enableRedistributableFirmware is enabled # I know no easier way to override this package diff --git a/systems/aarch64-linux/pi5/networking.nix b/systems/aarch64-linux/pi5/networking.nix index 28a39ee..e8b0739 100755 --- a/systems/aarch64-linux/pi5/networking.nix +++ b/systems/aarch64-linux/pi5/networking.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ ... }: let hostname = "pi5"; in diff --git a/systems/x86_64-linux/nas/apps/options.nix b/systems/x86_64-linux/nas/apps/options.nix index bfa2664..9cbdbda 100644 --- a/systems/x86_64-linux/nas/apps/options.nix +++ b/systems/x86_64-linux/nas/apps/options.nix @@ -6,7 +6,7 @@ in options.nas-apps = mkOption { type = types.attrsOf ( types.submodule ( - { config, name, ... }: + { ... }: { options = { enable = mkOption { diff --git a/systems/x86_64-linux/nas/nix-serve.nix b/systems/x86_64-linux/nas/nix-serve.nix index 322882c..b369d6e 100755 --- a/systems/x86_64-linux/nas/nix-serve.nix +++ b/systems/x86_64-linux/nas/nix-serve.nix @@ -1,7 +1,4 @@ { config, pkgs, ... }: -let - nix-build-mail = pkgs.writeShellScript "echo -e \"Content-Type: text/plain\\r\\nSubject: NixOS cache rebuild failed\\r\\n\\r\\nThe nix-rebuild-cache service failed at $(date).\" | sendmail jalle008@proton.me"; -in { # "https://cache.mjallen.dev" # "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc=" diff --git a/systems/x86_64-linux/nas/nixpkgs.nix b/systems/x86_64-linux/nas/nixpkgs.nix index 3a7de92..1cad936 100755 --- a/systems/x86_64-linux/nas/nixpkgs.nix +++ b/systems/x86_64-linux/nas/nixpkgs.nix @@ -1,4 +1,4 @@ -{ outputs, ... }: +{ ... }: { # Configure nixpkgs nixpkgs = { diff --git a/systems/x86_64-linux/nuc/default.nix b/systems/x86_64-linux/nuc/default.nix index f7e465a..eb40455 100644 --- a/systems/x86_64-linux/nuc/default.nix +++ b/systems/x86_64-linux/nuc/default.nix @@ -1,8 +1,6 @@ { config, - pkgs, lib, - inputs, namespace, ... }: diff --git a/systems/x86_64-linux/nuc/sops.nix b/systems/x86_64-linux/nuc/sops.nix index 37f44b9..b7e6283 100755 --- a/systems/x86_64-linux/nuc/sops.nix +++ b/systems/x86_64-linux/nuc/sops.nix @@ -1,7 +1,4 @@ -{ config, lib, ... }: -let - user = "nix-apps"; -in +{ lib, ... }: { # Permission modes are in octal representation (same as chmod), # the digits represent: user|group|others diff --git a/systems/x86_64-linux/steamdeck/configuration.nix b/systems/x86_64-linux/steamdeck/configuration.nix index 54ac6ed..d552b8c 100755 --- a/systems/x86_64-linux/steamdeck/configuration.nix +++ b/systems/x86_64-linux/steamdeck/configuration.nix @@ -6,7 +6,6 @@ config, lib, pkgs, - namespace, ... }: diff --git a/systems/x86_64-linux/steamdeck/default.nix b/systems/x86_64-linux/steamdeck/default.nix index ac5cc5c..f43fb48 100644 --- a/systems/x86_64-linux/steamdeck/default.nix +++ b/systems/x86_64-linux/steamdeck/default.nix @@ -1,22 +1,13 @@ # Snowfall Lib provides a customized `lib` instance with access to your flake's library { # as well as the libraries available from your flake's inputs. - lib, # An instance of `pkgs` with your overlays and packages applied is also available. - pkgs, # You also have access to your flake's inputs. - inputs, # Additional metadata is provided by Snowfall Lib. - namespace, # The namespace used for your flake, defaulting to "internal" if not set. - system, # The system architecture for this host (eg. `x86_64-linux`). - target, # The Snowfall Lib target for this system (eg. `x86_64-iso`). - format, # A normalized name for the system target (eg. `iso`). - virtual, # A boolean to determine whether this system is a virtual target using nixos-generators. - systems, # An attribute map of your defined hosts. + namespace, # The namespace used for your flake, defaulting to "internal" if not set. # The system architecture for this host (eg. `x86_64-linux`). # The Snowfall Lib target for this system (eg. `x86_64-iso`). # A normalized name for the system target (eg. `iso`). # A boolean to determine whether this system is a virtual target using nixos-generators. # An attribute map of your defined hosts. # All other arguments come from the system system. - config, ... }: { diff --git a/treefmt.nix b/treefmt.nix index 600cdb0..552bf15 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -42,6 +42,7 @@ settings = { fail-on-change = false; + no-cache = true; global.excludes = [ "*.editorconfig" "*.envrc"