added tide and removed things from the 'main' config to see if it still works
This commit is contained in:
		
							parent
							
								
									17bd0f8861
								
							
						
					
					
						commit
						208e4947a5
					
				
					 4 changed files with 41 additions and 56 deletions
				
			
		| 
						 | 
				
			
			@ -14,9 +14,10 @@ in
 | 
			
		|||
 | 
			
		||||
    sessionVariables = { EDITOR = "nvim"; };
 | 
			
		||||
 | 
			
		||||
    shellAliases = { 
 | 
			
		||||
	vim = "nvim";
 | 
			
		||||
    vimdiff = "nvim -d"; };
 | 
			
		||||
    shellAliases = {
 | 
			
		||||
      vim = "nvim";
 | 
			
		||||
      vimdiff = "nvim -d";
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    stateVersion = "23.11";
 | 
			
		||||
  };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
    ];
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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";
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue