format using alejandra

diff --git a/audio.nix b/audio.nix
index 14323dadee6d4fc0115a10f0e6f44d385c064b03..f146189ceb805efe83ea2698e21fbe46e3a04a9e 100644 (file)
--- a/audio.nix
+++ b/audio.nix
@@ -2,8 +2,7 @@
   config,
   pkgs,
   ...
   config,
   pkgs,
   ...

-}:
-{
+}: {

   services.pipewire = {
     enable = true;
     audio.enable = true;
   services.pipewire = {
     enable = true;
     audio.enable = true;


@@ -33,7 +32,7 @@
 
   systemd.user.services.mpd = {
     description = "Music Player Daemon";
 
   systemd.user.services.mpd = {
     description = "Music Player Daemon";

-    wantedBy = [ "default.target" ];
+    wantedBy = ["default.target"];

     serviceConfig = {
       ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /home/andrew/.config/mpd/mpd.conf";
       Restart = "on-failure";
     serviceConfig = {
       ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /home/andrew/.config/mpd/mpd.conf";
       Restart = "on-failure";

diff --git a/hosts/icon/configuration.nix b/hosts/icon/configuration.nix
index f15fbf2af2587bf3a9173a210a30514916d398d4..62c5bb8558308104995ad87055cff258a89463cf 100644 (file)
--- a/hosts/icon/configuration.nix
+++ b/hosts/icon/configuration.nix
@@ -50,8 +50,15 @@
   users.users.nginx.extraGroups = ["git"];
   systemd.services.nginx.serviceConfig = {
     SupplementaryGroups = ["git"];
   users.users.nginx.extraGroups = ["git"];
   systemd.services.nginx.serviceConfig = {
     SupplementaryGroups = ["git"];

-    ReadOnlyPaths = ["/srv/git" "/srv"];
-    InaccessiblePaths = ["/srv/git/.ssh" "/srv/git/migrate_from_gh.sh" "/srv/git/make_new_repo.sh"];
+    ReadOnlyPaths = [
+      "/srv/git"
+      "/srv"
+    ];
+    InaccessiblePaths = [
+      "/srv/git/.ssh"
+      "/srv/git/migrate_from_gh.sh"
+      "/srv/git/make_new_repo.sh"
+    ];

   };
   # systemd.services.fcgiwrap.serviceConfig.ReadOnlyPaths = ["/srv/git"];
   # Define a user account. Don't forget to set a password with ‘passwd’.
   };
   # systemd.services.fcgiwrap.serviceConfig.ReadOnlyPaths = ["/srv/git"];
   # Define a user account. Don't forget to set a password with ‘passwd’.


@@ -72,7 +79,11 @@
       home = "/srv/git";
       createHome = true;
       homeMode = "755";
       home = "/srv/git";
       createHome = true;
       homeMode = "755";

-      openssh.authorizedKeys.keyFiles = [../../pubkeys/desktop_ssh.pub ../../pubkeys/homelab_ssh.pub ../../pubkeys/laptop_ssh.pub];
+      openssh.authorizedKeys.keyFiles = [
+        ../../pubkeys/desktop_ssh.pub
+        ../../pubkeys/homelab_ssh.pub
+        ../../pubkeys/laptop_ssh.pub
+      ];

     };
   };
 
     };
   };
 


@@ -151,7 +162,10 @@
   fileSystems."/srv/data" = {
     device = "/dev/disk/by-uuid/9014f510-b08e-488f-8c43-20a4ac7f15cc";
     fsType = "ext4";
   fileSystems."/srv/data" = {
     device = "/dev/disk/by-uuid/9014f510-b08e-488f-8c43-20a4ac7f15cc";
     fsType = "ext4";

-    options = ["defaults" "nofail"];
+    options = [
+      "defaults"
+      "nofail"
+    ];

   };
   networking.hostName = "icon";
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   };
   networking.hostName = "icon";
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.


@@ -197,7 +211,12 @@
   };
 
   # Open ports in the firewall.
   };
 
   # Open ports in the firewall.

-  networking.firewall.allowedTCPPorts = [9418 8080 6667 2049]; # git, gitweb, irc, nfs
+  networking.firewall.allowedTCPPorts = [
+    9418
+    8080
+    6667
+    2049
+  ]; # git, gitweb, irc, nfs

   networking.firewall.allowedUDPPorts = [55555]; # wireguard
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
   networking.firewall.allowedUDPPorts = [55555]; # wireguard
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;

diff --git a/hosts/icon/hardware-configuration.nix b/hosts/icon/hardware-configuration.nix
index 4fdf9381695d60d4bf4c3a566e73ed0735906774..2bbb7e6d561b18da09f1be4d7f6c386b8fe0e278 100644 (file)
--- a/hosts/icon/hardware-configuration.nix
+++ b/hosts/icon/hardware-configuration.nix
@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
   pkgs,
   modulesPath,
   ...

-}:
-
-{
+}: {

   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];


@@ -21,9 +19,9 @@
     "usbhid"
     "sd_mod"
   ];
     "usbhid"
     "sd_mod"
   ];

-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];

 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/2e969677-74d5-4c22-a708-fa27ba11f2f9";
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/2e969677-74d5-4c22-a708-fa27ba11f2f9";


@@ -40,7 +38,7 @@
   };
 
   swapDevices = [
   };
 
   swapDevices = [

-    { device = "/dev/disk/by-uuid/c562b7b7-2a7e-4416-8223-120956671eae"; }
+    {device = "/dev/disk/by-uuid/c562b7b7-2a7e-4416-8223-120956671eae";}

   ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

diff --git a/hosts/nepsis/hardware-configuration.nix b/hosts/nepsis/hardware-configuration.nix
index 9e779661629b55aecfdcc817bc2d869f92ccc4b2..312756fa434e0dab5d73b16dec6758002f5f42d4 100644 (file)
--- a/hosts/nepsis/hardware-configuration.nix
+++ b/hosts/nepsis/hardware-configuration.nix
@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
   pkgs,
   modulesPath,
   ...

-}:
-
-{
+}: {

   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];


@@ -22,9 +20,9 @@
     "usb_storage"
     "sd_mod"
   ];
     "usb_storage"
     "sd_mod"
   ];

-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-amd"];
+  boot.extraModulePackages = [];

 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a0aa3a6b-4970-4c7d-b793-57561ed4ae03";
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a0aa3a6b-4970-4c7d-b793-57561ed4ae03";


@@ -41,7 +39,7 @@
   };
 
   swapDevices = [
   };
 
   swapDevices = [

-    { device = "/dev/disk/by-uuid/1efeebba-c2ce-4ab9-87d6-e986933d7678"; }
+    {device = "/dev/disk/by-uuid/1efeebba-c2ce-4ab9-87d6-e986933d7678";}

   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

diff --git a/linux-common.nix b/linux-common.nix
index 5148a96ec034922ac82533720dc177b32788283c..aa51e67d0eb22eae6a5f78089ddb824e31fedb3d 100644 (file)
--- a/linux-common.nix
+++ b/linux-common.nix
@@ -42,6 +42,7 @@
     fastfetch
     pamixer
     gcc
     fastfetch
     pamixer
     gcc

+    alejandra

   ];
 
   fonts = {
   ];
 
   fonts = {

diff --git a/lockscreen.nix b/lockscreen.nix
index 2ffb5918250d638b2f52de09665cc7c91c856f1f..d5b395a5a0aa785194d277332e84c4bd85a2fcf7 100644 (file)
--- a/lockscreen.nix
+++ b/lockscreen.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:

 {
 {

-
+  config,
+  pkgs,
+  ...
+}: {

   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [


@@ -12,7 +14,7 @@
     enable = true;
     package = pkgs.i3lock-color;
   };
     enable = true;
     package = pkgs.i3lock-color;
   };

-  security.pam.services.betterlockscreen = { };
+  security.pam.services.betterlockscreen = {};

   services.xserver = {
     xautolock = {
       enable = true;
   services.xserver = {
     xautolock = {
       enable = true;


@@ -21,5 +23,4 @@
       locker = "${pkgs.betterlockscreen}/bin/betterlockscreen -l dimblur";
     };
   };
       locker = "${pkgs.betterlockscreen}/bin/betterlockscreen -l dimblur";
     };
   };

-

 }
 }

