diff --git a/homes/x86_64-linux/cholli@workvm/default.nix b/homes/x86_64-linux/cholli@workvm/default.nix index 4dd32f8..2456be8 100644 --- a/homes/x86_64-linux/cholli@workvm/default.nix +++ b/homes/x86_64-linux/cholli@workvm/default.nix @@ -14,9 +14,10 @@ in sessionVariables = { EDITOR = "nvim"; }; - shellAliases = { - vim = "nvim"; - vimdiff = "nvim -d"; }; + shellAliases = { + vim = "nvim"; + vimdiff = "nvim -d"; + }; stateVersion = "23.11"; }; diff --git a/modules/nixos/apps/vivaldi/default.nix b/modules/nixos/apps/vivaldi/default.nix index 0703bcd..076e474 100644 --- a/modules/nixos/apps/vivaldi/default.nix +++ b/modules/nixos/apps/vivaldi/default.nix @@ -1,17 +1,17 @@ { options, config, lib, pkgs, ... }: with lib; with lib.wyrdgard; let - cfg = config.wyrdgard.apps.vivaldi; + cfg = config.wyrdgard.apps.vivaldi; in { - options.wyrdgard.apps.vivaldi = with types; { - enable = mkBoolOpt false "Whether or not to enable vivaldi browser"; -}; + options.wyrdgard.apps.vivaldi = with types; { + enable = mkBoolOpt false "Whether or not to enable vivaldi browser"; + }; - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - vivaldi - vivaldi-ffmpeg-codecs -]; -}; + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + vivaldi + vivaldi-ffmpeg-codecs + ]; + }; } diff --git a/modules/nixos/tools/nix-ld/default.nix b/modules/nixos/tools/nix-ld/default.nix index 58547cd..9cd6947 100644 --- a/modules/nixos/tools/nix-ld/default.nix +++ b/modules/nixos/tools/nix-ld/default.nix @@ -4,13 +4,14 @@ 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"; - }; + 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; - }; + config = mkIf cfg.enable { + programs.nix-ld.enable = true; + }; } diff --git a/systems/x86_64-linux/workvm/default.nix b/systems/x86_64-linux/workvm/default.nix index d1d1d6c..a77a6a5 100644 --- a/systems/x86_64-linux/workvm/default.nix +++ b/systems/x86_64-linux/workvm/default.nix @@ -1,39 +1,22 @@ -{ pkgs , config , lib, ... }: +{ pkgs, config, lib, ... }: with lib; with lib.wyrdgard; { imports = [ ./hardware.nix ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; boot.blacklistedKernelModules = [ "hyperv-fb" ]; virtualisation.hypervGuest.videoMode = "1920x1080"; - users.users.cholli = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - }; - environment.systemPackages = with pkgs; [ - neovim - snowfallorg.flake - git - gitAndTools.gh kitty fish - vivaldi + fishPlugins.tide fd tree ripgrep - - nixfmt ]; - home-manager.useGlobalPkgs = true; - - networking.networkmanager.enable = true; - services.xserver = { enable = true; displayManager.sddm = { @@ -45,27 +28,27 @@ with lib.wyrdgard; xkbVariant = ""; }; - environment.variables.EDITOR = "nvim"; - environment.variables.SUDOEDITOR = "nvim"; + environment.variables.EDITOR = "nvim"; + environment.variables.SUDOEDITOR = "nvim"; # Configure Home-Manager options from NixOS. snowfallorg.user.cholli.home.config = { - programs.kitty= { - theme = "Tokyo Night"; - shellIntegration.enableFishIntegration = true; - }; -}; + programs.kitty = { + theme = "Tokyo Night"; + shellIntegration.enableFishIntegration = true; + }; + }; - wyrdgard = { - apps = { - discord = enabled; - vivaldi = enabled; - }; + wyrdgard = { + apps = { + discord = enabled; + vivaldi = enabled; + }; - submodules = { - basics = enabled; - }; - }; + submodules = { + basics = enabled; + }; + }; system.stateVersion = "23.11"; }