From 102ee5aa760683fb0c094ca000df11f139227b9f Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Fri, 22 Mar 2024 14:43:20 +0000 Subject: [PATCH] switched formatter --- flake.nix | 8 +++---- homes/x86_64-linux/cholli@workvm/default.nix | 18 +++++++-------- modules/nixos/snowfall/default.nix | 15 +++++++------ systems/x86_64-linux/workvm/default.nix | 15 ++++++------- systems/x86_64-linux/workvm/hardware.nix | 23 ++++++++++---------- 5 files changed, 39 insertions(+), 40 deletions(-) diff --git a/flake.nix b/flake.nix index 2f1df83..7ad81f3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "My NixOS / nix-darwin / nixos-generators systems"; + description = "NixOs Config"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; @@ -26,13 +26,13 @@ inherit inputs; src = ./.; - channels-config = {allowUnfree = true;}; + channels-config = { allowUnfree = true; }; - outputs-builder = channels: {formatter = channels.nixpkgs.alejandra;}; + outputs-builder = channels: { formatter = channels.nixpkgs.nixpkgs-fmt; }; overlays = with inputs; [ # Use the overlay provided by this flake. - snowfall-flake.overlays."package/flake" + snowfall-flake.overlays.default ]; }; } diff --git a/homes/x86_64-linux/cholli@workvm/default.nix b/homes/x86_64-linux/cholli@workvm/default.nix index 683845a..a5ff062 100644 --- a/homes/x86_64-linux/cholli@workvm/default.nix +++ b/homes/x86_64-linux/cholli@workvm/default.nix @@ -1,20 +1,20 @@ -{ - lib, - pkgs, - config, - ... +{ lib +, 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 firefox]; + packages = with pkgs; [ neovim firefox ]; - sessionVariables = {EDITOR = "nvim";}; + sessionVariables = { EDITOR = "nvim"; }; - shellAliases = {vimdiff = "nvim -d";}; + shellAliases = { vimdiff = "nvim -d"; }; stateVersion = "23.11"; }; diff --git a/modules/nixos/snowfall/default.nix b/modules/nixos/snowfall/default.nix index b885ddf..fe06455 100644 --- a/modules/nixos/snowfall/default.nix +++ b/modules/nixos/snowfall/default.nix @@ -1,15 +1,16 @@ -{ - lib, - config, - ... -}: let +{ lib +, config +, ... +}: +let cfg = config.snowfallorg.example; -in { +in +{ options.snowfallorg.example = { enable = lib.mkEnableOption "Snowfall Example"; }; config = lib.mkIf cfg.enable { - environment.variables = {SNOWFALLORG_EXAMPLE = "enabled";}; + environment.variables = { SNOWFALLORG_EXAMPLE = "enabled"; }; }; } diff --git a/systems/x86_64-linux/workvm/default.nix b/systems/x86_64-linux/workvm/default.nix index 9f3439f..046f69d 100644 --- a/systems/x86_64-linux/workvm/default.nix +++ b/systems/x86_64-linux/workvm/default.nix @@ -1,18 +1,17 @@ -{ - pkgs, - config, - ... +{ pkgs +, config +, ... }: { - imports = [./hardware.nix]; + imports = [ ./hardware.nix ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.blacklistedKernelModules = ["hyperv-fb"]; + boot.blacklistedKernelModules = [ "hyperv-fb" ]; virtualisation.hypervGuest.videoMode = "1920x1080"; users.users.cholli = { isNormalUser = true; - extraGroups = ["wheel"]; + extraGroups = [ "wheel" ]; }; environment.systemPackages = with pkgs; [ @@ -45,7 +44,7 @@ }; # Configure Home-Manager options from NixOS. - snowfallorg.user.cholli.home.config = {}; + snowfallorg.user.cholli.home.config = { }; system.stateVersion = "23.11"; } diff --git a/systems/x86_64-linux/workvm/hardware.nix b/systems/x86_64-linux/workvm/hardware.nix index e6feba0..7a4edd8 100644 --- a/systems/x86_64-linux/workvm/hardware.nix +++ b/systems/x86_64-linux/workvm/hardware.nix @@ -1,19 +1,18 @@ # 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, - pkgs, - modulesPath, - ... +{ config +, lib +, pkgs +, modulesPath +, ... }: { - imports = []; + imports = [ ]; - boot.initrd.availableKernelModules = ["sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/c58c66b3-4e0f-4393-8d7b-871d934856e3"; @@ -25,7 +24,7 @@ fsType = "vfat"; }; - swapDevices = []; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's