Reformat code
diff --git a/modules/amd.nix b/modules/amd.nix
index 37b877c..dcddfd9 100644
--- a/modules/amd.nix
+++ b/modules/amd.nix
@@ -20,7 +20,7 @@
/* services.xserver.config = lib.mkAfter '' */
/* Section "Device" */
/* Identifier "Device-radeon[1]" */
- /* Driver "radeon" */
+ /* Driver "radeon" */
/* BusID "PCI:06:00.0" */
/* Option "AllowExternalGpus" "True" */
/* Option "AllowEmptyInitialConfiguration" */
diff --git a/modules/apparmor.nix b/modules/apparmor.nix
index 64ebd34..a31e22f 100644
--- a/modules/apparmor.nix
+++ b/modules/apparmor.nix
@@ -15,7 +15,7 @@
default_deny = {
profile = ''
- profile default_deny /** { }
+ profile default_deny /** { }
'';
enforce = false;
enable = false;
@@ -23,9 +23,9 @@
sudo = {
profile = ''
- ${pkgs.sudo}/bin/sudo {
- file /** rwlkUx,
- }
+ ${pkgs.sudo}/bin/sudo {
+ file /** rwlkUx,
+ }
'';
enforce = false;
enable = false;
@@ -33,9 +33,9 @@
nix = {
profile = ''
- ${pkgs.nix}/bin/nix {
- unconfined,
- }
+ ${pkgs.nix}/bin/nix {
+ unconfined,
+ }
'';
enforce = false;
enable = false;
diff --git a/modules/calculator.nix b/modules/calculator.nix
index 8fd0f44..42c7358 100644
--- a/modules/calculator.nix
+++ b/modules/calculator.nix
@@ -13,5 +13,5 @@
};
in
{
- home.home.packages = with pkgs; [ wcalc R ];
+ home.home.packages = with pkgs; [ wcalc R ];
}
diff --git a/modules/davmail.nix b/modules/davmail.nix
index 60e2baf..ea8e6d2 100644
--- a/modules/davmail.nix
+++ b/modules/davmail.nix
@@ -1,6 +1,6 @@
{ pkgs, ... }: {
home.home = {
- packages = [pkgs.davmail];
+ packages = [ pkgs.davmail ];
file.".davmail.properties".text = ''
davmail.server=true
davmail.mode=EWS
diff --git a/modules/feh.nix b/modules/feh.nix
index dafeb4a..3fe2d97 100644
--- a/modules/feh.nix
+++ b/modules/feh.nix
@@ -1,6 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
home.home = {
- packages = [pkgs.feh];
+ packages = [ pkgs.feh ];
file.".xmonad/background.png".source = ./feh/background.png;
};
}
diff --git a/modules/firefox.nix b/modules/firefox.nix
index 9cb12e2..8494a9b 100644
--- a/modules/firefox.nix
+++ b/modules/firefox.nix
@@ -1,3 +1,3 @@
-{
+{
home.programs.firefox.enable = true;
}
diff --git a/modules/firewall.nix b/modules/firewall.nix
index 25a9210..5c4a168 100644
--- a/modules/firewall.nix
+++ b/modules/firewall.nix
@@ -2,7 +2,7 @@
config.networking.firewall.enable = true;
config.networking.firewall.allowedTCPPorts = [
- 19000 # Expo
- 1935 # RTMP
+ 19000 # Expo
+ 1935 # RTMP
];
}
diff --git a/modules/hosting.nix b/modules/hosting.nix
index d9d69ad..da81d46 100644
--- a/modules/hosting.nix
+++ b/modules/hosting.nix
@@ -1,6 +1,7 @@
{ pkgs, username, ... }: {
home.home.packages = [
- pkgs.mysql pkgs.pscale # Planetscale cli
+ pkgs.mysql
+ pkgs.pscale # Planetscale cli
];
config.environment.persistence."/large/persist".users.${username}.directories = [
".config/planetscale"
diff --git a/modules/input.nix b/modules/input.nix
index 3f6b1cc..bcdbf41 100644
--- a/modules/input.nix
+++ b/modules/input.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
config.services.xserver.libinput = {
enable = true;
touchpad.naturalScrolling = true;
diff --git a/modules/media.nix b/modules/media.nix
index 442c1b3..2b3305c 100644
--- a/modules/media.nix
+++ b/modules/media.nix
@@ -1,3 +1,3 @@
-{pkgs, ...}: {
- home.home.packages = with pkgs; [vlc syncplay];
+{ pkgs, ... }: {
+ home.home.packages = with pkgs; [ vlc syncplay ];
}
diff --git a/modules/mongo.nix b/modules/mongo.nix
index 96770ee..9ee5778 100644
--- a/modules/mongo.nix
+++ b/modules/mongo.nix
@@ -6,7 +6,7 @@
dbpath = "/tmp/mongodb";
};
internal.allowUnfree = [ "mongodb" "mongodb-compass" ];
- systemd.services.mongod.wantedBy = lib.mkForce [];
+ systemd.services.mongod.wantedBy = lib.mkForce [ ];
environment.persistence."/nix/persist".users.${username}.directories = [
".config/MongoDB\ Compass/Connections/"
];
diff --git a/modules/neovim/aaa_lateload/default.nix b/modules/neovim/aaa_lateload/default.nix
index 71de9c1..46454c9 100644
--- a/modules/neovim/aaa_lateload/default.nix
+++ b/modules/neovim/aaa_lateload/default.nix
@@ -1,5 +1,5 @@
{
programs.neovim.extraConfig = ''
- ${builtins.readFile ./retheme.vim}
+ ${builtins.readFile ./retheme.vim}
'';
}
diff --git a/modules/neovim/hexokinase/default.nix b/modules/neovim/hexokinase/default.nix
index 8409f6c..c5bf1f7 100644
--- a/modules/neovim/hexokinase/default.nix
+++ b/modules/neovim/hexokinase/default.nix
@@ -2,7 +2,7 @@
programs.neovim = {
plugins = [ pkgs.vimPlugins.vim-hexokinase ];
extraConfig = ''
- let g:Hexokinase_highlighters = ['virtual']
+ let g:Hexokinase_highlighters = ['virtual']
'';
};
}
diff --git a/modules/neovim/multi-cursor/default.nix b/modules/neovim/multi-cursor/default.nix
index 3c61689..d265709 100644
--- a/modules/neovim/multi-cursor/default.nix
+++ b/modules/neovim/multi-cursor/default.nix
@@ -1,6 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
programs.neovim = {
- plugins = [pkgs.vimPlugins.vim-visual-multi];
+ plugins = [ pkgs.vimPlugins.vim-visual-multi ];
extraConfig = builtins.readFile ./theme.vim;
};
}
diff --git a/modules/neovim/presence/default.nix b/modules/neovim/presence/default.nix
index ec874a4..e80985a 100644
--- a/modules/neovim/presence/default.nix
+++ b/modules/neovim/presence/default.nix
@@ -1,6 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
programs.neovim = {
- plugins = [pkgs.vimPlugins.presence-nvim];
+ plugins = [ pkgs.vimPlugins.presence-nvim ];
extraConfig = builtins.readFile ./presence.vim;
};
diff --git a/modules/neovim/suda/default.nix b/modules/neovim/suda/default.nix
index 083203b..8c5bea8 100644
--- a/modules/neovim/suda/default.nix
+++ b/modules/neovim/suda/default.nix
@@ -1,6 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
programs.neovim = {
- plugins = [pkgs.vimPlugins.suda-vim];
+ plugins = [ pkgs.vimPlugins.suda-vim ];
extraConfig = builtins.readFile ./suda.vim;
};
diff --git a/modules/neovim/surround/default.nix b/modules/neovim/surround/default.nix
index 2149cdc..fd91649 100644
--- a/modules/neovim/surround/default.nix
+++ b/modules/neovim/surround/default.nix
@@ -1,6 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
programs.neovim = {
- plugins = [pkgs.vimPlugins.nvim-surround];
+ plugins = [ pkgs.vimPlugins.nvim-surround ];
extraConfig = "source ${./surround.lua}";
};
diff --git a/modules/neovim/zzz_earlyload/default.nix b/modules/neovim/zzz_earlyload/default.nix
index b8d6c57..fe31c28 100644
--- a/modules/neovim/zzz_earlyload/default.nix
+++ b/modules/neovim/zzz_earlyload/default.nix
@@ -1,8 +1,8 @@
# The vim modules are sorted reverse alphabetically, so any extraConfig that is
# put in here should hopefully be the first thing to be loaded. I'm using it to
# set stuff like my mapleader
-{ lib, ...}: {
- programs.neovim.extraConfig = lib.pipe [./settings.vim ./functions.vim] [
+{ lib, ... }: {
+ programs.neovim.extraConfig = lib.pipe [ ./settings.vim ./functions.vim ] [
(map builtins.readFile)
(builtins.concatStringsSep "\n")
];
diff --git a/modules/networking.nix b/modules/networking.nix
index 2b90ebb..1c53b60 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -31,8 +31,8 @@
networks = {
/* "HRSFC-LAN".psk = "@hrsfcStaffPass@"; */
"HRSFC Wi-Fi".psk = "@hrsfcGuestPass@";
- "UniOfCam-Guest" = {};
- "Premier Inn Free Wi-Fi" = {};
+ "UniOfCam-Guest" = { };
+ "Premier Inn Free Wi-Fi" = { };
adelie10 = {
psk = "@adelie10Pass@";
priority = 500;
diff --git a/modules/postgres.nix b/modules/postgres.nix
index 27b2b54..f88673e 100644
--- a/modules/postgres.nix
+++ b/modules/postgres.nix
@@ -16,8 +16,8 @@
initialPasswordFile = config.sops.secrets.pgadminPassword.path;
};
};
- systemd.services.pgadmin.wantedBy = lib.mkForce [];
- systemd.services.postgresql.wantedBy = lib.mkForce [];
+ systemd.services.pgadmin.wantedBy = lib.mkForce [ ];
+ systemd.services.postgresql.wantedBy = lib.mkForce [ ];
sops.secrets.pgadminPassword = {
mode = "0400";
owner = config.users.users.pgadmin.name;
diff --git a/modules/steam.nix b/modules/steam.nix
index 97fb3db..0f89851 100644
--- a/modules/steam.nix
+++ b/modules/steam.nix
@@ -23,7 +23,8 @@
gamescope
gamemode
xboxdrv
- sfs-select /*(
+ sfs-select
+ /*(
writeTextDir "share/applications/steam.desktop" ''
[Desktop Entry]
Name=Steam
diff --git a/modules/udev.nix b/modules/udev.nix
index b40a95b..e58b60c 100644
--- a/modules/udev.nix
+++ b/modules/udev.nix
@@ -1,13 +1,15 @@
{ pkgs, ... }: {
- config.services.udev.packages = [ (pkgs.stdenv.mkDerivation {
- pname = "udev-rules";
- version = "2023-03-18";
+ config.services.udev.packages = [
+ (pkgs.stdenv.mkDerivation {
+ pname = "udev-rules";
+ version = "2023-03-18";
- src = ./udev/rules;
+ src = ./udev/rules;
- installPhase = ''
- mkdir -p $out/etc/udev/rules.d/
- cp $src/* $out/etc/udev/rules.d/
- '';
- }) ];
+ installPhase = ''
+ mkdir -p $out/etc/udev/rules.d/
+ cp $src/* $out/etc/udev/rules.d/
+ '';
+ })
+ ];
}
diff --git a/modules/wallpaper.nix b/modules/wallpaper.nix
index cb5763e..9835283 100644
--- a/modules/wallpaper.nix
+++ b/modules/wallpaper.nix
@@ -1,6 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
home.home = {
- packages = [pkgs.show];
+ packages = [ pkgs.show ];
file.".xmonad/wallpaper.glsl".source = ./wallpaper/wallpaper.glsl;
};
}