project-wide: nixdirfmt

This commit is contained in:
kat witch 2021-03-28 21:03:48 +01:00
parent 219efa52ba
commit f92e21126e
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
46 changed files with 997 additions and 987 deletions

View file

@ -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; };

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

@ -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;
};
};
}

View file

@ -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 ]; }; };
}

View file

@ -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; };
};
}

View file

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

View file

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

View file

@ -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 ]; }; };
}

View file

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

View file

@ -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; };
};
}

View file

@ -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:${
../../../private/files/wallpapers/main.png
} -i DP-1:${
} -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:${
} -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}'
'';

View file

@ -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 ]; }; };
}