Replaced nixvim with nix-cats external flake.
This commit is contained in:
		
							parent
							
								
									221524709e
								
							
						
					
					
						commit
						dc1e99a104
					
				
					 44 changed files with 57 additions and 1455 deletions
				
			
		| 
						 | 
				
			
			@ -1,94 +0,0 @@
 | 
			
		|||
{
 | 
			
		||||
  inputs,
 | 
			
		||||
  myLib,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
inputs.nixpkgs.lib.nixosSystem {
 | 
			
		||||
  system = "x86_64-linux";
 | 
			
		||||
  specialArgs = {inherit inputs myLib;};
 | 
			
		||||
  # > Our main nixos configuration file <
 | 
			
		||||
  modules = [
 | 
			
		||||
    inputs.home-manager.nixosModules.home-manager
 | 
			
		||||
    ./hardware-configuration.nix
 | 
			
		||||
    ../../roles/nixos/graphical-vm.nix
 | 
			
		||||
    ../../configs/nixos/common.nix
 | 
			
		||||
    ../../configs/nixos/printing.nix
 | 
			
		||||
    ../../configs/nixos/sound.nix
 | 
			
		||||
    ../../configs/nixos/interactive-networking.nix
 | 
			
		||||
    ../../configs/nixos/i3
 | 
			
		||||
    ../../configs/nixos/sshd.nix
 | 
			
		||||
    ../../configs/nixos/secrets.nix
 | 
			
		||||
    ({
 | 
			
		||||
      config,
 | 
			
		||||
      pkgs,
 | 
			
		||||
      ...
 | 
			
		||||
    }: {
 | 
			
		||||
      host = {
 | 
			
		||||
        user = "gabe";
 | 
			
		||||
        fullName = "Gabe Venberg";
 | 
			
		||||
        gui.enable = true;
 | 
			
		||||
        isVm = true;
 | 
			
		||||
      };
 | 
			
		||||
      networking.hostName = "archlaptop-vm"; # Define your hostname.
 | 
			
		||||
 | 
			
		||||
      # Define a user account. Don't forget to set a password with ‘passwd’.
 | 
			
		||||
      users.users.${config.host.details.user} = {
 | 
			
		||||
        packages = with pkgs; [firefox];
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      home-manager.sharedModules = [
 | 
			
		||||
        inputs.sops-nix.homeManagerModules.sops
 | 
			
		||||
      ];
 | 
			
		||||
      home-manager.users.${config.host.details.user} = {
 | 
			
		||||
        inputs,
 | 
			
		||||
        osConfig,
 | 
			
		||||
        lib,
 | 
			
		||||
        ...
 | 
			
		||||
      }: {
 | 
			
		||||
        host = osConfig.host;
 | 
			
		||||
        user = {
 | 
			
		||||
          git = {
 | 
			
		||||
            profile = {
 | 
			
		||||
              name = config.host.details.fullName;
 | 
			
		||||
              email = "gabevenberg@gmail.com";
 | 
			
		||||
            };
 | 
			
		||||
            workProfile.enable = false;
 | 
			
		||||
          };
 | 
			
		||||
        };
 | 
			
		||||
        imports = [
 | 
			
		||||
          ../../roles/home-manager/terminal.nix
 | 
			
		||||
          ../../configs/home-manager/common.nix
 | 
			
		||||
          ../../configs/home-manager/email.nix
 | 
			
		||||
          ../../configs/home-manager/tiny-irc.nix
 | 
			
		||||
          inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
          ../../configs/home-manager/secrets.nix
 | 
			
		||||
        ];
 | 
			
		||||
 | 
			
		||||
        sops = lib.mkIf (inputs ? nix-secrets) {
 | 
			
		||||
          secrets = {
 | 
			
		||||
            gmail-password.sopsFile = "${inputs.nix-secrets}/workstations.yaml";
 | 
			
		||||
            irc-cert.sopsFile = "${inputs.nix-secrets}/workstations.yaml";
 | 
			
		||||
          };
 | 
			
		||||
        };
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      # Bootloader.
 | 
			
		||||
      boot.loader.systemd-boot.enable = true;
 | 
			
		||||
      boot.loader.efi.canTouchEfiVariables = true;
 | 
			
		||||
 | 
			
		||||
      # Open ports in the firewall.
 | 
			
		||||
      # networking.firewall.allowedTCPPorts = [ ... ];
 | 
			
		||||
      # networking.firewall.allowedUDPPorts = [ ... ];
 | 
			
		||||
      # Or disable the firewall altogether.
 | 
			
		||||
      # networking.firewall.enable = false;
 | 
			
		||||
 | 
			
		||||
      # This value determines the NixOS release from which the default
 | 
			
		||||
      # settings for stateful data, like file locations and database versions
 | 
			
		||||
      # on your system were taken. It‘s perfectly fine and recommended to leave
 | 
			
		||||
      # this value at the release version of the first install of this system.
 | 
			
		||||
      # Before changing this value read the documentation for this option
 | 
			
		||||
      # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
 | 
			
		||||
      system.stateVersion = "23.11"; # Did you read the comment?
 | 
			
		||||
    })
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,47 +0,0 @@
 | 
			
		|||
# 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,
 | 
			
		||||
  ...
 | 
			
		||||
}: {
 | 
			
		||||
  imports = [
 | 
			
		||||
    (modulesPath + "/profiles/qemu-guest.nix")
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
 | 
			
		||||
  boot.initrd.kernelModules = [];
 | 
			
		||||
  boot.kernelModules = ["kvm-amd"];
 | 
			
		||||
  boot.extraModulePackages = [];
 | 
			
		||||
 | 
			
		||||
  fileSystems."/" = {
 | 
			
		||||
    device = "/dev/disk/by-uuid/1000b969-f089-4b1e-bbef-3d0c39da8a91";
 | 
			
		||||
    fsType = "ext4";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  fileSystems."/boot" = {
 | 
			
		||||
    device = "/dev/disk/by-uuid/AB75-97AD";
 | 
			
		||||
    fsType = "vfat";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  fileSystems."/home/gabe/nix-config-host" = {
 | 
			
		||||
    device = "nix-config-host";
 | 
			
		||||
    fsType = "virtiofs";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  swapDevices = [
 | 
			
		||||
    {device = "/dev/disk/by-uuid/506f2ef4-c9ee-4fe6-8590-95e0821d5903";}
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  # 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
 | 
			
		||||
  # still possible to use this option, but it's recommended to use it in conjunction
 | 
			
		||||
  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
 | 
			
		||||
  networking.useDHCP = lib.mkDefault true;
 | 
			
		||||
  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
 | 
			
		||||
 | 
			
		||||
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -83,7 +83,6 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
      }: {
 | 
			
		||||
        host.details = osConfig.host.details;
 | 
			
		||||
        user = {
 | 
			
		||||
          nvim.enable-lsp = false;
 | 
			
		||||
          git = {
 | 
			
		||||
            profile = {
 | 
			
		||||
              name = config.host.details.fullName;
 | 
			
		||||
| 
						 | 
				
			
			@ -95,7 +94,6 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        imports = [
 | 
			
		||||
          ../../roles/home-manager/terminal.nix
 | 
			
		||||
          ../../configs/home-manager/common.nix
 | 
			
		||||
          inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
        ];
 | 
			
		||||
      };
 | 
			
		||||
      boot = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -69,12 +69,12 @@
 | 
			
		|||
          mountpoint = "/storage";
 | 
			
		||||
        };
 | 
			
		||||
        datasets = {
 | 
			
		||||
          database={
 | 
			
		||||
          database = {
 | 
			
		||||
            type = "zfs_fs";
 | 
			
		||||
            options = {
 | 
			
		||||
              mountpoint ="/postgres";
 | 
			
		||||
              mountpoint = "/postgres";
 | 
			
		||||
              recordsize = "8K";
 | 
			
		||||
              primarycache="metadata";
 | 
			
		||||
              primarycache = "metadata";
 | 
			
		||||
            };
 | 
			
		||||
          };
 | 
			
		||||
          backup = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -79,7 +79,6 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        imports = [
 | 
			
		||||
          ../../roles/home-manager/minimal-terminal.nix
 | 
			
		||||
          ../../configs/home-manager/common.nix
 | 
			
		||||
          inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
        ];
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -46,6 +46,5 @@ inputs.home-manager.lib.homeManagerConfiguration {
 | 
			
		|||
        };
 | 
			
		||||
      };
 | 
			
		||||
    })
 | 
			
		||||
    inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,6 +48,5 @@ inputs.home-manager.lib.homeManagerConfiguration {
 | 
			
		|||
        };
 | 
			
		||||
      };
 | 
			
		||||
    })
 | 
			
		||||
    inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,8 +9,8 @@
 | 
			
		|||
    enable = true;
 | 
			
		||||
    mutableSettings = true;
 | 
			
		||||
    allowDHCP = true;
 | 
			
		||||
    openFirewall=true;
 | 
			
		||||
    port=8080;
 | 
			
		||||
    openFirewall = true;
 | 
			
		||||
    port = 8080;
 | 
			
		||||
  };
 | 
			
		||||
  networking.firewall.allowedUDPPorts=[53 67 546 547];
 | 
			
		||||
  networking.firewall.allowedUDPPorts = [53 67 546 547];
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -86,7 +86,6 @@ inputs.nixpkgs.lib.nixosSystem {
 | 
			
		|||
        imports = [
 | 
			
		||||
          ../../roles/home-manager/minimal-terminal.nix
 | 
			
		||||
          ../../configs/home-manager/common.nix
 | 
			
		||||
          inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
          # ../../configs/home-manager/secrets.nix
 | 
			
		||||
        ];
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -49,6 +49,5 @@ inputs.home-manager.lib.homeManagerConfiguration {
 | 
			
		|||
        };
 | 
			
		||||
      };
 | 
			
		||||
    })
 | 
			
		||||
    inputs.nixvim.homeManagerModules.nixvim
 | 
			
		||||
  ];
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue