about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.editorconfig16
-rw-r--r--bootstrap/default.nix2
-rw-r--r--flake.nix7
-rw-r--r--flake/default.nix18
-rw-r--r--flake/nixosConfigurations/default.nix1
-rw-r--r--flake/packages/default.nix1
-rw-r--r--home-manager/config/dconf/default.nix1
-rw-r--r--home-manager/config/default.nix1
-rw-r--r--home-manager/config/direnv/default.nix1
-rw-r--r--home-manager/config/firefox/config/prefs/default.nix1
-rw-r--r--home-manager/config/firefox/default.nix1
-rw-r--r--home-manager/config/firefox/functions/extensions/default.nix1
-rw-r--r--home-manager/config/firefox/functions/extensions/video-pauser.nix1
-rw-r--r--home-manager/config/git/default.nix2
-rw-r--r--home-manager/config/gpg/default.nix2
-rw-r--r--home-manager/config/gtk/default.nix2
-rw-r--r--home-manager/config/himalaya/default.nix2
-rw-r--r--home-manager/config/keepassxc/default.nix2
-rw-r--r--home-manager/config/latexindent/default.nix2
-rw-r--r--home-manager/config/less/default.nix2
-rw-r--r--home-manager/config/lf/commands/default.nix2
-rw-r--r--home-manager/config/lf/default.nix2
-rw-r--r--home-manager/config/mail/default.nix2
-rw-r--r--home-manager/config/mako/default.nix2
-rw-r--r--home-manager/config/mbsync/default.nix2
-rw-r--r--home-manager/config/mpd/default.nix2
-rw-r--r--home-manager/config/mpv/default.nix2
-rw-r--r--home-manager/config/neomutt/default.nix2
-rw-r--r--home-manager/config/neovim/default.nix2
-rw-r--r--home-manager/config/nheko/default.nix2
-rw-r--r--home-manager/config/npm/default.nix2
-rw-r--r--home-manager/config/python/default.nix2
-rw-r--r--home-manager/config/rclone/default.nix2
-rw-r--r--home-manager/config/ssh/default.nix2
-rw-r--r--home-manager/config/swayidle/default.nix2
-rw-r--r--home-manager/config/swaylock/default.nix2
-rw-r--r--home-manager/config/yambar/default.nix2
-rw-r--r--home-manager/config/zsh/default.nix2
-rw-r--r--home-manager/default.nix1
-rw-r--r--home-manager/files/default.nix1
-rw-r--r--home-manager/files/wallpaper/default.nix1
-rw-r--r--home-manager/impermanence/default.nix1
-rw-r--r--home-manager/packages/default.nix1
-rw-r--r--home-manager/wms/default.nix1
-rw-r--r--home-manager/wms/plasma/default.nix1
-rw-r--r--home-manager/wms/river/default.nix2
-rw-r--r--hosts/apzu/default.nix1
-rw-r--r--hosts/lahmu/default.nix1
-rw-r--r--hosts/mammun/default.nix1
-rw-r--r--hosts/mammun/hardware/gpu.nix1
-rw-r--r--hosts/marduk/default.nix1
-rw-r--r--hosts/marduk/hardware/default.nix1
-rw-r--r--hosts/tiamat/default.nix1
-rw-r--r--hosts/tiamat/networking.nix2
-rw-r--r--secrets/default.nix2
-rw-r--r--secrets/secrets.nix2
-rw-r--r--system/disks/default.nix2
-rw-r--r--system/disks/fstrim.nix2
-rw-r--r--system/hardware/default.nix2
-rw-r--r--system/libvirtd/default.nix1
-rw-r--r--system/locale/default.nix1
-rw-r--r--system/network/default.nix1
-rw-r--r--system/nixpkgs/default.nix1
-rw-r--r--system/options/default.nix1
-rw-r--r--system/services/backup/default.nix1
-rw-r--r--system/services/dconf/default.nix1
-rw-r--r--system/services/nix/default.nix1
-rw-r--r--system/services/printing/default.nix1
-rw-r--r--system/services/scanning/default.nix1
-rw-r--r--system/services/serverphone/default.nix2
-rw-r--r--system/services/snapper/default.nix1
-rw-r--r--system/services/steam/default.nix1
-rw-r--r--system/services/swaylock/default.nix1
-rw-r--r--system/services/xdg/default.nix1
-rw-r--r--system/tempfiles/default.nix1
-rw-r--r--system/users/default.nix1
76 files changed, 27 insertions, 121 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..8cfc43a5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{nix}]
+charset = utf-8
+indent_style = space
+indent_size = 2
diff --git a/bootstrap/default.nix b/bootstrap/default.nix
index b6612efb..4898557a 100644
--- a/bootstrap/default.nix
+++ b/bootstrap/default.nix
@@ -36,5 +36,3 @@
   output = {inherit activate install setup config_setup ensure_config_variables;};
 in
   output
