From b84c51a299db9dbeac890e035325f64c1ea5dcab Mon Sep 17 00:00:00 2001 From: joy Date: Sat, 31 Aug 2024 16:58:46 +0200 Subject: [PATCH] formating --- modules/apps/default.nix | 18 +++++++------- modules/apps/packages/default.nix | 1 - modules/default.nix | 14 +++++------ modules/desktop/default.nix | 6 ++--- modules/desktop/hyprland/default.nix | 2 +- modules/hardware/default.nix | 2 +- modules/services/default.nix | 8 +++--- modules/services/dunst/default.nix | 37 ++++++++++++++-------------- modules/styling/default.nix | 6 ++--- modules/styling/gtk/default.nix | 2 +- modules/styling/qt/default.nix | 3 +-- modules/system/default.nix | 9 +------ modules/tools/default.nix | 6 ++--- 13 files changed, 52 insertions(+), 62 deletions(-) diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 80d064e..88fb769 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -1,13 +1,13 @@ { imports = [ - ./alacritty - ./appimage - ./firefox - ./helix - ./newsboat - ./packages - ./rofi - ./vm - ./zsh + ./alacritty + ./appimage + ./firefox + ./helix + ./newsboat + ./packages + ./rofi + ./vm + ./zsh ]; } diff --git a/modules/apps/packages/default.nix b/modules/apps/packages/default.nix index d1b1b89..61c6d08 100644 --- a/modules/apps/packages/default.nix +++ b/modules/apps/packages/default.nix @@ -69,4 +69,3 @@ texliveFull ]; } - diff --git a/modules/default.nix b/modules/default.nix index e51d739..0471d61 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,11 +1,11 @@ { imports = [ - ./apps - ./desktop - ./hardware - ./services - ./styling - ./system - ./tools + ./apps + ./desktop + ./hardware + ./services + ./styling + ./system + ./tools ]; } diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 6f87207..6c80519 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,7 +1,7 @@ { imports = [ - ./ags - ./hypridle - ./hyprland + ./ags + ./hypridle + ./hyprland ]; } diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix index d374f25..9287012 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/desktop/hyprland/default.nix @@ -95,7 +95,7 @@ "$mod+shift, B, exec, sh ~/nix/modules/desktop/hyprland/scripts/ags.sh" "$mod, up, exec, sh ~/nix/modules/desktop/hyprland/scripts/volume.sh -i" "$mod, down, exec, sh ~/nix/modules/desktop/hyprland/scripts/volume.sh -d" - "$mod, P, exec, hyprctl dispatch togglefloating && hyprctl dispatch pin" + "$mod, P, exec, hyprctl dispatch togglefloating && hyprctl dispatch pin" # cmus "$mod, D, exec, sh ~/nix/modules/desktop/hyprland/scripts/cmus.sh" diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index 0346b38..e91856a 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./bluetooth + ./bluetooth ./sound ]; } diff --git a/modules/services/default.nix b/modules/services/default.nix index 35fdce9..276ba83 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1,8 +1,8 @@ { imports = [ - ./dunst - ./gdm - ./polkit - ./syncthing + ./dunst + ./gdm + ./polkit + ./syncthing ]; } diff --git a/modules/services/dunst/default.nix b/modules/services/dunst/default.nix index 2c2e575..1875b50 100644 --- a/modules/services/dunst/default.nix +++ b/modules/services/dunst/default.nix @@ -1,28 +1,27 @@ -{ ... }: -{ +{...}: { home-manager.users.joy.services.dunst = { enable = true; # settings = { - # global = { - # frame_color = "#89b4fa"; - # separator_color = "frame"; - # }; + # global = { + # frame_color = "#89b4fa"; + # separator_color = "frame"; + # }; - # urgency_low = { - # background = "#1e1e2e"; - # foreground = "#cdd6f4"; - # }; + # urgency_low = { + # background = "#1e1e2e"; + # foreground = "#cdd6f4"; + # }; - # urgency_normal = { - # background = "#1e1e2e"; - # foreground = "#cdd6f4"; - # }; + # urgency_normal = { + # background = "#1e1e2e"; + # foreground = "#cdd6f4"; + # }; - # urgency_critical = { - # background = "#1e1e2e"; - # foreground = "#cdd6f4"; - # frame_color = "#fab387"; - # }; + # urgency_critical = { + # background = "#1e1e2e"; + # foreground = "#cdd6f4"; + # frame_color = "#fab387"; + # }; # }; }; } diff --git a/modules/styling/default.nix b/modules/styling/default.nix index 8406c2f..42ff51d 100644 --- a/modules/styling/default.nix +++ b/modules/styling/default.nix @@ -1,7 +1,7 @@ { imports = [ - ./qt - # ./gkt - ./stylix + ./qt + # ./gkt + ./stylix ]; } diff --git a/modules/styling/gtk/default.nix b/modules/styling/gtk/default.nix index 44bc138..71285b0 100644 --- a/modules/styling/gtk/default.nix +++ b/modules/styling/gtk/default.nix @@ -10,7 +10,7 @@ in { iconTheme.package = gruvboxPlus; iconTheme.name = "GruvboxPlus"; }; - + # qt.enable = true; # qt.style.name = "adwaita-dark"; # qt.style.package = pkgs.adwaita-qt; diff --git a/modules/styling/qt/default.nix b/modules/styling/qt/default.nix index 0fa5491..c7fdc61 100644 --- a/modules/styling/qt/default.nix +++ b/modules/styling/qt/default.nix @@ -1,5 +1,4 @@ -{pkgs, ...}: -{ +{pkgs, ...}: { home-manager.users.joy.qt = { enable = true; style.name = "adwaita-dark"; diff --git a/modules/system/default.nix b/modules/system/default.nix index 86a8ad4..6478ee3 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -1,10 +1,4 @@ - -{ - inputs, - pkgs, - ... -}: { - +{pkgs, ...}: { users.users.joy = { isNormalUser = true; description = "joy"; @@ -40,7 +34,6 @@ services.udisks2.enable = true; services.gvfs.enable = true; - home-manager.users.joy.programs.home-manager.enable = true; home-manager.users.joy.xdg.mimeApps.defaultApplications = { diff --git a/modules/tools/default.nix b/modules/tools/default.nix index 43e2ca7..decab09 100644 --- a/modules/tools/default.nix +++ b/modules/tools/default.nix @@ -1,7 +1,7 @@ { imports = [ - ./git - ./ssh - ./gpg + ./git + ./ssh + ./gpg ]; }