From 4584e9855774ce0801dd4f9bbb3596a6588e992b Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Mon, 6 Nov 2023 14:40:43 +0300
Subject: [PATCH] Reorder stuff alphabethically and quote non command strings
 in Nu config

---
 machines/enka/bat/default.nix          | 2 +-
 machines/enka/git/default.nix          | 2 +-
 machines/enka/gtk/default.nix          | 8 ++++----
 machines/enka/hardware.nix             | 2 +-
 machines/enka/hyprland/default.nix     | 4 ++--
 machines/enka/nushell/configuration.nu | 2 +-
 machines/enka/nushell/default.nix      | 1 +
 machines/enka/steck/default.nix        | 2 +-
 machines/enka/users.nix                | 4 ++--
 9 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/machines/enka/bat/default.nix b/machines/enka/bat/default.nix
index 4d2d972..1bf63c1 100644
--- a/machines/enka/bat/default.nix
+++ b/machines/enka/bat/default.nix
@@ -6,8 +6,8 @@
 
 (homeConfiguration "nixos" {
   programs.nushell.environmentVariables = {
-    PAGER    = "\"bat --plain\"";
     MANPAGER = "\"sh -c 'col --spaces --no-backspaces | bat --plain --language man'\"";
+    PAGER    = "\"bat --plain\"";
   };
 
   programs.bat = enabled {
diff --git a/machines/enka/git/default.nix b/machines/enka/git/default.nix
index fd2a9de..c0e41c5 100644
--- a/machines/enka/git/default.nix
+++ b/machines/enka/git/default.nix
@@ -27,9 +27,9 @@ homeConfiguration "nixos" {
     extraConfig = {
       init.defaultBranch = "master";
 
+      commit.gpgSign  = true;
       gpg.format      = "ssh";
       user.signingKey = "~/.ssh/id_rsa";
-      commit.gpgSign  = true;
 
       url."ssh://git@github.com/".insteadOf = "https://github.com/";
     };
diff --git a/machines/enka/gtk/default.nix b/machines/enka/gtk/default.nix
index 458fd96..93b0156 100644
--- a/machines/enka/gtk/default.nix
+++ b/machines/enka/gtk/default.nix
@@ -7,24 +7,24 @@
 (homeConfiguration "nixos" {
   gtk = enabled {
     cursorTheme = {
-      package = pkgs.capitaine-cursors-themed;
       name    = "Gruvbox";
+      package = pkgs.capitaine-cursors-themed;
     };
 
     font = {
-      package = pkgs.jetbrains-mono;
       name    = "JetBrainsMono";
+      package = pkgs.jetbrains-mono;
       size    = 11;
     };
 
     iconTheme = {
-      package = pkgs.gruvbox-dark-icons-gtk;
       name    = "gruvbox-dark";
+      package = pkgs.gruvbox-dark-icons-gtk;
     };
 
     theme = {
-      package = pkgs.gruvbox-gtk-theme;
       name    = "Gruvbox-Dark-BL";
+      package = pkgs.gruvbox-gtk-theme;
     };
   };
 })
diff --git a/machines/enka/hardware.nix b/machines/enka/hardware.nix
index 55b64b3..0eef91d 100644
--- a/machines/enka/hardware.nix
+++ b/machines/enka/hardware.nix
@@ -13,8 +13,8 @@ systemConfiguration {
   ];
 
   boot.loader = {
-    systemd-boot             = enabled {};
     efi.canTouchEfiVariables = true;
+    systemd-boot             = enabled {};
   };
 
   fileSystems."/" = {
diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix
index cdad788..ef2d991 100644
--- a/machines/enka/hyprland/default.nix
+++ b/machines/enka/hyprland/default.nix
@@ -83,8 +83,8 @@
       }
 
       decoration {
-        rounding    = 0
         drop_shadow = false
+        rounding    = 0
 
         blur {
           enabled = false
@@ -105,8 +105,8 @@
         disable_hyprland_logo    = true
         disable_splash_rendering = true
 
-        mouse_move_enables_dpms = true
         key_press_enables_dpms  = true
+        mouse_move_enables_dpms = true
 
         animate_manual_resizes       = true
         animate_mouse_windowdragging = true
diff --git a/machines/enka/nushell/configuration.nu b/machines/enka/nushell/configuration.nu
index d82c31d..7103bec 100644
--- a/machines/enka/nushell/configuration.nu
+++ b/machines/enka/nushell/configuration.nu
@@ -3,7 +3,7 @@ let theme = {
     leading_trailing_space_bg:  { attr: n }
     header:                     green_bold
     empty:                      blue
-    bool:                       {|| if $in { light_cyan } else { light_red }}
+    bool:                       {|| if $in { "light_cyan" } else { "light_red" }}
     int:                        white
     filesize:                   cyan
     duration:                   white
diff --git a/machines/enka/nushell/default.nix b/machines/enka/nushell/default.nix
index 5ab52b2..850c2c7 100644
--- a/machines/enka/nushell/default.nix
+++ b/machines/enka/nushell/default.nix
@@ -13,6 +13,7 @@
 
     shellAliases = {
       la  = "ls --all";
+      ll  = "ls --long";
       lla = "ls --long --all";
       sl  = "ls";
     };
diff --git a/machines/enka/steck/default.nix b/machines/enka/steck/default.nix
index b8b7fd4..68790b6 100644
--- a/machines/enka/steck/default.nix
+++ b/machines/enka/steck/default.nix
@@ -5,5 +5,5 @@
 ])
 
 (homeConfiguration "nixos" {
-  programs.nushell.shellAliases = "steck paste";
+  programs.nushell.shellAliases.share = "steck paste";
 })
diff --git a/machines/enka/users.nix b/machines/enka/users.nix
index 77d15ae..0ed5d34 100644
--- a/machines/enka/users.nix
+++ b/machines/enka/users.nix
@@ -5,9 +5,9 @@ systemConfiguration {
     description = "NixOS";
 
     extraGroups = [
-      "wheel"
-      "networkmanager"
       "docker"
+      "networkmanager"
+      "wheel"
     ];
   };
 }