-# vim: ts=2
-
diff --git a/flake.nix b/flake.nix
index bc360e74..d68a4c94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   description = "Nixos system config";
 
@@ -246,7 +245,7 @@
         sysLib
         nixpkgs
         # modules
-
+        
         home-manager
         nixos-generators
         impermanence
@@ -255,13 +254,13 @@
         serverphone
         disko
         # external dependencies
-
+        
         neovim_config
         user_js
         snap-sync
         templates
         # my binaries
-
+        
         video_pause
         strip_js_comments
         generate_firefox_extensions
diff --git a/flake/default.nix b/flake/default.nix
index 02d6e5b4..e78b957e 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -39,10 +39,10 @@
           pkgs
           sysLib
           # extra information
-
+          
           system
           # bins
-
+          
           video_pause
           yambar_cpu
           yambar_memory
@@ -52,12 +52,12 @@
           shell_library
           flake_update
           # external deps
-
+          
           user_js
           neovim_config
           snap-sync
           # modules
-
+          
           impermanence
           ;
       };
@@ -92,11 +92,11 @@ in {
       nixpkgs
       sysLib
       # configs
-
+      
       defaultModules
       defaultSpecialArgs
       # bins
-
+      
       video_pause
       yambar_cpu
       yambar_memory
@@ -106,13 +106,13 @@ in {
       shell_library
       flake_update
       # external deps
-
+      
       user_js
       neovim_config
       snap-sync
       templates
       # modules
-
+      
       impermanence
       home-manager
       agenix
@@ -145,5 +145,3 @@ in {
     };
   };
 }
-# vim: ts=2
-
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix
index e521a5ab..cf825b86 100644
--- a/flake/nixosConfigurations/default.nix
+++ b/flake/nixosConfigurations/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   system,
   pkgs,
diff --git a/flake/packages/default.nix b/flake/packages/default.nix
index 0c3d6c1b..f7623622 100644
--- a/flake/packages/default.nix
+++ b/flake/packages/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   nixos-generators,
   defaultSpecialArgs,
diff --git a/home-manager/config/dconf/default.nix b/home-manager/config/dconf/default.nix
index 94e4bc96..dc439e1e 100644
--- a/home-manager/config/dconf/default.nix
+++ b/home-manager/config/dconf/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {...}: {
   # Also see:  https://github.com/gvolpe/dconf2nix
   dconf.settings = {
diff --git a/home-manager/config/default.nix b/home-manager/config/default.nix
index 729b0e62..4dfb0f9b 100644
--- a/home-manager/config/default.nix
+++ b/home-manager/config/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {...}: {
   imports = [
     ./alacritty
diff --git a/home-manager/config/direnv/default.nix b/home-manager/config/direnv/default.nix
index b07d4803..3a7b8add 100644
--- a/home-manager/config/direnv/default.nix
+++ b/home-manager/config/direnv/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {...}: {
   programs.direnv = {
     enable = true;
diff --git a/home-manager/config/firefox/config/prefs/default.nix b/home-manager/config/firefox/config/prefs/default.nix
index 0f930b7e..e0e72cf9 100644
--- a/home-manager/config/firefox/config/prefs/default.nix
+++ b/home-manager/config/firefox/config/prefs/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   pkgs,
   config,
diff --git a/home-manager/config/firefox/default.nix b/home-manager/config/firefox/default.nix
index 0b98f5d6..3c792045 100644
--- a/home-manager/config/firefox/default.nix
+++ b/home-manager/config/firefox/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   pkgs,
diff --git a/home-manager/config/firefox/functions/extensions/default.nix b/home-manager/config/firefox/functions/extensions/default.nix
index e3373d86..b84461c7 100644
--- a/home-manager/config/firefox/functions/extensions/default.nix
+++ b/home-manager/config/firefox/functions/extensions/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {pkgs, ...}: {
   pname,
   version,
diff --git a/home-manager/config/firefox/functions/extensions/video-pauser.nix b/home-manager/config/firefox/functions/extensions/video-pauser.nix
index a6b0e838..c4c5238f 100644
--- a/home-manager/config/firefox/functions/extensions/video-pauser.nix
+++ b/home-manager/config/firefox/functions/extensions/video-pauser.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   pkgs,
   video_pause,
diff --git a/home-manager/config/git/default.nix b/home-manager/config/git/default.nix
index 84e80b45..d0d5905c 100644
--- a/home-manager/config/git/default.nix
+++ b/home-manager/config/git/default.nix
@@ -71,5 +71,3 @@ in {
     };
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/gpg/default.nix b/home-manager/config/gpg/default.nix
index 75bbd3ac..f4a7cc15 100644
--- a/home-manager/config/gpg/default.nix
+++ b/home-manager/config/gpg/default.nix
@@ -43,5 +43,3 @@ in {
     pinentryFlavor = "tty";
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/gtk/default.nix b/home-manager/config/gtk/default.nix
index a3f197d2..f5411369 100644
--- a/home-manager/config/gtk/default.nix
+++ b/home-manager/config/gtk/default.nix
@@ -56,5 +56,3 @@
     };
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/himalaya/default.nix b/home-manager/config/himalaya/default.nix
index fcc768b2..99329a34 100644
--- a/home-manager/config/himalaya/default.nix
+++ b/home-manager/config/himalaya/default.nix
@@ -6,5 +6,3 @@
     };
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/keepassxc/default.nix b/home-manager/config/keepassxc/default.nix
index 152611c1..3ac82812 100644
--- a/home-manager/config/keepassxc/default.nix
+++ b/home-manager/config/keepassxc/default.nix
@@ -5,5 +5,3 @@
 }: {
   xdg.configFile."keepassxc/keepassxc.ini".source = ./keepassxc.ini;
 }
-# vim: ts=2
-
diff --git a/home-manager/config/latexindent/default.nix b/home-manager/config/latexindent/default.nix
index 10bae481..0d776e14 100644
--- a/home-manager/config/latexindent/default.nix
+++ b/home-manager/config/latexindent/default.nix
@@ -6,5 +6,3 @@
   xdg.configFile."latexindent/indentconfig.yaml".source = ./indentconfig.yaml;
   xdg.configFile."latexindent/mysettings.yaml".source = ./mysettings.yaml;
 }
-# vim: ts=2
-
diff --git a/home-manager/config/less/default.nix b/home-manager/config/less/default.nix
index c9e74ecc..fe7142f1 100644
--- a/home-manager/config/less/default.nix
+++ b/home-manager/config/less/default.nix
@@ -13,5 +13,3 @@
     '';
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/lf/commands/default.nix b/home-manager/config/lf/commands/default.nix
index a7cb2039..67362fd0 100644
--- a/home-manager/config/lf/commands/default.nix
+++ b/home-manager/config/lf/commands/default.nix
@@ -220,5 +220,3 @@ in {
     };
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/lf/default.nix b/home-manager/config/lf/default.nix
index 73c2cd3d..9f43a891 100644
--- a/home-manager/config/lf/default.nix
+++ b/home-manager/config/lf/default.nix
@@ -50,5 +50,3 @@ in {
     '';
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/mail/default.nix b/home-manager/config/mail/default.nix
index 87cae185..95c8a7d0 100644
--- a/home-manager/config/mail/default.nix
+++ b/home-manager/config/mail/default.nix
@@ -58,5 +58,3 @@
     };
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/mako/default.nix b/home-manager/config/mako/default.nix
index 2ce853b6..e6eb5eb3 100644
--- a/home-manager/config/mako/default.nix
+++ b/home-manager/config/mako/default.nix
@@ -42,5 +42,3 @@
     '';
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/mbsync/default.nix b/home-manager/config/mbsync/default.nix
index bcc8b89f..6be4f57c 100644
--- a/home-manager/config/mbsync/default.nix
+++ b/home-manager/config/mbsync/default.nix
@@ -15,5 +15,3 @@
   # Disable the timer, and only activate it on neomutt start
   systemd.user.timers.mbsync = lib.mkForce {};
 }
-# vim: ts=2
-
diff --git a/home-manager/config/mpd/default.nix b/home-manager/config/mpd/default.nix
index 5d349fc0..bbd345a7 100644
--- a/home-manager/config/mpd/default.nix
+++ b/home-manager/config/mpd/default.nix
@@ -37,5 +37,3 @@ in {
     '';
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/mpv/default.nix b/home-manager/config/mpv/default.nix
index 4d9d241e..63e36117 100644
--- a/home-manager/config/mpv/default.nix
+++ b/home-manager/config/mpv/default.nix
@@ -8,5 +8,3 @@
     # TODO add config
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/neomutt/default.nix b/home-manager/config/neomutt/default.nix
index d140eac1..e4fbcb39 100644
--- a/home-manager/config/neomutt/default.nix
+++ b/home-manager/config/neomutt/default.nix
@@ -166,5 +166,3 @@
     ];
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/neovim/default.nix b/home-manager/config/neovim/default.nix
index 097592ef..c84b6aaa 100644
--- a/home-manager/config/neovim/default.nix
+++ b/home-manager/config/neovim/default.nix
@@ -6,5 +6,3 @@
 }: {
   xdg.configFile."nvim".source = neovim_config;
 }
-# vim: ts=2
-
diff --git a/home-manager/config/nheko/default.nix b/home-manager/config/nheko/default.nix
index 8557ac82..7e39352b 100644
--- a/home-manager/config/nheko/default.nix
+++ b/home-manager/config/nheko/default.nix
@@ -8,5 +8,3 @@
     enable = true;
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/npm/default.nix b/home-manager/config/npm/default.nix
index d12ce73b..7b4bb6a1 100644
--- a/home-manager/config/npm/default.nix
+++ b/home-manager/config/npm/default.nix
@@ -5,5 +5,3 @@
 }: {
   xdg.configFile."npm/.npmrc".source = ./.npmrc;
 }
-# vim: ts=2
-
diff --git a/home-manager/config/python/default.nix b/home-manager/config/python/default.nix
index 4fd01a0a..eeaccdcf 100644
--- a/home-manager/config/python/default.nix
+++ b/home-manager/config/python/default.nix
@@ -5,5 +5,3 @@
 }: {
   xdg.configFile."python/pythonrc".source = ./pythonrc;
 }