diff --git a/nvf/keymaps.nix b/nvf/keymaps.nix
index 61cdcc8c6802d643d158b0c07f3610054b601b6f..a9bc3753e36c06e3ff9e8f389274b4274ce7d2cf 100644 (file)
--- a/nvf/keymaps.nix
+++ b/nvf/keymaps.nix
@@ -1,5 +1,4 @@
-{ ... }:
-[
+{...}: [

   # Top Pickers & Explorer
   {
     key = "<leader><space>";
   # Top Pickers & Explorer
   {
     key = "<leader><space>";

diff --git a/nvf/nvf.nix b/nvf/nvf.nix
index ff1a3db0984e9898f43eeaf633baffa0b9aa4a38..0903c5dbd939212bf2256d5f003ee83c0d93eedd 100644 (file)
--- a/nvf/nvf.nix
+++ b/nvf/nvf.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {

   config.vim = {
     # core
     syntaxHighlighting = true;
   config.vim = {
     # core
     syntaxHighlighting = true;


@@ -94,11 +93,11 @@
         enable = true;
         format = {
           enable = true;
         enable = true;
         format = {
           enable = true;

-          type = [ "alejandra" ];
+          type = ["alejandra"];

         };
         lsp = {
           enable = true;
         };
         lsp = {
           enable = true;

-          servers = [ "nixd" ];
+          servers = ["nixd"];

         };
         treesitter.enable = true;
       };
         };
         treesitter.enable = true;
       };


@@ -223,7 +222,7 @@
     autopairs.nvim-autopairs.enable = true;
 
     # keymaps
     autopairs.nvim-autopairs.enable = true;
 
     # keymaps

-    keymaps = import ./keymaps.nix { };
+    keymaps = import ./keymaps.nix {};

 
     # tools
     extraPackages = with pkgs; [
 
     # tools
     extraPackages = with pkgs; [

diff --git a/overlays.nix b/overlays.nix
index 7b7f25dcd4a172cfbcdbe35ac2ab8cb4bf86e42a..84c6b73979e546b29e772fe4f20b8a3fb4299132 100644 (file)
--- a/overlays.nix
+++ b/overlays.nix
@@ -1,14 +1,17 @@
-{ pkgs, inputs, ... }:

 {
 {

+  pkgs,
+  inputs,
+  ...
+}: {

   nixpkgs.overlays = [
     (final: prev: {
   nixpkgs.overlays = [
     (final: prev: {

-      lock-screen = import ./scripts/lock-screen.nix { pkgs = prev; };
+      lock-screen = import ./scripts/lock-screen.nix {pkgs = prev;};

     })
     (final: prev: {
     })
     (final: prev: {

-      scrolling-title = import ./scripts/scrolling-title.nix { pkgs = prev; };
+      scrolling-title = import ./scripts/scrolling-title.nix {pkgs = prev;};

     })
     (final: prev: {
     })
     (final: prev: {

-      surf_search = import ./scripts/surf_search.nix { pkgs = prev; };
+      surf_search = import ./scripts/surf_search.nix {pkgs = prev;};

     })
 
     (final: prev: {
     })
 
     (final: prev: {

diff --git a/scripts/lock-screen.nix b/scripts/lock-screen.nix
index ca4590342da3fc975f82ac25a2acb7d8ce060d98..f4610f7ae8294f9792f790db6c698bb197b53177 100644 (file)
--- a/scripts/lock-screen.nix
+++ b/scripts/lock-screen.nix
@@ -1,12 +1,12 @@
-{ pkgs }:
+{pkgs}:

 pkgs.writeShellApplication {
   name = "lock-screen";
 pkgs.writeShellApplication {
   name = "lock-screen";

-  runtimeInputs = [ pkgs.betterlockscreen ];
+  runtimeInputs = [pkgs.betterlockscreen];

   text = ''
   text = ''

-               if [ ! -f "$HOME/.cache/betterlockscreen/current/lock_dimblur.png" ]; then
-                       betterlockscreen -u "$HOME/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg" --fx dimblur
-               fi
+    if [ ! -f "$HOME/.cache/betterlockscreen/current/lock_dimblur.png" ]; then
+       betterlockscreen -u "$HOME/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg" --fx dimblur
+    fi

 
 

-               betterlockscreen -l dimblur
-       '';
+    betterlockscreen -l dimblur
+  '';

 }
 }

diff --git a/scripts/scrolling-title.nix b/scripts/scrolling-title.nix
index 05eaa5325d0006156355f8895508ed099c1d8beb..70a6dd76e9b60eb15f44ff66eb6982919ce28830 100644 (file)
--- a/scripts/scrolling-title.nix
+++ b/scripts/scrolling-title.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{pkgs}:

 pkgs.writeShellApplication {
   name = "scrolling-title";
   runtimeInputs = with pkgs; [
 pkgs.writeShellApplication {
   name = "scrolling-title";
   runtimeInputs = with pkgs; [


@@ -7,7 +7,7 @@ pkgs.writeShellApplication {
   ];
   text = ''
     WIDTH=20
   ];
   text = ''
     WIDTH=20

-    PADDING="        " 
+    PADDING="        "

 
     RAW_STR=$(mpc current)
 
 
     RAW_STR=$(mpc current)
 


@@ -17,7 +17,7 @@ pkgs.writeShellApplication {
     fi
 
     STR="$RAW_STR$PADDING"
     fi
 
     STR="$RAW_STR$PADDING"

-    LEN=''${#STR} 
+    LEN=''${#STR}

 
     T=$(date +%s)
     INDEX=$(( T % LEN ))
 
     T=$(date +%s)
     INDEX=$(( T % LEN ))

diff --git a/scripts/surf_search.nix b/scripts/surf_search.nix
index e186bdb083a7fc0008fa7f0fae0a3ed1d8ecb349..388226537d5914dfc3ebc0d4b2a27c59f28381b7 100644 (file)
--- a/scripts/surf_search.nix
+++ b/scripts/surf_search.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{pkgs}:

 pkgs.writeShellApplication {
   name = "surf_search";
   runtimeInputs = with pkgs; [
 pkgs.writeShellApplication {
   name = "surf_search";
   runtimeInputs = with pkgs; [

diff --git a/sh.nix b/sh.nix
index 2e280dc1ec18ef8bb3b4ba82bcc46d06bd8d7bae..4de93dbbf0b0c7076f0c88d6d744373434f24fcf 100644 (file)
--- a/sh.nix
+++ b/sh.nix
@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:

 {
 {

+  config,
+  pkgs,
+  ...
+}: {

   programs.bash = {
     enable = true;
     interactiveShellInit = ''
   programs.bash = {
     enable = true;
     interactiveShellInit = ''


@@ -19,7 +22,6 @@
     shellAliases = {
       nix-sw = "sudo nixos-rebuild switch --flake .";
       nix-upd-sl = "sudo nix flake update my-slstatus my-dwm my-surf my-st my-dmenu";
     shellAliases = {
       nix-sw = "sudo nixos-rebuild switch --flake .";
       nix-upd-sl = "sudo nix flake update my-slstatus my-dwm my-surf my-st my-dmenu";

-

     };
   };
 
     };
   };
 

diff --git a/vim.nix b/vim.nix
index c49641895f438e81f82b05f9725f1f54b96a1972..0c58e4291cbcd709c567e35091a18cceb7295236 100644 (file)
--- a/vim.nix
+++ b/vim.nix
@@ -1,17 +1,14 @@
 {
   config,
   pkgs,
 {
   config,
   pkgs,

-

   customNeovim,
   ...
   customNeovim,
   ...

-}:
-{
-
+}: {

   environment.systemPackages = with pkgs; [
     (lib.lowPrio pkgs.vim-full) # Lower Vim's priority
     (pkgs.writeShellApplication {
       name = "vi";
   environment.systemPackages = with pkgs; [
     (lib.lowPrio pkgs.vim-full) # Lower Vim's priority
     (pkgs.writeShellApplication {
       name = "vi";

-      runtimeInputs = [ pkgs.nvi ];
+      runtimeInputs = [pkgs.nvi];

       text = ''
         exec ${pkgs.nvi}/bin/vi "$@"
       '';
       text = ''
         exec ${pkgs.nvi}/bin/vi "$@"
       '';


@@ -123,5 +120,4 @@
   #      '';
   #    };
   #  };
   #      '';
   #    };
   #  };

-

 }
 }

diff --git a/x11.nix b/x11.nix
index 743ffd0f79e3d850438a223b53a0d85f5c40ef3d..47732ac5d9e38f98854719bfe91dfa6744aacaf4 100644 (file)
--- a/x11.nix
+++ b/x11.nix
@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:

 {
 {

+  config,
+  pkgs,
+  ...
+}: {

   services.displayManager.ly = {
     enable = true;
     settings = {
   services.displayManager.ly = {
     enable = true;
     settings = {


@@ -11,7 +14,6 @@
       bigclock = "en";
       bigclock_seconds = true;
     };
       bigclock = "en";
       bigclock_seconds = true;
     };

-

   };
 
   services.dunst = {
   };
 
   services.dunst = {


@@ -27,9 +29,9 @@
     displayManager = {
       setupCommands = "";
       sessionCommands = ''
     displayManager = {
       setupCommands = "";
       sessionCommands = ''

-                       #!/bin/sh
-                       ${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360
-                       ${pkgs.feh}/bin/feh --no-fehbg --bg-fill '/home/andrew/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg'
+        #!/bin/sh
+        ${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360
+        ${pkgs.feh}/bin/feh --no-fehbg --bg-fill '/home/andrew/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg'

       '';
     };
     xkb = {
       '';
     };
     xkb = {


@@ -106,12 +108,12 @@
       ExecStart = "${pkgs.sxhkd}/bin/sxhkd";
       Restart = "on-failure";
     };
       ExecStart = "${pkgs.sxhkd}/bin/sxhkd";
       Restart = "on-failure";
     };

-    wantedBy = [ "graphical-session.target" ];
+    wantedBy = ["graphical-session.target"];

   };
 
   systemd.user.services.slstatus = {
     description = "slstatus bar";
   };
 
   systemd.user.services.slstatus = {
     description = "slstatus bar";

-    wantedBy = [ "graphical-session.target" ];
+    wantedBy = ["graphical-session.target"];

 
     path = with pkgs; [
       pamixer
 
     path = with pkgs; [
       pamixer