diff --git a/hosts/samhain/nixos/default.nix b/hosts/samhain/nixos/default.nix
index a2c4b666..73cb6707 100644
--- a/hosts/samhain/nixos/default.nix
+++ b/hosts/samhain/nixos/default.nix
@@ -16,9 +16,15 @@
 
   secrets.files.kat-glauca-dns = {
     text = pkgs.lib.deployEmbedFuckery ''
-      user="$(${pkgs.rbw-bitw}/bin/bitw -p gpg://${../../../private/files/bitw/master.gpg} get infra/hexdns-dynamic -f username)"
-      pass="$(${pkgs.rbw-bitw}/bin/bitw -p gpg://${../../../private/files/bitw/master.gpg} get infra/hexdns-dynamic -f password)"
-      hostname="$(${pkgs.rbw-bitw}/bin/bitw -p gpg://${../../../private/files/bitw/master.gpg} get infra/hexdns-dynamic -f hostname)"
+      user="$(${pkgs.rbw-bitw}/bin/bitw -p gpg://${
+        ../../../private/files/bitw/master.gpg
+      } get infra/hexdns-dynamic -f username)"
+      pass="$(${pkgs.rbw-bitw}/bin/bitw -p gpg://${
+        ../../../private/files/bitw/master.gpg
+      } get infra/hexdns-dynamic -f password)"
+      hostname="$(${pkgs.rbw-bitw}/bin/bitw -p gpg://${
+        ../../../private/files/bitw/master.gpg
+      } get infra/hexdns-dynamic -f hostname)"
     '';
     owner = "kat";
     group = "users";
@@ -28,10 +34,8 @@
     serviceConfig = {
       ExecStart = "${pkgs.kat-glauca-dns}/bin/kat-glauca-dns";
     };