-# vim: ts=2
-
diff --git a/home-manager/config/rclone/default.nix b/home-manager/config/rclone/default.nix
index 1939a0b5..bd0c1ac2 100644
--- a/home-manager/config/rclone/default.nix
+++ b/home-manager/config/rclone/default.nix
@@ -5,5 +5,3 @@
 }: {
   xdg.configFile."rclone/rclone.conf".source = ./rclone.conf;
 }
-# vim: ts=2
-
diff --git a/home-manager/config/ssh/default.nix b/home-manager/config/ssh/default.nix
index f572d1e3..6ce3a7f7 100644
--- a/home-manager/config/ssh/default.nix
+++ b/home-manager/config/ssh/default.nix
@@ -7,5 +7,3 @@
     userKnownHostsFile = "${config.xdg.dataHome}/ssh/known_hosts";
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/swayidle/default.nix b/home-manager/config/swayidle/default.nix
index 43807e2a..073498a7 100644
--- a/home-manager/config/swayidle/default.nix
+++ b/home-manager/config/swayidle/default.nix
@@ -27,5 +27,3 @@
   #    # systemdTarget = ""; # TODO this might be usefull
   #  };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/swaylock/default.nix b/home-manager/config/swaylock/default.nix
index c26ba243..7c3762cc 100644
--- a/home-manager/config/swaylock/default.nix
+++ b/home-manager/config/swaylock/default.nix
@@ -8,5 +8,3 @@
     };
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/yambar/default.nix b/home-manager/config/yambar/default.nix
index 76d3109d..0bcf8419 100644
--- a/home-manager/config/yambar/default.nix
+++ b/home-manager/config/yambar/default.nix
@@ -51,5 +51,3 @@ in {
     };
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/config/zsh/default.nix b/home-manager/config/zsh/default.nix
index 71598f9a..01a553d0 100644
--- a/home-manager/config/zsh/default.nix
+++ b/home-manager/config/zsh/default.nix
@@ -137,5 +137,3 @@
     };
   };
 }
-# vim: ts=2
-
diff --git a/home-manager/default.nix b/home-manager/default.nix
index c8001c96..3779dbeb 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {impermanence, ...}: let
   # TODO actually use this in the user config
   username = "soispha";
diff --git a/home-manager/files/default.nix b/home-manager/files/default.nix
index 5dbfe19d..4e16077c 100644
--- a/home-manager/files/default.nix
+++ b/home-manager/files/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {config, ...}: {
   imports = [
     ./wallpaper
diff --git a/home-manager/files/wallpaper/default.nix b/home-manager/files/wallpaper/default.nix
index 362e8c99..2c9b3368 100644
--- a/home-manager/files/wallpaper/default.nix
+++ b/home-manager/files/wallpaper/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {config, ...}: {
   home.file = {
     wallpaper = {
diff --git a/home-manager/impermanence/default.nix b/home-manager/impermanence/default.nix
index 94c85723..1ba6a6fc 100644
--- a/home-manager/impermanence/default.nix
+++ b/home-manager/impermanence/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   impermanence,
diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix
index 3d85568d..ef0fdc15 100644
--- a/home-manager/packages/default.nix
+++ b/home-manager/packages/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   pkgs,
   sysLib,
diff --git a/home-manager/wms/default.nix b/home-manager/wms/default.nix
index 8111a4ed..610ea2f4 100644
--- a/home-manager/wms/default.nix
+++ b/home-manager/wms/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {config, ...}: {
   imports = [
     # ./sway
diff --git a/home-manager/wms/plasma/default.nix b/home-manager/wms/plasma/default.nix
index 443f5309..f68ee272 100644
--- a/home-manager/wms/plasma/default.nix
+++ b/home-manager/wms/plasma/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {config, ...}: {
   services.xserver.enable = true;
   services.xserver.displayManager.sddm.enable = true;
diff --git a/home-manager/wms/river/default.nix b/home-manager/wms/river/default.nix
index 77cb5eba..38b60ab8 100644
--- a/home-manager/wms/river/default.nix
+++ b/home-manager/wms/river/default.nix
@@ -66,5 +66,3 @@ in {
 
   xdg.configFile."river/res".source = ./res;
 }
-# vim: ts=2
-
diff --git a/hosts/apzu/default.nix b/hosts/apzu/default.nix
index 829fc66e..fb261aa8 100644
--- a/hosts/apzu/default.nix
+++ b/hosts/apzu/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {...}: {
   imports = [
     ./hardware
diff --git a/hosts/lahmu/default.nix b/hosts/lahmu/default.nix
index 84bfccef..85ff9a0e 100644
--- a/hosts/lahmu/default.nix
+++ b/hosts/lahmu/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   lib,
diff --git a/hosts/mammun/default.nix b/hosts/mammun/default.nix
index 9e7515eb..cb7d259f 100644
--- a/hosts/mammun/default.nix
+++ b/hosts/mammun/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   lib,
diff --git a/hosts/mammun/hardware/gpu.nix b/hosts/mammun/hardware/gpu.nix
index d744962c..939497db 100644
--- a/hosts/mammun/hardware/gpu.nix
+++ b/hosts/mammun/hardware/gpu.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {pkgs, ...}: {
   boot.initrd.kernelModules = ["amdgpu"];
   # for Southern Islands (SI ie. GCN 1) cards and for Sea Islands (CIK ie. GCN 2) cards
diff --git a/hosts/marduk/default.nix b/hosts/marduk/default.nix
index a45d9efd..2379fcdf 100644
--- a/hosts/marduk/default.nix
+++ b/hosts/marduk/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {lib, ...}: {
   imports = [
     ./hardware
diff --git a/hosts/marduk/hardware/default.nix b/hosts/marduk/hardware/default.nix
index 4c954bae..726e27a1 100644
--- a/hosts/marduk/hardware/default.nix
+++ b/hosts/marduk/hardware/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   lib,
   pkgs,
diff --git a/hosts/tiamat/default.nix b/hosts/tiamat/default.nix
index 7d568053..73c04606 100644
--- a/hosts/tiamat/default.nix
+++ b/hosts/tiamat/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {...}: {
   imports = [
     ./hardware
diff --git a/hosts/tiamat/networking.nix b/hosts/tiamat/networking.nix
index e6f00c8a..56771e90 100644
--- a/hosts/tiamat/networking.nix
+++ b/hosts/tiamat/networking.nix
@@ -1,5 +1,3 @@
 {...}: {
   networking.hostName = "tiamat";
 }
-# vim: ts=2
-
diff --git a/secrets/default.nix b/secrets/default.nix
index 9811e29c..1807fb8d 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -24,5 +24,3 @@ in {
     };
   };
 }
-# vim: ts=2
-
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 656a42b0..82f4bdcb 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -10,5 +10,3 @@ in {
   "serverphone/ca.key".publicKeys = [soispha tiamat apzu];
   "serverphone/server.key".publicKeys = [soispha tiamat apzu];
 }
-# vim: ts=2
-
diff --git a/system/disks/default.nix b/system/disks/default.nix
index f2884108..71a43667 100644
--- a/system/disks/default.nix
+++ b/system/disks/default.nix
@@ -125,5 +125,3 @@ in {
     ];
   };
 }
-# vim: ts=2
-
diff --git a/system/disks/fstrim.nix b/system/disks/fstrim.nix
index 6a8da5be..6daeb65e 100644
--- a/system/disks/fstrim.nix
+++ b/system/disks/fstrim.nix
@@ -40,5 +40,3 @@
     };
   };
 }
-# vim: ts=2
-
diff --git a/system/hardware/default.nix b/system/hardware/default.nix
index ca3c4a71..77d3d3f0 100644
--- a/system/hardware/default.nix
+++ b/system/hardware/default.nix
@@ -44,5 +44,3 @@
         SYMLINK+="stm32_dfu"
   '';
 }
-# vim: ts=2
-
diff --git a/system/libvirtd/default.nix b/system/libvirtd/default.nix
index 498131ef..52366349 100644
--- a/system/libvirtd/default.nix
+++ b/system/libvirtd/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {pkgs, ...}: {
   virtualisation = {
     spiceUSBRedirection.enable = true; # TODO this allows usb access to any user, which shouldn't be that bad
diff --git a/system/locale/default.nix b/system/locale/default.nix
index 64aeae0e..1e7786cc 100644
--- a/system/locale/default.nix
+++ b/system/locale/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   lib,
diff --git a/system/network/default.nix b/system/network/default.nix
index 2a68d7ce..9c570f3b 100644
--- a/system/network/default.nix
+++ b/system/network/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   lib,
diff --git a/system/nixpkgs/default.nix b/system/nixpkgs/default.nix
index 49c06444..1e371e53 100644
--- a/system/nixpkgs/default.nix
+++ b/system/nixpkgs/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   lib,
   system,
diff --git a/system/options/default.nix b/system/options/default.nix
index cbbce6e9..13861199 100644
--- a/system/options/default.nix
+++ b/system/options/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   lib,
   config,
diff --git a/system/services/backup/default.nix b/system/services/backup/default.nix
index 170fecba..8e80397d 100644
--- a/system/services/backup/default.nix
+++ b/system/services/backup/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   lib,
   sysLib,
diff --git a/system/services/dconf/default.nix b/system/services/dconf/default.nix
index f593ff54..db35208e 100644
--- a/system/services/dconf/default.nix
+++ b/system/services/dconf/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   lib,
diff --git a/system/services/nix/default.nix b/system/services/nix/default.nix
index 8b078106..1477be1b 100644
--- a/system/services/nix/default.nix
+++ b/system/services/nix/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   lib,
diff --git a/system/services/printing/default.nix b/system/services/printing/default.nix
index 8cfbdc72..7b8a871e 100644
--- a/system/services/printing/default.nix
+++ b/system/services/printing/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {pkgs, ...}: {
   services.avahi = {
     enable = true;
diff --git a/system/services/scanning/default.nix b/system/services/scanning/default.nix
index 27e7ccbb..6621e08f 100644
--- a/system/services/scanning/default.nix
+++ b/system/services/scanning/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {pkgs, ...}: {
   hardware = {
     sane = {
diff --git a/system/services/serverphone/default.nix b/system/services/serverphone/default.nix
index 145accf7..d07d3809 100644
--- a/system/services/serverphone/default.nix
+++ b/system/services/serverphone/default.nix
@@ -40,5 +40,3 @@
     members = ["serverphone"];
   };
 }
-# vim: ts=2
-
diff --git a/system/services/snapper/default.nix b/system/services/snapper/default.nix
index 87456f30..41e4b381 100644
--- a/system/services/snapper/default.nix
+++ b/system/services/snapper/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {...}: {
   services.snapper = {
     configs = {
diff --git a/system/services/steam/default.nix b/system/services/steam/default.nix
index d4c4be63..53a7d214 100644
--- a/system/services/steam/default.nix
+++ b/system/services/steam/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   lib,
   config,
diff --git a/system/services/swaylock/default.nix b/system/services/swaylock/default.nix
index 1d652c66..6cbcef28 100644
--- a/system/services/swaylock/default.nix
+++ b/system/services/swaylock/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {...}: {
   # otherwise swaylock can't access the user password.
   security.pam.services.swaylock = {};
diff --git a/system/services/xdg/default.nix b/system/services/xdg/default.nix
index 3b0233a2..bb29d20c 100644
--- a/system/services/xdg/default.nix
+++ b/system/services/xdg/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {pkgs, ...}: {
   xdg = {
     portal = {
diff --git a/system/tempfiles/default.nix b/system/tempfiles/default.nix
index f94ddcee..9e83fa34 100644
--- a/system/tempfiles/default.nix
+++ b/system/tempfiles/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {config, ...}: {
   systemd.tmpfiles.rules = [
     # this file is needed to trash stuff on the temp fs
diff --git a/system/users/default.nix b/system/users/default.nix
index 2aa67ac3..3d0a693a 100644
--- a/system/users/default.nix
+++ b/system/users/default.nix
@@ -1,4 +1,3 @@
-# vim: ts=2
 {
   config,
   pkgs,