summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--home/apps/alacritty.nix4
-rw-r--r--home/apps/default.nix2
-rw-r--r--home/browsers/default.nix2
-rw-r--r--home/browsers/firefox/default.nix4
-rw-r--r--home/desktops/hyprland/env.nix2
-rw-r--r--home/desktops/sway/config.nix6
-rw-r--r--hosts/kaworu/default.nix2
-rw-r--r--hosts/kaworu/hardware.nix2
-rw-r--r--hosts/thinkpad/default.nix2
-rw-r--r--hosts/thinkpad/hardware.nix2
-rw-r--r--lib/files.nix2
-rw-r--r--options.nix4
-rw-r--r--pkgs/astal/builder.nix2
-rw-r--r--pkgs/astal/default.nix3
-rw-r--r--system/desktops/default.nix2
-rw-r--r--system/gaming/default.nix2
-rw-r--r--system/virt/default.nix2
18 files changed, 23 insertions, 24 deletions
diff --git a/flake.nix b/flake.nix
index 0a1ae95..7d17ed6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,7 +120,7 @@
legacyPackages = packages;
formatter = perSystem (
- pkgs: system:
+ pkgs: _:
pkgs.alejandra
);
diff --git a/home/apps/alacritty.nix b/home/apps/alacritty.nix
index 5c47f65..e90e7e6 100644
--- a/home/apps/alacritty.nix
+++ b/home/apps/alacritty.nix
@@ -48,7 +48,7 @@ in {
# Colors
colors = {
- normal = lib.attrsets.mapAttrs (name: color: "${color}") {
+ normal = lib.attrsets.mapAttrs (_: color: "${color}") {
inherit
(config.theme.colors.normal)
black
@@ -62,7 +62,7 @@ in {
;
};
- bright = lib.attrsets.mapAttrs (name: color: "${color}") {
+ bright = lib.attrsets.mapAttrs (_: color: "${color}") {
inherit
(config.theme.colors.bright)
black
diff --git a/home/apps/default.nix b/home/apps/default.nix
index 074e588..58cd117 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
imports = [
./waybar
./wofi
diff --git a/home/browsers/default.nix b/home/browsers/default.nix
index dc74460..e4a65e1 100644
--- a/home/browsers/default.nix
+++ b/home/browsers/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
imports = [
./firefox
./zen.nix
diff --git a/home/browsers/firefox/default.nix b/home/browsers/firefox/default.nix
index 2f7475e..c206092 100644
--- a/home/browsers/firefox/default.nix
+++ b/home/browsers/firefox/default.nix
@@ -7,7 +7,7 @@
extraPrefs = lib.fileContents ./mozilla.cfg;
userChrome = lib.fileContents ./userChrome.css;
my-firefox = pkgs.firefox.override {
- extraPrefs = extraPrefs;
+ inherit extraPrefs;
};
inherit (lib) mkIf;
@@ -30,7 +30,7 @@ in {
default = "ddg";
};
- userChrome = userChrome;
+ inherit userChrome;
};
};
};
diff --git a/home/desktops/hyprland/env.nix b/home/desktops/hyprland/env.nix
index 6773c55..8699587 100644
--- a/home/desktops/hyprland/env.nix
+++ b/home/desktops/hyprland/env.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
wayland.windowManager.hyprland.settings = {
env = [
"XDG_CURRENT_DESKTOP,Hyprland"
diff --git a/home/desktops/sway/config.nix b/home/desktops/sway/config.nix
index 11a12af..19077af 100644
--- a/home/desktops/sway/config.nix
+++ b/home/desktops/sway/config.nix
@@ -70,17 +70,17 @@
focused = {
border = primary;
background = base;
- text = text;
indicator = white;
childBorder = primary;
+ inherit text;
};
focusedInactive = {
border = surface;
background = base;
- text = text;
indicator = surface;
childBorder = surface;
+ inherit text;
};
unfocused = focusedInactive;
@@ -88,9 +88,9 @@
urgent = {
border = error;
background = error;
- text = text;
indicator = error;
childBorder = error;
+ inherit text;
};
placeholder = unfocused;
diff --git a/hosts/kaworu/default.nix b/hosts/kaworu/default.nix
index 5056512..940f3fc 100644
--- a/hosts/kaworu/default.nix
+++ b/hosts/kaworu/default.nix
@@ -1,6 +1,6 @@
# Kaworu
# System configuration for my desktop
-{...}: {
+_: {
imports = [
./hardware.nix
];
diff --git a/hosts/kaworu/hardware.nix b/hosts/kaworu/hardware.nix
index 8b49109..c3c9a57 100644
--- a/hosts/kaworu/hardware.nix
+++ b/hosts/kaworu/hardware.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
# bootloader
boot.loader.systemd-boot.enable = true;
boot.loader.efi = {
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 3d537c7..09a7bc9 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -1,6 +1,6 @@
# Thinkpad
#System configuration for my thinkpad
-{...}: {
+_: {
imports = [
./hardware.nix
./sops.nix
diff --git a/hosts/thinkpad/hardware.nix b/hosts/thinkpad/hardware.nix
index 95f9ffd..109f6c0 100644
--- a/hosts/thinkpad/hardware.nix
+++ b/hosts/thinkpad/hardware.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
# bootloader
boot.loader.systemd-boot.enable = true;
boot.loader.efi = {
diff --git a/lib/files.nix b/lib/files.nix
index f4e6e50..960d1d0 100644
--- a/lib/files.nix
+++ b/lib/files.nix
@@ -1,7 +1,7 @@
{lib, ...}: let
# gets list of files from a directory
getFiles = folder:
- lib.attrsets.mapAttrsToList (name: type: "${folder}/${name}") (builtins.readDir folder);
+ lib.attrsets.mapAttrsToList (name: _: "${folder}/${name}") (builtins.readDir folder);
# gets custom set of root certs
certs = getFiles ../files/certs;
diff --git a/options.nix b/options.nix
index 141bf08..5093e8b 100644
--- a/options.nix
+++ b/options.nix
@@ -5,7 +5,7 @@
}:
with lib; let
# monitor options
- monitorOpts = self: {
+ monitorOpts = _: {
options = {
port = mkOption {
type = types.str;
@@ -71,7 +71,7 @@ with lib; let
# theme color options
- colorOpts = self: {
+ colorOpts = _: {
options = {
name = mkOption {
type = types.str;
diff --git a/pkgs/astal/builder.nix b/pkgs/astal/builder.nix
index c48eaf5..db102bd 100644
--- a/pkgs/astal/builder.nix
+++ b/pkgs/astal/builder.nix
@@ -3,7 +3,7 @@
astal,
name,
src,
- extraLuaPackages ? (ps: []),
+ extraLuaPackages ? (_: []),
extraPackages ? [],
}: let
lua = pkgs.lua.withPackages (ps:
diff --git a/pkgs/astal/default.nix b/pkgs/astal/default.nix
index 6317f3b..dc8f2a7 100644
--- a/pkgs/astal/default.nix
+++ b/pkgs/astal/default.nix
@@ -5,8 +5,7 @@
options,
...
}: let
- runCommand = pkgs.runCommand;
- dart-sass = pkgs.dart-sass;
+ inherit (pkgs) runCommand dart-sass;
apkgs = inputs.astal.packages.${stdenv.hostPlatform.system};
scss = "${dart-sass}/bin/sass";
diff --git a/system/desktops/default.nix b/system/desktops/default.nix
index 8f9270f..476dd72 100644
--- a/system/desktops/default.nix
+++ b/system/desktops/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
imports = [
./hyprland.nix
./ly.nix
diff --git a/system/gaming/default.nix b/system/gaming/default.nix
index acb0a1f..734ece0 100644
--- a/system/gaming/default.nix
+++ b/system/gaming/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
imports = [
./steam.nix
];
diff --git a/system/virt/default.nix b/system/virt/default.nix
index d37b637..3b422be 100644
--- a/system/virt/default.nix
+++ b/system/virt/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
imports = [
./docker.nix
./qemu.nix