-    environment = {
-      passFile = config.secrets.files.kat-glauca-dns.path;
-    };
-    wantedBy = [ "default.target"];
+    environment = { passFile = config.secrets.files.kat-glauca-dns.path; };
+    wantedBy = [ "default.target" ];
   };
 
   systemd.timers.kat-glauca-dns = {
diff --git a/modules/nixos/deploy/default.nix b/modules/nixos/deploy/default.nix
index 7f0eed2e..31e686b6 100644
--- a/modules/nixos/deploy/default.nix
+++ b/modules/nixos/deploy/default.nix
@@ -18,7 +18,7 @@ let
       <<${if hasPrefix "__FUCKERY__" file.text then "EOF" else "'EOF'"}
       ${removePrefix "__FUCKERY__" file.text}
       EOF
-'')) (attrValues config.secrets.files);
+    '')) (attrValues config.secrets.files);
 in {
   options = {
     deploy = {
diff --git a/pkgs/kat-glauca-dns/default.nix b/pkgs/kat-glauca-dns/default.nix
index 2fc74396..b0476662 100644
--- a/pkgs/kat-glauca-dns/default.nix
+++ b/pkgs/kat-glauca-dns/default.nix
@@ -1,16 +1,15 @@
-{ sources, pkgs, curl, coreutils, writeShellScriptBin }: 
+{ sources, pkgs, curl, coreutils, writeShellScriptBin }:
 
-let 
-  rbw-bitw = (import sources.arc-nixexprs { inherit pkgs; }).pkgs.rbw-bitw; 
+let rbw-bitw = (import sources.arc-nixexprs { inherit pkgs; }).pkgs.rbw-bitw;
 in writeShellScriptBin "kat-glauca-dns" ''
-#!/usr/bin/env bash
-set -eu
+  #!/usr/bin/env bash
+  set -eu
 
-ip4=$(${curl}/bin/curl -s --ipv4 https://dns.glauca.digital/checkip)
-ip6=$(${curl}/bin/curl -s --ipv6 https://dns.glauca.digital/checkip)
-source $passFile
-echo "$ip4, $ip6"
-  ${curl}/bin/curl -u ''${user}:''${pass} --data-urlencode "hostname=''${hostname}" --data-urlencode "myip=''${ip4}" "https://dns.glauca.digital/nic/update"
-echo ""
-  ${curl}/bin/curl -u ''${user}:''${pass} --data-urlencode "hostname=''${hostname}" --data-urlencode "myip=''${ip6}" "https://dns.glauca.digital/nic/update"
+  ip4=$(${curl}/bin/curl -s --ipv4 https://dns.glauca.digital/checkip)
+  ip6=$(${curl}/bin/curl -s --ipv6 https://dns.glauca.digital/checkip)
+  source $passFile
+  echo "$ip4, $ip6"
+    ${curl}/bin/curl -u ''${user}:''${pass} --data-urlencode "hostname=''${hostname}" --data-urlencode "myip=''${ip4}" "https://dns.glauca.digital/nic/update"
+  echo ""
+    ${curl}/bin/curl -u ''${user}:''${pass} --data-urlencode "hostname=''${hostname}" --data-urlencode "myip=''${ip6}" "https://dns.glauca.digital/nic/update"
 ''
diff --git a/pkgs/kat-gpg-status/default.nix b/pkgs/kat-gpg-status/default.nix
index 63b28eb7..072e4293 100644
--- a/pkgs/kat-gpg-status/default.nix
+++ b/pkgs/kat-gpg-status/default.nix
@@ -1,8 +1,5 @@
-{
-  wrapShellScriptBin,
-  pkgs
-}:
+{ wrapShellScriptBin, pkgs }:
 
 wrapShellScriptBin "kat-gpg-status" ./kat-gpg-status.sh {
-  depsRuntimePath = with pkgs; [coreutils gnupg];
+  depsRuntimePath = with pkgs; [ coreutils gnupg ];
 }
diff --git a/pkgs/kat-scrot/default.nix b/pkgs/kat-scrot/default.nix
index dad75bc5..9125d243 100644
--- a/pkgs/kat-scrot/default.nix
+++ b/pkgs/kat-scrot/default.nix
@@ -1,8 +1,5 @@
-{
-  wrapShellScriptBin,
-  pkgs
-}:
+{ wrapShellScriptBin, pkgs }:
 
 wrapShellScriptBin "kat-scrot" ./kat-scrot.sh {
-  depsRuntimePath = with pkgs; [coreutils wl-clipboard slurp grim sway jq];
+  depsRuntimePath = with pkgs; [ coreutils wl-clipboard slurp grim sway jq ];
 }
diff --git a/pkgs/kat-website/default.nix b/pkgs/kat-website/default.nix
index 22e1203c..8afe02ab 100644
--- a/pkgs/kat-website/default.nix
+++ b/pkgs/kat-website/default.nix
@@ -18,15 +18,11 @@ stdenv.mkDerivation rec {
     gemset = ./gemset.nix;
   };
 
-  buildInputs = [
-    bundler
-    ruby
-    jekyll_env
-  ];
+  buildInputs = [ bundler ruby jekyll_env ];
 
   installPhase = ''
-      mkdir $out
-      ${jekyll_env}/bin/jekyll build -d $out
+    mkdir $out
+    ${jekyll_env}/bin/jekyll build -d $out
   '';
 }
 
diff --git a/pkgs/kat-website/gemset.nix b/pkgs/kat-website/gemset.nix
index f221ea24..6023ce80 100644
--- a/pkgs/kat-website/gemset.nix
+++ b/pkgs/kat-website/gemset.nix
@@ -1,296 +1,311 @@
 {
   addressable = {
-    dependencies = ["public_suffix"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "public_suffix" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
       type = "gem";
     };
     version = "2.7.0";
   };
   colorator = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72";
       type = "gem";
     };
     version = "1.1.0";
   };
   concurrent-ruby = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
       type = "gem";
     };
     version = "1.1.8";
   };
   em-websocket = {
-    dependencies = ["eventmachine" "http_parser.rb"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "eventmachine" "http_parser.rb" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb";
       type = "gem";
     };
     version = "0.5.2";
   };
   eventmachine = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
     version = "1.2.7";
   };
   ffi = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx";
       type = "gem";
     };
     version = "1.14.2";
   };
   forwardable-extended = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v";
       type = "gem";
     };
     version = "2.6.0";
   };
   "http_parser.rb" = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
       type = "gem";
     };
     version = "0.6.0";
   };
   i18n = {
-    dependencies = ["concurrent-ruby"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "concurrent-ruby" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
       type = "gem";
     };
     version = "1.8.9";
   };
   jekyll = {
-    dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [
+      "addressable"
+      "colorator"
+      "em-websocket"
+      "i18n"
+      "jekyll-sass-converter"
+      "jekyll-watch"
+      "kramdown"
+      "kramdown-parser-gfm"
+      "liquid"
+      "mercenary"
+      "pathutil"
+      "rouge"
+      "safe_yaml"
+      "terminal-table"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq";
       type = "gem";
     };
     version = "4.2.0";
   };
   jekyll-feed = {
-    dependencies = ["jekyll"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "jekyll" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1zxqkrnix0xiw98531h5ga6h69jhzlx2jh9qhvcl67p8nq3sgza9";
       type = "gem";
     };
     version = "0.15.1";
   };
   jekyll-sass-converter = {
-    dependencies = ["sassc"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "sassc" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv";
       type = "gem";
     };
     version = "2.1.0";
   };
   jekyll-watch = {
-    dependencies = ["listen"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "listen" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1qd7hy1kl87fl7l0frw5qbn22x7ayfzlv9a5ca1m59g0ym1ysi5w";
       type = "gem";
     };
     version = "2.2.1";
   };
   kramdown = {
-    dependencies = ["rexml"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "rexml" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
       type = "gem";
     };
     version = "2.3.0";
   };
   kramdown-parser-gfm = {
-    dependencies = ["kramdown"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "kramdown" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
       type = "gem";
     };
     version = "1.1.0";
   };
   liquid = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by";
       type = "gem";
     };
     version = "4.0.3";
   };
   listen = {
-    dependencies = ["rb-fsevent" "rb-inotify"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "rb-fsevent" "rb-inotify" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj";
       type = "gem";
     };
     version = "3.4.1";
   };
   mercenary = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj";
       type = "gem";
     };
     version = "0.4.0";
   };
   pathutil = {
-    dependencies = ["forwardable-extended"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "forwardable-extended" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4";
       type = "gem";
     };
     version = "0.16.2";
   };
   public_suffix = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
       type = "gem";
     };
     version = "4.0.6";
   };
   rb-fsevent = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87";
       type = "gem";
     };
     version = "0.10.4";
   };
   rb-inotify = {
-    dependencies = ["ffi"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "ffi" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
       type = "gem";
     };
     version = "0.10.1";
   };
   rexml = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
       type = "gem";
     };
     version = "3.2.4";
   };
   rouge = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
       type = "gem";
     };
     version = "3.26.0";
   };
   safe_yaml = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
       type = "gem";
     };
     version = "1.0.5";
   };
   sassc = {
-    dependencies = ["ffi"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "ffi" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c";
       type = "gem";
     };
     version = "2.4.0";
   };
   terminal-table = {
-    dependencies = ["unicode-display_width"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "unicode-display_width" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh";
       type = "gem";
     };
     version = "2.0.0";
   };
   unicode-display_width = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
       type = "gem";
     };
     version = "1.7.0";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/weechat-title/default.nix b/pkgs/weechat-title/default.nix
