From 36d91dd3274304b5c7c8d7f384879ba3d19e0392 Mon Sep 17 00:00:00 2001 From: joy Date: Sat, 14 Sep 2024 21:25:34 +0200 Subject: [PATCH] formating --- modules/apps/code/default.nix | 18 ++++++------- modules/apps/helix/default.nix | 3 +-- modules/apps/nemo/default.nix | 39 +++++++++++++++------------ modules/apps/packages/default.nix | 8 ++++-- modules/hypr/hyprland/default.nix | 4 +-- modules/system/homemanger/default.nix | 5 ++-- modules/system/xdg/default.nix | 20 +++++++------- 7 files changed, 53 insertions(+), 44 deletions(-) diff --git a/modules/apps/code/default.nix b/modules/apps/code/default.nix index a4c756e..3c4b086 100644 --- a/modules/apps/code/default.nix +++ b/modules/apps/code/default.nix @@ -1,10 +1,10 @@ -{pkgs,...}: { - home-manager.users.joy.programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - ms-dotnettools.csharp - jdinhlife.gruvbox - ]; -}; +{pkgs, ...}: { + home-manager.users.joy.programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + ms-dotnettools.csharp + jdinhlife.gruvbox + ]; + }; } diff --git a/modules/apps/helix/default.nix b/modules/apps/helix/default.nix index 321c60a..d69dd15 100644 --- a/modules/apps/helix/default.nix +++ b/modules/apps/helix/default.nix @@ -1,5 +1,5 @@ { - pkgs, + pkgs, lib, ... }: { @@ -14,7 +14,6 @@ Z.Q = ":q!"; }; }; - }; home-manager.users.joy.home.packages = with pkgs; [ diff --git a/modules/apps/nemo/default.nix b/modules/apps/nemo/default.nix index 709bfb3..1174943 100644 --- a/modules/apps/nemo/default.nix +++ b/modules/apps/nemo/default.nix @@ -1,19 +1,24 @@ -{pkgs,lib,...}: { environment.systemPackages = [ - (let - packagesWithSchemas = [ - pkgs.nemo - ]; - in - pkgs.runCommand "ngsettings" { - nativeBuildInputs = [ - pkgs.makeWrapper - ]; - } '' - mkdir -p "$out/bin" - # Creates ngsettings program (wrapped gsettings) - makeWrapper "${pkgs.glib.bin}/bin/gsettings" "$out/bin/ngsettings" \ - --set XDG_DATA_DIRS "${lib.concatMapStringsSep ":" pkgs.glib.getSchemaDataDirPath packagesWithSchemas}" - '') - pkgs.nemo +{ + pkgs, + lib, + ... +}: { + environment.systemPackages = [ + (let + packagesWithSchemas = [ + pkgs.nemo + ]; + in + pkgs.runCommand "ngsettings" { + nativeBuildInputs = [ + pkgs.makeWrapper + ]; + } '' + mkdir -p "$out/bin" + # Creates ngsettings program (wrapped gsettings) + makeWrapper "${pkgs.glib.bin}/bin/gsettings" "$out/bin/ngsettings" \ + --set XDG_DATA_DIRS "${lib.concatMapStringsSep ":" pkgs.glib.getSchemaDataDirPath packagesWithSchemas}" + '') + pkgs.nemo ]; } diff --git a/modules/apps/packages/default.nix b/modules/apps/packages/default.nix index e70b77f..e8a76fa 100644 --- a/modules/apps/packages/default.nix +++ b/modules/apps/packages/default.nix @@ -1,5 +1,9 @@ -{pkgs,lib, ...}: { - environment.systemPackages = with pkgs; [ +{ + pkgs, + lib, + ... +}: { + environment.systemPackages = with pkgs; [ fastfetch cmatrix cava diff --git a/modules/hypr/hyprland/default.nix b/modules/hypr/hyprland/default.nix index 187d4a3..6d83958 100644 --- a/modules/hypr/hyprland/default.nix +++ b/modules/hypr/hyprland/default.nix @@ -77,8 +77,8 @@ }; device = { name = [ - "compx-2.4g-wireless-receiver" - "at-translated-set-2-keyboard" + "compx-2.4g-wireless-receiver" + "at-translated-set-2-keyboard" ]; repeat_rate = "50"; }; diff --git a/modules/system/homemanger/default.nix b/modules/system/homemanger/default.nix index 029d85c..bf6a6df 100644 --- a/modules/system/homemanger/default.nix +++ b/modules/system/homemanger/default.nix @@ -1,5 +1,6 @@ -{...}: { home-manager = { - backupFileExtension = "bkp"; +{...}: { + home-manager = { + backupFileExtension = "bkp"; users.joy = { programs.home-manager.enable = true; xresources.path = ".config/.Xresources"; diff --git a/modules/system/xdg/default.nix b/modules/system/xdg/default.nix index 627b1b1..4e92006 100644 --- a/modules/system/xdg/default.nix +++ b/modules/system/xdg/default.nix @@ -1,16 +1,16 @@ {...}: { home-manager.users.joy.xdg = { - desktopEntries = { - hx = { - name = "Helix"; - exec = "alacritty -e hx %F"; - icon = "Helix"; - terminal = false; - type = "Application"; - categories = ["Utility" "TextEditor"]; - mimeType = ["text/plain"]; - }; + desktopEntries = { + hx = { + name = "Helix"; + exec = "alacritty -e hx %F"; + icon = "Helix"; + terminal = false; + type = "Application"; + categories = ["Utility" "TextEditor"]; + mimeType = ["text/plain"]; }; + }; mimeApps = { enable = true; defaultApplications = {