adjusted workvm configuration

flake.nix

@@ -36,8 +36,7 @@
     };
   };
 
-  outputs = inputs:
+  outputs = inputs: let
-    let
     lib = inputs.snowfall-lib.mkLib {
       inherit inputs;
       src = ./.;
@@ -53,10 +52,9 @@
     };
   in
     lib.mkFlake {
-
       channels-config = {allowUnfree = true;};
 
-      outputs-builder = channels: { formatter = channels.nixpkgs.nixpkgs-fmt; };
+      outputs-builder = channels: {formatter = channels.nixpkgs.alejandra;};
 
       overlays = with inputs; [
         snowfall-flake.overlays.default

homes/x86_64-linux/cholli@workvm/default.nix

@@ -1,14 +1,14 @@
-{ lib
+{
-, pkgs
+  lib,
-, config
+  pkgs,
-, ...
+  config,
+  ...
 }:
 # User information gathered by Snowfall Lib is available.
 let
   name = config.snowfallorg.user.name;
   home = config.snowfallorg.user.home.directory;
-in
+in {
-{
   home = {
     packages = with pkgs; [neovim];
 

homes/x86_64-linux/cholli@yggdrasil/default.nix

@@ -1,21 +1,21 @@
-{ lib
-, pkgs
-, config
-, ...
-}:
-# User information gathered by Snowfall Lib is available.
-let
-  name = config.snowfallorg.user.name;
-  home = config.snowfallorg.user.home.directory;
-in
 {
-  home = {
+  lib,
-    packages = with pkgs; [ neovim firefox ];
+  pkgs,
+  config,
+  osConfig ? {},
+  format ? "unknown",
+  ...
+}:
+with lib.wyrdgard; {
+  wyrdgard = {
+    apps.cli-apps = {
+      fish = enabled;
+      home-manager = enabled;
+    };
 
-    sessionVariables = { EDITOR = "nvim"; };
+    tools = {
-
+      git = enabled;
-    shellAliases = { vimdiff = "nvim -d"; };
+      direnv = enabled;
-
+    };
-    stateVersion = "23.11";
   };
 }

lib/module/default.nix

@@ -1,5 +1,4 @@
 {lib, ...}:
-
 with lib; rec {
   ## Create a NixOS module option.
   ##

modules/home/apps/cli-apps/fish/default.nix

@@ -1,9 +1,14 @@
-{ options, config, lib, pkgs, ... }:
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.apps.cli-apps.fish;
-in
+in {
-{
   options.wyrdgard.apps.cli-apps.fish = with types; {
     enable = mkBoolOpt false "Whether or not to enable the fish shell";
   };
@@ -11,7 +16,8 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       fish
-      fishPlugins.tide
+      starship
+      colorls
     ];
   };
 }

modules/home/apps/cli-apps/home-manager/default.nix

@@ -0,0 +1,18 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.wyrdgard) enabled;
+
+  cfg = config.wyrdgard.apps.cli-apps.home-manager;
+in {
+  options.wyrdgard.apps.cli-apps.home-manager = {
+    enable = mkEnableOption "home-manager";
+  };
+
+  config = mkIf cfg.enable {
+    programs.home-manager = enabled;
+  };
+}

modules/home/tools/direnv/default.nix

@@ -0,0 +1,24 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.tools.direnv;
+in {
+  options.wyrdgard.tools.direnv = with types; {
+    enable = mkBoolOpt false "Whether or not to enable direnv.";
+  };
+
+  config = mkIf cfg.enable {
+    wyrdgard.home.extraOptions = {
+      programs.direnv = {
+        enable = true;
+        nix-direnv = enabled;
+      };
+    };
+  };
+}

modules/home/tools/git/default.nix

@@ -0,0 +1,34 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.tools.git;
+  user = config.wyrdgard.user;
+in {
+  options.wyrdgard.tools.git = with types; {
+    enable = mkBoolOpt true "Wether or not to enable git (Default enabled)";
+    userName = mkOpt types.str user.fullName "The name to use git with";
+    userEmail = mkOpt types.str user.email "The email to use git with";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      git
+      gitAndTools.gh
+    ];
+
+    programs.git = {
+      enable = true;
+      lfs.enable = true;
+      config = {
+        init = {defaultBranch = "main";};
+        push = {autoSetupRemote = true;};
+      };
+    };
+  };
+}

modules/home/tools/nix-ld/default.nix

@@ -0,0 +1,19 @@
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.tools.nix-ld;
+in {
+  options.wyrdgard.tools.nix-ld = with types; {
+    enable = mkBoolOpt false "Wether or not to enable nix-ld";
+  };
+
+  config = mkIf cfg.enable {
+    programs.nix-ld.enable = true;
+  };
+}

modules/nixos/apps/_1password/default.nix

@@ -1,9 +1,14 @@
-{ options, config, lib, pkgs, ... }:
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.apps._1password;
-in
+in {
-{
   options.wyrdgard.apps._1password = with types; {
     enable = mkBoolOpt false "Enable 1Password";
   };

modules/nixos/apps/discord/default.nix

@@ -1,9 +1,14 @@
-{ options, config, lib, pkgs, ... }:
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.apps.discord;
-in
+in {
-{
   options.wyrdgard.apps.discord = with types; {
     enable = mkBoolOpt false "Whether or not to enable basic configuration";
   };

modules/nixos/apps/steam/default.nix

@@ -1,11 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.apps.steam;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.apps.steam;
+in {
   options.wyrdgard.apps.steam = with types; {
     enable = mkBoolOpt false "Whether or not to enable support for Steam.";
   };

modules/nixos/apps/vivaldi/default.nix

@@ -1,9 +1,14 @@
-{ options, config, lib, pkgs, ... }:
+{
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.apps.vivaldi;
-in
+in {
-{
   options.wyrdgard.apps.vivaldi = with types; {
     enable = mkBoolOpt false "Whether or not to enable vivaldi browser";
   };

modules/nixos/archetypes/gaming/default.nix

@@ -1,11 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.archetypes.gaming;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.archetypes.gaming;
+in {
   options.wyrdgard.archetypes.gaming = with types; {
     enable = mkBoolOpt false "Whether or not to enable the gaming archetype.";
   };

modules/nixos/home/default.nix

@@ -1,15 +1,15 @@
-{ options
+{
-, config
+  options,
-, pkgs
+  config,
-, lib
+  pkgs,
-, inputs
+  lib,
-, ...
+  inputs,
+  ...
 }:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.home;
-in
+in {
-{
   options.wyrdgard.home = with types; {
     file =
       mkOpt attrs {}

modules/nixos/nix/default.nix

@@ -1,9 +1,10 @@
-{ options
+{
-, config
+  options,
-, pkgs
+  config,
-, lib
+  pkgs,
-, inputs
+  lib,
-, ...
+  inputs,
+  ...
 }:
 with lib;
 with lib.wyrdgard; let
@@ -14,8 +15,7 @@ with lib.wyrdgard; let
       key = mkOpt (nullOr str) null "The trusted public key for this substituter.";
     };
   });
-in
+in {
-{
   options.wyrdgard.nix = with types; {
     enable = mkBoolOpt true "Whether or not to manage nix configuration.";
     package = mkOpt package pkgs.nixUnstable "Which nix package to use.";
@@ -42,13 +42,11 @@ in
       nix-prefetch-git
     ];
 
-    nix =
+    nix = let
-      let
       users =
         ["root" config.wyrdgard.user.name]
         ++ optional config.services.hydra.enable "hydra";
-      in
+    in {
-      {
       package = cfg.package;
 
       settings =

modules/nixos/submodules/basics/default.nix

@@ -1,10 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.submodules.basics;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.submodules.basics;
+in {
   options.wyrdgard.submodules.basics = with types; {
     enable = mkBoolOpt false "Whether or not to enable basic configuration.";
   };

modules/nixos/submodules/games/default.nix

@@ -1,10 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.submodules.games;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.submodules.games;
+in {
   options.wyrdgard.submodules.games = with types; {
     enable = mkBoolOpt false "Whether or not you want to enable steam and other games";
   };
@@ -19,7 +23,5 @@ in
         steam = enabled;
       };
     };
-
   };
-
 }

modules/nixos/submodules/graphical-interface/default.nix

@@ -1,11 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.submodules.graphical-interface;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.submodules.graphical-interface;
+in {
   options.wyrdgard.submodules.graphical-interface = with types; {
     enable = mkBoolOpt false "Whether to enable a graphical interface";
   };
@@ -20,5 +23,4 @@ in
       desktopManager.plasma5.enable = true;
     };
   };
-
 }

modules/nixos/submodules/socials/default.nix

@@ -1,11 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.submodules.socials;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.submodules.socials;
+in {
   options.wyrdgard.submodules.socials = with types; {
     enable = mkBoolOpt false "Whether to enable social apps";
   };

modules/nixos/system/boot/default.nix

@@ -1,14 +1,14 @@
-{ options
+{
-, config
+  options,
-, pkgs
+  config,
-, lib
+  pkgs,
-, ...
+  lib,
+  ...
 }:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.system.boot;
-in
+in {
-{
   options.wyrdgard.system.boot = with types; {
     enable = mkBoolOpt false "Whether or not to enable booting.";
   };

modules/nixos/system/fonts/default.nix

@@ -1,14 +1,14 @@
-{ options
+{
-, config
+  options,
-, pkgs
+  config,
-, lib
+  pkgs,
-, ...
+  lib,
+  ...
 }:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.system.fonts;
-in
+in {
-{
   options.wyrdgard.system.fonts = with types; {
     enable = mkBoolOpt false "Whether or not to manage fonts.";
     fonts = mkOpt (listOf package) [] "Custom font packages to install.";
@@ -26,7 +26,7 @@ in
 
     fonts.packages = with pkgs;
       [
-        (nerdfonts.override { fonts = [ "Jetbrains Mono" "CodeNewRoman" "NerdFontsSymbolsOnly" ]; })
+        (nerdfonts.override {fonts = ["CodeNewRoman" "NerdFontsSymbolsOnly"];})
         font-awesome
         powerline-fonts
         powerline-symbols

modules/nixos/system/hardware/audio/default.nix

@@ -1,10 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.system.hardware.audio;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.system.hardware.audio;
+in {
   options.wyrdgard.system.hardware.audio = with types; {
     enable = mkBoolOpt false "Whether or not to enable audio";
   };
@@ -26,7 +30,5 @@ in
       alsa.support32Bit = true;
       pulse.enable = true;
     };
-
-
   };
 }

modules/nixos/system/hardware/bluetooth/default.nix

@@ -1,17 +1,19 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.system.hardware.bluetooth;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.system.hardware.bluetooth;
+in {
   options.wyrdgard.system.hardware.bluetooth = with types; {
     enable = mkBoolOpt false "Whether or not to enable bluetooth";
   };
 
   config = mkIf cfg.enable {
-
     hardware.bluetooth = {
       enable = true;
       powerOnBoot = true;

modules/nixos/system/hardware/networking/default.nix

@@ -1,17 +1,19 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.system.hardware.networking;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.system.hardware.networking;
+in {
   options.wyrdgard.system.hardware.networking = with types; {
     enable = mkBoolOpt false "Whether or not to enable networking";
   };
 
   config = mkIf cfg.enable {
-
     networking.networkmanager.enable = true;
   };
 }

modules/nixos/system/locale/default.nix

@@ -1,10 +1,14 @@
-{ options, config, pkgs, lib, ... }:
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.system.locale;
-in
 {
+  options,
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.system.locale;
+in {
   options.wyrdgard.system.locale = with types; {
     enable = mkBoolOpt false "Whether or not to manage locale settings.";
   };

modules/nixos/system/time/default.nix

@@ -1,14 +1,14 @@
-{ options
+{
-, config
+  options,
-, pkgs
+  config,
-, lib
+  pkgs,
-, ...
+  lib,
+  ...
 }:
 with lib;
 with lib.wyrdgard; let
   cfg = config.wyrdgard.system.time;
-in
+in {
-{
   options.wyrdgard.system.time = with types; {
     enable =
       mkBoolOpt false "Whether or not to configure timezone information.";

modules/nixos/system/xkb/default.nix

@@ -1,10 +1,13 @@
-{ options, config, lib, ... }:
-with lib;
-with lib.wyrdgard;
-let
-  cfg = config.wyrdgard.system.xkb;
-in
 {
+  options,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.system.xkb;
+in {
   options.wyrdgard.system.xkb = with types; {
     enable = mkBoolOpt false "Whether or not to configure xkb.";
   };

modules/nixos/tools/direnv/default.nix

@@ -1,10 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-let cfg = config.wyrdgard.tools.direnv;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.tools.direnv;
+in {
   options.wyrdgard.tools.direnv = with types; {
     enable = mkBoolOpt false "Whether or not to enable direnv.";
   };

modules/nixos/tools/git/default.nix

@@ -1,13 +1,15 @@
-{ options, config, lib, pkgs, ... }:
+{
-
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib;
-with lib.wyrdgard;
+with lib.wyrdgard; let
-
-let
   cfg = config.wyrdgard.tools.git;
   user = config.wyrdgard.user;
-in
+in {
-{
   options.wyrdgard.tools.git = with types; {
     enable = mkBoolOpt true "Wether or not to enable git (Default enabled)";
     userName = mkOpt types.str user.fullName "The name to use git with";

modules/nixos/tools/nix-ld/default.nix

@@ -1,12 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-
-let
-  cfg = config.wyrdgard.tools.nix-ld;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.tools.nix-ld;
+in {
   options.wyrdgard.tools.nix-ld = with types; {
     enable = mkBoolOpt false "Wether or not to enable nix-ld";
   };

modules/nixos/user/default.nix

@@ -1,8 +1,9 @@
-{ options
+{
-, config
+  options,
-, pkgs
+  config,
-, lib
+  pkgs,
-, ...
+  lib,
+  ...
 }:
 with lib;
 with lib.wyrdgard; let
@@ -29,8 +30,7 @@ with lib.wyrdgard; let
 
       cp ${cfg.icon} "$target/${cfg.icon.fileName}"
     '';
-in
+in {
-{
   options.wyrdgard.user = with types; {
     name = mkOpt str "cholli" "The name to use for the user account.";
     fullName = mkOpt str "Christoph Hollizeck" "The full name of the user.";
@@ -49,7 +49,6 @@ in
 
   config = {
     environment.systemPackages = with pkgs; [
-
     ];
 
     programs.zsh = {
@@ -83,7 +82,6 @@ in
           lcu = "${pkgs.colorls}/bin/colorls -U";
           lclu = "${pkgs.colorls}/bin/colorls -U -1";
         };
-
       };
     };
 

systems/x86_64-linux/workvm/default.nix

@@ -1,33 +1,20 @@
-{ pkgs, config, lib, ... }:
-with lib;
-with lib.wyrdgard;
 {
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with lib.wyrdgard; {
   imports = [./hardware.nix];
 
   boot.blacklistedKernelModules = ["hyperv-fb"];
   virtualisation.hypervGuest.videoMode = "1920x1080";
 
   environment.systemPackages = with pkgs; [
-    kitty
-    fish
-    fishPlugins.tide
 
-    fd
-    tree
-    ripgrep
   ];
 
-  services.xserver = {
-    enable = true;
-    displayManager.sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
-    desktopManager.plasma5.enable = true;
-    layout = "us";
-    xkbVariant = "";
-  };
-
   environment.variables.EDITOR = "nvim";
   environment.variables.SUDOEDITOR = "nvim";
 
@@ -41,12 +28,13 @@ with lib.wyrdgard;
 
   wyrdgard = {
     apps = {
-      discord = enabled;
       vivaldi = enabled;
     };
 
     submodules = {
       basics = enabled;
+      graphical-interface = enabled;
+      socials = enabled;
     };
   };
 

systems/x86_64-linux/workvm/hardware.nix

@@ -1,11 +1,12 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config
+{
-, lib
+  config,
-, pkgs
+  lib,
-, modulesPath
+  pkgs,
-, ...
+  modulesPath,
+  ...
 }: {
   imports = [];
 

systems/x86_64-linux/yggdrasil/default.nix

@@ -1,13 +1,15 @@
-{ pkgs, config, lib, ... }:
-with lib;
-with lib.wyrdgard;
 {
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with lib.wyrdgard; {
   imports = [./hardware.nix];
 
   environment.systemPackages = with pkgs; [
-    fd
+    filelight
-    tree
-    ripgrep
   ];
 
   # nvidia
@@ -28,8 +30,6 @@ with lib.wyrdgard;
 
   environment.pathsToLink = ["/libexec"];
 
-  services.xserver.videoDrivers = [ "nvidia" ];
-
   wyrdgard = {
     archetypes = {
       gaming.enable = true;
@@ -45,6 +45,9 @@ with lib.wyrdgard;
     };
   };
 
+  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.displayManager.sddm.wayland.enable = lib.mkForce false;
+
   # Configure Home-Manager options from NixOS.
   snowfallorg.user.cholli.home.config = {
     programs.kitty = {

systems/x86_64-linux/yggdrasil/hardware.nix

@@ -1,11 +1,12 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config
+{
-, lib
+  config,
-, pkgs
+  lib,
-, modulesPath
+  pkgs,
-, ...
+  modulesPath,
+  ...
 }: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")