index cd72b537..5562478e 100644
--- a/pkgs/weechat-title/default.nix
+++ b/pkgs/weechat-title/default.nix
@@ -1,21 +1,21 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-      pname =  "title.py";
-      version = "2011-11-15";
-      sha256 = "1h8mxpv47q3inhynlfjm3pdjxlr2fl06z4cdhr06kpm8f7xvz56p";
+  pname = "title.py";
+  version = "2011-11-15";
+  sha256 = "1h8mxpv47q3inhynlfjm3pdjxlr2fl06z4cdhr06kpm8f7xvz56p";
 
-      src = fetchurl {
-        name = pname;
-        url = "https://weechat.org/files/scripts/title.py";
-        sha256 = sha256;
-      };
+  src = fetchurl {
+    name = pname;
+    url = "https://weechat.org/files/scripts/title.py";
+    sha256 = sha256;
+  };
 
-      unpackPhase = "true";
+  unpackPhase = "true";
 
-      installPhase = ''
-        install -D $src $out/share/title.py
-      '';
+  installPhase = ''
+    install -D $src $out/share/title.py
+  '';
 
-      passthru.scripts = [ pname ];
+  passthru.scripts = [ pname ];
 }
diff --git a/profiles/gui/home/packages.nix b/profiles/gui/home/packages.nix
index 09bcd94f..0fb521b7 100644
--- a/profiles/gui/home/packages.nix
+++ b/profiles/gui/home/packages.nix
@@ -24,8 +24,8 @@ in {
       avidemux
       gst_all_1.gstreamer.dev
       gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base 
-      gst_all_1.gst-plugins-good 
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-good
       gst_all_1.gst-plugins-bad
       gst_all_1.gst-plugins-ugly
       vlc
diff --git a/profiles/gui/nixos/dns.nix b/profiles/gui/nixos/dns.nix
index 698aa9bd..dcb725bb 100644
--- a/profiles/gui/nixos/dns.nix
+++ b/profiles/gui/nixos/dns.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }: {
   config = lib.mkIf config.deploy.profile.gui {
     networking = {
-#      networkmanager.enable = true;
+      #      networkmanager.enable = true;
       resolvconf.useLocalResolver = true;
       networkmanager.dns = "none";
     };
diff --git a/profiles/kat/home/zsh/default.nix b/profiles/kat/home/zsh/default.nix
index 41e8f813..59e02be2 100644
--- a/profiles/kat/home/zsh/default.nix
+++ b/profiles/kat/home/zsh/default.nix
@@ -2,12 +2,8 @@
 
 {
   config = lib.mkIf config.deploy.profile.kat {
-    xdg.dataFile = {
-      "z/.keep".text = "";
-    };
-    home.packages = with pkgs; [
-      fzf fd
-    ];
+    xdg.dataFile = { "z/.keep".text = ""; };
+    home.packages = with pkgs; [ fzf fd ];
     programs.zsh = {
       enable = true;
       enableAutosuggestions = true;
@@ -21,7 +17,7 @@
       };
       localVariables = {
         _Z_DATA = "${config.xdg.dataHome}/z/data";
-        ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=3,bold";
+        ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=3,bold";
         ZSH_AUTOSUGGEST_USE_ASYNC = 1;
       };
       plugins = [
diff --git a/profiles/sway/home/sway.nix b/profiles/sway/home/sway.nix
index c1245a36..3d9f60a1 100644
--- a/profiles/sway/home/sway.nix
+++ b/profiles/sway/home/sway.nix
@@ -27,27 +27,52 @@
       fi
     '';
 
-    wayland.windowManager.sway = let 
-     cfg = config.wayland.windowManager.sway.config;
-        bindsym = k: v: "bindsym ${k} ${v}";
-        bindWorkspace = key: workspace: {
-          "${cfg.modifier}+${key}" = "workspace number ${workspace}";
-          "${cfg.modifier}+shift+${key}" = "move container to workspace number ${workspace}";
-         };
-        workspaceBindings =
-          map (v: bindWorkspace v "${v}:${v}") ["1" "2" "3" "4" "5" "6" "7" "8" "9"]
-          ++ [(bindWorkspace "0" "10:10")]
-          ++ lib.imap1 (i: v: bindWorkspace v "${toString (10 + i)}:${v}") ["F1" "F2" "F3" "F4" "F5" "F6" "F7" "F8" "F9" "F10" "F11" "F12"];
-        workspaceBindings' =
-          map (lib.mapAttrsToList bindsym) workspaceBindings;
-        workspaceBindingsStr =
-          lib.concatStringsSep "\n" (lib.flatten workspaceBindings');
+    wayland.windowManager.sway = let
+      cfg = config.wayland.windowManager.sway.config;
+      bindsym = k: v: "bindsym ${k} ${v}";
+      bindWorkspace = key: workspace: {
+        "${cfg.modifier}+${key}" = "workspace number ${workspace}";
+        "${cfg.modifier}+shift+${key}" =
+          "move container to workspace number ${workspace}";
+      };
+      workspaceBindings = map (v: bindWorkspace v "${v}:${v}") [
+        "1"
+        "2"
+        "3"
+        "4"
+        "5"
+        "6"
+        "7"
+        "8"
+        "9"
+      ] ++ [ (bindWorkspace "0" "10:10") ]
+        ++ lib.imap1 (i: v: bindWorkspace v "${toString (10 + i)}:${v}") [
+          "F1"
+          "F2"
+          "F3"
+          "F4"
+          "F5"
+          "F6"
+          "F7"
+          "F8"
+          "F9"
+          "F10"
+          "F11"
+          "F12"
+        ];
+      workspaceBindings' = map (lib.mapAttrsToList bindsym) workspaceBindings;
+      workspaceBindingsStr =
+        lib.concatStringsSep "\n" (lib.flatten workspaceBindings');
     in {
       enable = true;
       config = let
         dmenu =
           "${pkgs.bemenu}/bin/bemenu --fn '${witch.style.font.name} ${witch.style.font.size}' --nb '${witch.style.base16.color0}' --nf '${witch.style.base16.color7}' --sb '${witch.style.base16.color1}' --sf '${witch.style.base16.color7}' -l 5 -m -1 -i";
-        lockCommand = "swaylock -i eDP-1:${../../../private/files/wallpapers/main.png} -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${../../../private/files/wallpapers/left.jpg}  -i DVI-D-1:${../../../private/files/wallpapers/right.jpg} -s fill";
+        lockCommand = "swaylock -i eDP-1:${
+            ../../../private/files/wallpapers/main.png
+          } -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${
+            ../../../private/files/wallpapers/left.jpg
+          }  -i DVI-D-1:${../../../private/files/wallpapers/right.jpg} -s fill";
 
       in {
         bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
@@ -88,15 +113,9 @@
             middle_emulation = "enabled";
             click_method = "clickfinger";
           };
-          "5824:1503:screenstub-tablet" = {
-            events = "disabled";
-          };
-          "5824:1503:screenstub-mouse" = {
-            events = "disabled";
-          };
-          "5824:1503:screenstub-kbd" = {
-            events = "disabled";
-          };
+          "5824:1503:screenstub-tablet" = { events = "disabled"; };
+          "5824:1503:screenstub-mouse" = { events = "disabled"; };
+          "5824:1503:screenstub-kbd" = { events = "disabled"; };
           "*" = {
             xkb_layout = "gb";
             # xkb_variant = "nodeadkeys";
@@ -143,7 +162,8 @@
           "${cfg.modifier}+space" = "focus mode_toggle";
 
           "${cfg.modifier}+Tab" = "workspace back_and_forth";
-          "${cfg.modifier}+Shift+Tab" = "${pkgs.i3gopher}/bin/i3gopher --focus-last";
+          "${cfg.modifier}+Shift+Tab" =
+            "${pkgs.i3gopher}/bin/i3gopher --focus-last";
           "${cfg.modifier}+Ctrl+Left" = "workspace prev_on_output";
           "${cfg.modifier}+Ctrl+Right" = "workspace next_on_output";
 
@@ -167,8 +187,7 @@
             "exec ${pkgs.kat-scrot}/bin/kat-scrot  --notify upload area";
           "${cfg.modifier}+Mod1+Print" =
             "exec ${pkgs.kat-scrot}/bin/kat-scrot --notify upload window";
-          "Print" =
-            "exec ${pkgs.kat-scrot}/bin/kat-scrot --notify save screen";
+          "Print" = "exec ${pkgs.kat-scrot}/bin/kat-scrot --notify save screen";
           "Shift+Print" =
             "exec ${pkgs.kat-scrot}/bin/kat-scrot  --notify save area";
           "Mod1+Print" =
diff --git a/profiles/sway/home/swayidle.nix b/profiles/sway/home/swayidle.nix
index 1e8d71e9..17446f4d 100644
--- a/profiles/sway/home/swayidle.nix
+++ b/profiles/sway/home/swayidle.nix
@@ -12,10 +12,22 @@
         Type = "simple";
         ExecStart = ''
           ${pkgs.swayidle}/bin/swayidle -w \
-            timeout 300 '${pkgs.swaylock}/bin/swaylock -f -i eDP-1:${../../../private/files/wallpapers/main.png} -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${../../../private/files/wallpapers/left.jpg}  -i DVI-D-1:${../../../private/files/wallpapers/right.jpg}' \
+            timeout 300 '${pkgs.swaylock}/bin/swaylock -f -i eDP-1:${
+              ../../../private/files/wallpapers/main.png
+            } -i HDMI-A-1:${
+              ../../../private/files/wallpapers/main.png
+            } -i DP-1:${
+              ../../../private/files/wallpapers/left.jpg
+            }  -i DVI-D-1:${../../../private/files/wallpapers/right.jpg}' \
             timeout 600 'swaymsg "output * dpms off"' \
               resume 'swaymsg "output * dpms on"' \
-            before-sleep '${pkgs.swaylock}/bin/swaylock -f -i eDP-1:${../../../private/files/wallpapers/main.png} -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${../../../private/files/wallpapers/left.jpg}  -i DVI-D-1:${../../../private/files/wallpapers/right.jpg}'
+            before-sleep '${pkgs.swaylock}/bin/swaylock -f -i eDP-1:${
+              ../../../private/files/wallpapers/main.png
+            } -i HDMI-A-1:${
+              ../../../private/files/wallpapers/main.png
+            } -i DP-1:${
+              ../../../private/files/wallpapers/left.jpg
+            }  -i DVI-D-1:${../../../private/files/wallpapers/right.jpg}'
         '';
         RestartSec = 3;
         Restart = "always";
diff --git a/profiles/sway/home/waybar/default.nix b/profiles/sway/home/waybar/default.nix
index c5aeb748..af5afa70 100644
--- a/profiles/sway/home/waybar/default.nix
+++ b/profiles/sway/home/waybar/default.nix
@@ -28,9 +28,7 @@
         ];
 
         modules = {
-          "sway/workspaces" = {
-            format = "{name}";
-          };
+          "sway/workspaces" = { format = "{name}"; };
           #"custom/weather" = {
           #  format = "{}";
           #  interval = 3600;
@@ -43,11 +41,11 @@
             on-click = "xdg-open 'https://google.com/search?q=weather'";
             exec =
               "${pkgs.kat-weather}/bin/kat-weather ${witch.secrets.profiles.sway.city} ${witch.secrets.profiles.sway.api_key}";
-            };
-            "custom/gpg-status" = {
-              format = "{}";
-              interval= 300;
-              exec = "${pkgs.kat-gpg-status}/bin/kat-gpg-status";
+          };
+          "custom/gpg-status" = {
+            format = "{}";
+            interval = 300;
+            exec = "${pkgs.kat-gpg-status}/bin/kat-gpg-status";
           };
           cpu = { format = "  {usage}%"; };
           #mpd = { 
diff --git a/services/gitea.nix b/services/gitea.nix
index bbc228ec..873b8f0d 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -7,13 +7,9 @@
     domain = "git.kittywit.ch";
     rootUrl = "https://git.kittywit.ch";
     httpAddress = "127.0.0.1";
-    ssh = {
-      clonePort = 62954;
-    };
+    ssh = { clonePort = 62954; };
     settings = {
-      security = {
-        DISABLE_GIT_HOOKS = false;
-      };
+      security = { DISABLE_GIT_HOOKS = false; };
       mailer = {
         ENABLED = true;
         MAILER_TYPE = "sendmail";