added vm auto-resizing screens.
This commit is contained in:
		
							parent
							
								
									43a47321e4
								
							
						
					
					
						commit
						07a4bf6477
					
				
					 11 changed files with 70 additions and 38 deletions
				
			
		| 
						 | 
				
			
			@ -13,6 +13,7 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
  modules = [
 | 
			
		||||
    inputs.home-manager.nixosModules.home-manager
 | 
			
		||||
    ./hardware-configuration.nix
 | 
			
		||||
    ../../roles/nixos/graphical-vm.nix
 | 
			
		||||
    ../../modules/hostopts.nix
 | 
			
		||||
    ../../modules/nixos/common.nix
 | 
			
		||||
    ../../modules/nixos/printing.nix
 | 
			
		||||
| 
						 | 
				
			
			@ -54,11 +55,13 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        xkb.variant = "";
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      programs.zsh.enable = true;
 | 
			
		||||
      environment.shells = with pkgs; [zsh];
 | 
			
		||||
      # Define a user account. Don't forget to set a password with ‘passwd’.
 | 
			
		||||
      users.users.${config.host.user} = {
 | 
			
		||||
        isNormalUser = true;
 | 
			
		||||
        description = "Gabe Venberg";
 | 
			
		||||
        shell = pkgs.nushell;
 | 
			
		||||
        shell = pkgs.zsh;
 | 
			
		||||
        extraGroups = ["wheel"];
 | 
			
		||||
        packages = with pkgs; [
 | 
			
		||||
          firefox
 | 
			
		||||
| 
						 | 
				
			
			@ -74,10 +77,6 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        host = osConfig.host;
 | 
			
		||||
        home = {
 | 
			
		||||
          enable-speech = true;
 | 
			
		||||
          nvim = {
 | 
			
		||||
            enable-lsp = true;
 | 
			
		||||
            enable-treesitter = true;
 | 
			
		||||
          };
 | 
			
		||||
          git = {
 | 
			
		||||
            profile = {
 | 
			
		||||
              name = "Gabe Venberg";
 | 
			
		||||
| 
						 | 
				
			
			@ -87,7 +86,7 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
          };
 | 
			
		||||
        };
 | 
			
		||||
        imports = [
 | 
			
		||||
          ../../roles/terminal.nix
 | 
			
		||||
          ../../roles/home-manager/terminal.nix
 | 
			
		||||
          ../../modules/home-manager/nvim
 | 
			
		||||
          ../../modules/home-manager/common.nix
 | 
			
		||||
          ../../modules/home-manager/email.nix
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -34,7 +34,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
 | 
			
		|||
      home.username = "gabe";
 | 
			
		||||
      home.homeDirectory = /home/gabe;
 | 
			
		||||
      imports = [
 | 
			
		||||
        ../roles/terminal.nix
 | 
			
		||||
        ../roles/home-manager/terminal.nix
 | 
			
		||||
        ../modules/home-manager/nvim
 | 
			
		||||
        ../modules/home-manager/common.nix
 | 
			
		||||
        ../modules/home-manager/syncthing.nix
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -37,7 +37,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
 | 
			
		|||
      home.username = "gabe";
 | 
			
		||||
      home.homeDirectory = /home/gabe;
 | 
			
		||||
      imports = [
 | 
			
		||||
        ../roles/terminal.nix
 | 
			
		||||
        ../roles/home-manager/terminal.nix
 | 
			
		||||
        ../modules/home-manager/nvim
 | 
			
		||||
        ../modules/home-manager/common.nix
 | 
			
		||||
        ../modules/home-manager/syncthing.nix
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,6 +13,7 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
  modules = [
 | 
			
		||||
    inputs.home-manager.nixosModules.home-manager
 | 
			
		||||
    ./hardware-configuration.nix
 | 
			
		||||
    ../../roles/nixos/graphical-vm.nix
 | 
			
		||||
    ../../modules/hostopts.nix
 | 
			
		||||
    ../../modules/nixos/common.nix
 | 
			
		||||
    ../../modules/nixos/printing.nix
 | 
			
		||||
| 
						 | 
				
			
			@ -54,12 +55,13 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        xkb.variant = "";
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      environment.shells = with pkgs; [nushell zsh];
 | 
			
		||||
      programs.zsh.enable = true;
 | 
			
		||||
      environment.shells = with pkgs; [zsh];
 | 
			
		||||
      # Define a user account. Don't forget to set a password with ‘passwd’.
 | 
			
		||||
      users.users.${config.host.user} = {
 | 
			
		||||
        isNormalUser = true;
 | 
			
		||||
        description = "Gabe Venberg";
 | 
			
		||||
        shell = pkgs.nushell;
 | 
			
		||||
        shell = pkgs.zsh;
 | 
			
		||||
        extraGroups = ["wheel"];
 | 
			
		||||
        packages = with pkgs; [
 | 
			
		||||
          firefox
 | 
			
		||||
| 
						 | 
				
			
			@ -88,7 +90,7 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
          };
 | 
			
		||||
        };
 | 
			
		||||
        imports = [
 | 
			
		||||
          ../../roles/terminal.nix
 | 
			
		||||
          ../../roles/home-manager/terminal.nix
 | 
			
		||||
          ../../modules/home-manager/nvim
 | 
			
		||||
          ../../modules/home-manager/common.nix
 | 
			
		||||
          inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								justfile
									
										
									
									
									
								
							
							
						
						
									
										3
									
								
								justfile
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -19,3 +19,6 @@ format:
 | 
			
		|||
home-gc:
 | 
			
		||||
    home-manager expire-generations -7days
 | 
			
		||||
    nix store gc
 | 
			
		||||
 | 
			
		||||
nixos-gc:
 | 
			
		||||
    sudo nix-collect-garbage --delete-older-than 7d
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,6 +25,8 @@
 | 
			
		|||
    home.packages = with pkgs; [
 | 
			
		||||
      maim
 | 
			
		||||
      brightnessctl
 | 
			
		||||
      arandr
 | 
			
		||||
      dex
 | 
			
		||||
    ];
 | 
			
		||||
    services.playerctld.enable = true;
 | 
			
		||||
    xsession.enable = true;
 | 
			
		||||
| 
						 | 
				
			
			@ -209,13 +211,18 @@
 | 
			
		|||
          {
 | 
			
		||||
            command = "betterlockscreen --lock blur";
 | 
			
		||||
            notification = false;
 | 
			
		||||
            always = true;
 | 
			
		||||
            always = false;
 | 
			
		||||
          }
 | 
			
		||||
          {
 | 
			
		||||
            command = "betterlockscreen --wall";
 | 
			
		||||
            notification = false;
 | 
			
		||||
            always = true;
 | 
			
		||||
          }
 | 
			
		||||
          {
 | 
			
		||||
            command = "dex --autostart";
 | 
			
		||||
            notification = false;
 | 
			
		||||
            always = false;
 | 
			
		||||
          }
 | 
			
		||||
          # {
 | 
			
		||||
          #   command = "~/.fehbg";
 | 
			
		||||
          #   notification = false;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,8 +5,7 @@
 | 
			
		|||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
  options = {
 | 
			
		||||
    home = {
 | 
			
		||||
      git = {
 | 
			
		||||
    home.git = {
 | 
			
		||||
      workProfile = {
 | 
			
		||||
        enable = lib.mkEnableOption "git work profile";
 | 
			
		||||
        email = lib.mkOption {
 | 
			
		||||
| 
						 | 
				
			
			@ -26,7 +25,6 @@
 | 
			
		|||
      };
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  config = {
 | 
			
		||||
    programs.git = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,11 +5,11 @@
 | 
			
		|||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
  imports = [
 | 
			
		||||
    ../modules/home-manager/terminal/zsh.nix
 | 
			
		||||
    ../modules/home-manager/terminal/git.nix
 | 
			
		||||
    ../modules/home-manager/terminal/zellij
 | 
			
		||||
    ../modules/home-manager/terminal/ssh-agent.nix
 | 
			
		||||
    ../modules/home-manager/terminal/direnv.nix
 | 
			
		||||
    ../../modules/home-manager/terminal/zsh.nix
 | 
			
		||||
    ../../modules/home-manager/terminal/git.nix
 | 
			
		||||
    ../../modules/home-manager/terminal/zellij
 | 
			
		||||
    ../../modules/home-manager/terminal/ssh-agent.nix
 | 
			
		||||
    ../../modules/home-manager/terminal/direnv.nix
 | 
			
		||||
  ];
 | 
			
		||||
  home.packages = with pkgs; [
 | 
			
		||||
    sshfs
 | 
			
		||||
| 
						 | 
				
			
			@ -6,10 +6,10 @@
 | 
			
		|||
}: {
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./minimal-terminal.nix
 | 
			
		||||
    ../modules/home-manager/terminal/nushell
 | 
			
		||||
    ../modules/home-manager/terminal/starship.nix
 | 
			
		||||
    ../modules/home-manager/terminal/voice.nix
 | 
			
		||||
    ../modules/home-manager/terminal/tiny-irc.nix
 | 
			
		||||
    ../../modules/home-manager/terminal/nushell
 | 
			
		||||
    ../../modules/home-manager/terminal/starship.nix
 | 
			
		||||
    ../../modules/home-manager/terminal/voice.nix
 | 
			
		||||
    ../../modules/home-manager/terminal/tiny-irc.nix
 | 
			
		||||
  ];
 | 
			
		||||
  home.packages = with pkgs; [
 | 
			
		||||
    tre-command
 | 
			
		||||
							
								
								
									
										13
									
								
								roles/nixos/graphical-vm.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								roles/nixos/graphical-vm.nix
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,13 @@
 | 
			
		|||
{
 | 
			
		||||
  config,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  lib,
 | 
			
		||||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
  #note: needs to have something that autostarts desktop files.
 | 
			
		||||
  services.spice-vdagentd.enable = true;
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./vm.nix
 | 
			
		||||
  ];
 | 
			
		||||
  host.gui.enable = true;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										10
									
								
								roles/nixos/vm.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								roles/nixos/vm.nix
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,10 @@
 | 
			
		|||
{
 | 
			
		||||
  config,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  lib,
 | 
			
		||||
  inputs,
 | 
			
		||||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
  services.qemuGuest.enable = true;
 | 
			
		||||
  host.isVm = true;
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue