added tide and removed things from the 'main' config to see if it still works

This commit is contained in:
Christoph Hollizeck 2024-03-26 17:48:15 +01:00
parent 17bd0f8861
commit 208e4947a5
4 changed files with 41 additions and 56 deletions

View file

@ -14,9 +14,10 @@ in
sessionVariables = { EDITOR = "nvim"; }; sessionVariables = { EDITOR = "nvim"; };
shellAliases = { shellAliases = {
vim = "nvim"; vim = "nvim";
vimdiff = "nvim -d"; }; vimdiff = "nvim -d";
};
stateVersion = "23.11"; stateVersion = "23.11";
}; };

View file

@ -1,17 +1,17 @@
{ options, config, lib, pkgs, ... }: { options, config, lib, pkgs, ... }:
with lib; with lib;
with lib.wyrdgard; let with lib.wyrdgard; let
cfg = config.wyrdgard.apps.vivaldi; cfg = config.wyrdgard.apps.vivaldi;
in in
{ {
options.wyrdgard.apps.vivaldi = with types; { options.wyrdgard.apps.vivaldi = with types; {
enable = mkBoolOpt false "Whether or not to enable vivaldi browser"; enable = mkBoolOpt false "Whether or not to enable vivaldi browser";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vivaldi vivaldi
vivaldi-ffmpeg-codecs vivaldi-ffmpeg-codecs
]; ];
}; };
} }

View file

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

View file

@ -1,39 +1,22 @@
{ pkgs , config , lib, ... }: { pkgs, config, lib, ... }:
with lib; with lib;
with lib.wyrdgard; with lib.wyrdgard;
{ {
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"; virtualisation.hypervGuest.videoMode = "1920x1080";
users.users.cholli = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
neovim
snowfallorg.flake
git
gitAndTools.gh
kitty kitty
fish fish
vivaldi fishPlugins.tide
fd fd
tree tree
ripgrep ripgrep
nixfmt
]; ];
home-manager.useGlobalPkgs = true;
networking.networkmanager.enable = true;
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.sddm = { displayManager.sddm = {
@ -45,27 +28,27 @@ with lib.wyrdgard;
xkbVariant = ""; xkbVariant = "";
}; };
environment.variables.EDITOR = "nvim"; environment.variables.EDITOR = "nvim";
environment.variables.SUDOEDITOR = "nvim"; environment.variables.SUDOEDITOR = "nvim";
# Configure Home-Manager options from NixOS. # Configure Home-Manager options from NixOS.
snowfallorg.user.cholli.home.config = { snowfallorg.user.cholli.home.config = {
programs.kitty= { programs.kitty = {
theme = "Tokyo Night"; theme = "Tokyo Night";
shellIntegration.enableFishIntegration = true; shellIntegration.enableFishIntegration = true;
}; };
}; };
wyrdgard = { wyrdgard = {
apps = { apps = {
discord = enabled; discord = enabled;
vivaldi = enabled; vivaldi = enabled;
}; };
submodules = { submodules = {
basics = enabled; basics = enabled;
}; };
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }