project-wide: nixdirfmt

default.nix

@@ -2,7 +2,10 @@ rec {
   sources = import ./nix/sources.nix;
   pkgs = import ./pkgs { inherit sources; };
   witch = import ./lib/witch.nix { lib = pkgs.lib; };
-  profiles = witch.modList { modulesDir = ./profiles; defaultFile = "nixos.nix"; };
+  profiles = witch.modList {
+    modulesDir = ./profiles;
+    defaultFile = "nixos.nix";
+  };
 
   hosts = import ./lib/hosts.nix { inherit pkgs sources witch profiles; };
 

hosts/samhain/home/default.nix

@@ -1,5 +1 @@
-{ ... }: { 
+{ ... }: { imports = [ ./sway.nix ]; }
-  imports = [
-    ./sway.nix
-  ];
-}

hosts/samhain/home/sway.nix

@@ -1 +1 @@
-{ ... }: {}
+{ ... }: { }

hosts/yule/home/default.nix

@@ -1,5 +1 @@
-{ ... }: { 
+{ ... }: { imports = [ ./sway.nix ]; }
-  imports = [
-    ./sway.nix
-  ];
-}

hosts/yule/home/sway.nix

@@ -1 +1 @@
-{ ... }: {}
+{ ... }: { }

lib/hosts.nix

@@ -1,5 +1,5 @@
-{ pkgs, hostsDir ? ../hosts, profiles, pkgsPath ? ../pkgs
+{ pkgs, hostsDir ? ../hosts, profiles, pkgsPath ? ../pkgs, sources ? { }
-, sources ? { }, witch ? { } }:
+, witch ? { } }:
 
 with pkgs.lib;
 
@@ -10,11 +10,7 @@ rec {
   hostConfig = hostName:
     { config, ... }: {
       _module.args = { inherit hosts groups; };
-      imports = [
+      imports = [ ../nixos.nix ../modules/nixos ../modules/nixos/deploy ];
-        ../nixos.nix
-        ../modules/nixos
-        ../modules/nixos/deploy
-      ];
       networking = { inherit hostName; };
       nixpkgs.pkgs = import pkgsPath {
         inherit (config.nixpkgs) config;

pkgs/nekofetch/default.nix

@@ -1,4 +1,5 @@
-{ fetchFromGitHub, makeWrapper, lib, stdenv, jp2a, imagemagick, curl, neofetch }:
+{ fetchFromGitHub, makeWrapper, lib, stdenv, jp2a, imagemagick, curl, neofetch
+}:
 
 stdenv.mkDerivation rec {
   pname = "nekofetch";
@@ -11,10 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "03p1br1pn9j9nsdjg29rdznm5qh34p8dx0834rgmlc3pxlr910ng";
   };
 
-
   nativeBuildInputs = [ makeWrapper ];
 
-  buildPhase = ''true'';
+  buildPhase = "true";
 
   installPhase = ''
     mkdir -p $out/bin

profiles/gui/home.nix

@@ -3,5 +3,9 @@
 {
   imports = [ ./home ];
 
-  options = { deploy.profile.gui = lib.mkEnableOption "graphical system" // { default = true; }; };
+  options = {
+    deploy.profile.gui = lib.mkEnableOption "graphical system" // {
+      default = true;
+    };
+  };
 }

profiles/gui/nixos.nix

@@ -3,7 +3,11 @@
 {
   imports = [ ./nixos ];
 
-  options = { deploy.profile.gui = lib.mkEnableOption "graphical system" // { default = true; }; };
+  options = {
+    deploy.profile.gui = lib.mkEnableOption "graphical system" // {
+      default = true;
+    };
+  };
 
   config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
 }

profiles/kat/home.nix

@@ -8,5 +8,7 @@
   #  imports = [ ../../../modules/home ];
   #};
 
-  options = { deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };};
+  options = {
+    deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };
+  };
 }

profiles/kat/nixos.nix

@@ -17,6 +17,8 @@
     };
   };
 
-  options = { deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; }; };
+  options = {
+    deploy.profile.kat = lib.mkEnableOption "uhh meow" // { default = true; };
+  };
 
 }

profiles/laptop/home.nix

@@ -1,5 +1,9 @@
 { lib, ... }:
 
 {
-  options = { deploy.profile.laptop = lib.mkEnableOption "lappytop" // { default = true; }; };
+  options = {
+    deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
+      default = true;
+    };
+  };
 }

profiles/laptop/nixos.nix

@@ -3,7 +3,11 @@
 {
   imports = [ ./nixos ];
 
-  options = { deploy.profile.laptop = lib.mkEnableOption "lappytop" // { default = true; }; };
+  options = {
+    deploy.profile.laptop = lib.mkEnableOption "lappytop" // {
+      default = true;
+    };
+  };
 
   config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
 }

profiles/laptop/nixos/wifi.nix

@@ -1,4 +1,3 @@
 { config, lib, pkgs, ... }:
 
-{
+{ }
-}

profiles/sway/home.nix

@@ -3,5 +3,7 @@
 {
   imports = [ ./home ];
 
-  options = { deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; }; };
+  options = {
+    deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; };
+  };
 }

profiles/sway/home/swayidle.nix

@@ -13,18 +13,14 @@
         ${pkgs.swayidle}/bin/swayidle -w \
           timeout 300 '${pkgs.swaylock}/bin/swaylock -f -i eDP-1:${
             ../../../private/files/wallpapers/main.png
-            } -i HDMI-A-1:${
+          } -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-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:${
+          } -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${
-              ../../../private/files/wallpapers/main.png
-            } -i DP-1:${
             ../../../private/files/wallpapers/left.jpg
           }  -i DVI-D-1:${../../../private/files/wallpapers/right.jpg}'
       '';

profiles/sway/nixos.nix

@@ -3,7 +3,9 @@
 {
   imports = [ ./nixos ];
 
-  options = { deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; }; };
+  options = {
+    deploy.profile.sway = lib.mkEnableOption "sway wm" // { default = true; };
+  };
 
   config = { home-manager.users.kat = { imports = [ ./home.nix ]; }; };
 }