diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 75378ad..911d585 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: { +{ imports = [ ./alacritty.nix ./dunst.nix diff --git a/home/desktop/waybar/default.nix b/home/desktop/waybar/default.nix index acdeb56..d8dcc18 100644 --- a/home/desktop/waybar/default.nix +++ b/home/desktop/waybar/default.nix @@ -1,4 +1,3 @@ -{ config, pkgs, ... }: { programs.waybar = { enable = true; @@ -9,16 +8,29 @@ layer = "bottom"; position = "top"; output = [ - "DP-3" "DP-4" "DP-5" - "DP-6" "DP-7" "DP-8" + "DP-3" + "DP-4" + "DP-5" + "DP-6" + "DP-7" + "DP-8" "DP-1" "eDP-1" ]; - modules-left = ["hyprland/workspaces" "hyprland/mode"]; + modules-left = [ + "hyprland/workspaces" + "hyprland/mode" + ]; modules-center = [ "hyprland/window" ]; - modules-right = ["pulseaudio" "backlight" "network" "battery" "clock" "tray"]; - + modules-right = [ + "pulseaudio" + "backlight" + "network" + "battery" + "clock" + "tray" + ]; cpu = { interval = 15; @@ -43,11 +55,14 @@ phone = ""; portable = ""; car = ""; - default = ["" ""]; + default = [ + "" + "" + ]; }; scroll-step = 1; on-click = "pavucontrol"; - ignored-sinks = ["Easy Effects Sink"]; + ignored-sinks = [ "Easy Effects Sink" ]; }; backlight = { @@ -62,7 +77,7 @@ format = "{ifname}"; format-wifi = "{essid} ({signalStrength}%) "; format-ethernet = "{ipaddr}/{cidr} 󰊗"; - format-disconnected = "󰤮"; + format-disconnected = "󰤮"; tooltip-format = "{ifname} via {gwaddr} 󰊗"; tooltip-format-wifi = "{essid} ({signalStrength}%) "; tooltip-format-ethernet = "{ifname} "; @@ -72,7 +87,13 @@ battery = { format = "{capacity}% {icon}"; - "format-icons" = ["" "" "" "" ""]; + "format-icons" = [ + "" + "" + "" + "" + "" + ]; }; clock = { diff --git a/home/desktop/wofi.nix b/home/desktop/wofi.nix index 8ba10db..5e4181e 100644 --- a/home/desktop/wofi.nix +++ b/home/desktop/wofi.nix @@ -1,4 +1,3 @@ -{ config, pkgs, ... }: { programs.wofi = { enable = true; diff --git a/home/essentials/ssh.nix b/home/essentials/ssh.nix index c0784a8..e3145db 100644 --- a/home/essentials/ssh.nix +++ b/home/essentials/ssh.nix @@ -1,4 +1,3 @@ -{ config, age, ... }: { programs.ssh = { enable = true; diff --git a/home/misc_pkgs/default.nix b/home/misc_pkgs/default.nix index f6f62ef..66c1d1f 100644 --- a/home/misc_pkgs/default.nix +++ b/home/misc_pkgs/default.nix @@ -1,11 +1,3 @@ -{ - agenix, - config, - inputs, - pkgs, - spicetify-nix, - ... -}: { imports = [ ./packages.nix diff --git a/home/misc_pkgs/spicetify.nix b/home/misc_pkgs/spicetify.nix index 413abb1..327eadc 100644 --- a/home/misc_pkgs/spicetify.nix +++ b/home/misc_pkgs/spicetify.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, config, spicetify-nix, ... }: +{ pkgs, spicetify-nix, ... }: { programs.spicetify = let diff --git a/home/utils/default.nix b/home/utils/default.nix index 6c61496..a3251f5 100644 --- a/home/utils/default.nix +++ b/home/utils/default.nix @@ -1,4 +1,4 @@ -{ services, ... }: { +{ imports = [ ./btop ./blueman.nix diff --git a/home/utils/easyeffects.nix b/home/utils/easyeffects.nix index 8b6b8cb..7de5641 100644 --- a/home/utils/easyeffects.nix +++ b/home/utils/easyeffects.nix @@ -1,4 +1,3 @@ -{ services, ... }: { services.easyeffects = { enable = true; diff --git a/modules/essentials/default.nix b/modules/essentials/default.nix index 8b3f7aa..33c6532 100644 --- a/modules/essentials/default.nix +++ b/modules/essentials/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ imports = [ ./bootloader.nix ./environment.nix diff --git a/modules/misc_hardware/default.nix b/modules/misc_hardware/default.nix index 49d6dfc..5dcc601 100644 --- a/modules/misc_hardware/default.nix +++ b/modules/misc_hardware/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: { +{ imports = [ ./bluetooth.nix ./diskservices.nix diff --git a/modules/misc_hardware/networking.nix b/modules/misc_hardware/networking.nix index b572fca..cdc4844 100644 --- a/modules/misc_hardware/networking.nix +++ b/modules/misc_hardware/networking.nix @@ -1,4 +1,3 @@ -{ config, ... }: { networking = { hostName = "rhea-laptop"; diff --git a/modules/utils/default.nix b/modules/utils/default.nix index 993cc83..e857f2f 100644 --- a/modules/utils/default.nix +++ b/modules/utils/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ imports = [ ./agenix.nix ./auth.nix