Better formatting

machines/asus/bat/default.nix

@@ -6,7 +6,7 @@
 
 (homeConfiguration "nixos" {
   programs.nushell.environmentVariables = {
-    PAGER = "\"bat --plain\"";
+    PAGER    = "\"bat --plain\"";
     MANPAGER = "\"sh -c 'col --spaces --no-backspaces | bat --plain --language man'\"";
   };
 
@@ -14,9 +14,9 @@
     config.theme = "catppuccin";
 
     themes.catppuccin = builtins.readFile (pkgs.fetchFromGitHub {
-      owner = "catppuccin";
+      owner  = "catppuccin";
-      repo = "bat";
+      repo   = "bat";
-      rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+      rev    = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
       sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
     } + "/Catppuccin-mocha.tmTheme");
   };

machines/asus/fonts.nix

@@ -3,17 +3,13 @@
 (systemConfiguration {
   console = {
     earlySetup = true;
-    font = "Lat2-Terminus16";
+    font       = "Lat2-Terminus16";
-    packages = with pkgs; [
+    packages   = with pkgs; [ terminus-nerdfont ];
-      terminus-nerdfont
-    ];
   };
 })
 
 (with pkgs; systemFonts [
   (nerdfonts.override {
-    fonts = [
+    fonts = [ "JetBrainsMono" ];
-      "JetBrainsMono"
-    ];
   })
 ])

machines/asus/git/default.nix

@@ -2,30 +2,31 @@
 
 homeConfiguration "nixos" {
   programs.nushell.shellAliases = {
-    g = "git";
+    g    = "git";
-    ga = "git add ./";
+    ga   = "git add ./";
-    grb = "git rebase --interactive";
+    grb  = "git rebase --interactive";
     grba = "git rebase --abort";
-    gc = "git commit --message";
+    gc   = "git commit --message";
-    gca = "git commit --amend";
+    gca  = "git commit --amend";
-    gcl = "git clone";
+    gcl  = "git clone";
-    gd = "git diff";
+    gd   = "git diff";
-    gds = "git diff --staged";
+    gds  = "git diff --staged";
-    gp = "git push";
+    gp   = "git push";
-    gs = "git stash";
+    gs   = "git stash";
-    gss = "git status";
+    gst  = "git status";
   };
 
   programs.git = enabled {
-    userName = "RGBCube";
+    userName  = "RGBCube";
     userEmail = "RGBCube@users.noreply.github.com";
 
     extraConfig = {
       init.defaultBranch = "master";
 
-      gpg.format = "ssh";
+      gpg.format      = "ssh";
       user.signingKey = "~/.ssh/id_rsa";
-      commit.gpgSign = true;
+      commit.gpgSign  = true;
+
       url."ssh://git@github.com/".insteadOf = "https://github.com/";
     };
   };

machines/asus/hardware.nix

@@ -17,9 +17,9 @@ systemConfiguration {
   ];
 
   boot.loader = {
-    systemd-boot = enabled {};
+    systemd-boot             = enabled {};
     efi.canTouchEfiVariables = true;
-    efi.efiSysMountPoint = "/boot/efi";
+    efi.efiSysMountPoint     = "/boot/efi";
   };
 
   fileSystems."/" = {

machines/asus/helix/default.nix

@@ -13,16 +13,13 @@
     settings.theme = "catppuccin_mocha";
 
     settings.editor = {
-      color-modes = true;
+      color-modes         = true;
       cursor-shape.insert = "bar";
-      cursorline = true;
+      cursorline          = true;
-      file-picker.hidden = false;
+      file-picker.hidden  = false;
-      line-number = "relative";
+      line-number         = "relative";
-      shell = [
+      shell               = [ "nu" "-c" ];
-        "nu"
+      text-width          = 100;
-        "-c"
-      ];
-      text-width = 100;
     };
 
     settings.editor.auto-pairs = {
@@ -42,7 +39,7 @@
     };
 
     settings.editor.whitespace = {
-      render.tab = "all";
+      render.tab     = "all";
       characters.tab = "→";
     };
   };

machines/asus/localisation.nix

@@ -2,20 +2,22 @@
 
 systemConfiguration {
   services.xserver.layout = "tr";
-  console.keyMap = "trq";
+  console.keyMap          = "trq";
 
   time.timeZone = "Europe/Istanbul";
 
-  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.defaultLocale       = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
+  i18n.extraLocaleSettings = let
-    LC_ADDRESS = "tr_TR.UTF-8";
+    locale = "tr_TR.UTF-8";
-    LC_IDENTIFICATION = "tr_TR.UTF-8";
+  in {
-    LC_MEASUREMENT = "tr_TR.UTF-8";
+    LC_ADDRESS        = locale;
-    LC_MONETARY = "tr_TR.UTF-8";
+    LC_IDENTIFICATION = locale;
-    LC_NAME = "tr_TR.UTF-8";
+    LC_MEASUREMENT    = locale;
-    LC_NUMERIC = "tr_TR.UTF-8";
+    LC_MONETARY       = locale;
-    LC_PAPER = "tr_TR.UTF-8";
+    LC_NAME           = locale;
-    LC_TELEPHONE = "tr_TR.UTF-8";
+    LC_NUMERIC        = locale;
-    LC_TIME = "tr_TR.UTF-8";
+    LC_PAPER          = locale;
+    LC_TELEPHONE      = locale;
+    LC_TIME           = locale;
   };
 }

machines/asus/nushell/default.nix

@@ -8,13 +8,13 @@
   programs.starship = enabled {
     settings.character = {
       success_symbol = "";
-      error_symbol = "";
+      error_symbol   = "";
     };
   };
 
   programs.nushell = enabled {
     configFile.source = ./configuration.nu;
-    envFile.source = ./environment.nu;
+    envFile.source    = ./environment.nu;
 
     shellAliases = {
       la = "ls --all";

machines/asus/pipewire/default.nix

@@ -2,7 +2,7 @@
 
 systemConfiguration {
   security.rtkit = enabled {};
-  sound = enabled {};
+  sound          = enabled {};
 
   services.pipewire = enabled {
     pulse = enabled {};

machines/asus/xserver/default.nix

@@ -2,7 +2,7 @@
 
 systemConfiguration {
   services.xserver = enabled {
-    displayManager.sddm = enabled {};
+    displayManager.sddm    = enabled {};
     desktopManager.plasma5 = enabled {};
   };
 }