diff --git a/configs/nixos/sound.nix b/configs/nixos/sound.nix index dd93011..4378895 100644 --- a/configs/nixos/sound.nix +++ b/configs/nixos/sound.nix @@ -4,6 +4,7 @@ ... }: { # Enable sound with pipewire. + sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/flake.nix b/flake.nix index 74d3e20..4c598f3 100644 --- a/flake.nix +++ b/flake.nix @@ -91,7 +91,6 @@ archlaptop-vm = import ./hosts/archlaptop-vm {inherit inputs configLib;}; workstation-vm = import ./hosts/workstation-vm {inherit inputs configLib;}; gv-wsl = import ./hosts/wsl-workstation.nix {inherit inputs configLib;}; - rockpro = import ./hosts/rockpro64 {inherit inputs configLib;}; }; # Standalone home-manager configuration entrypoint @@ -103,17 +102,6 @@ "gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs configLib;}; }; - deploy = { - nodes = { - rockpro = { - hostname = "rockpro"; - profiles.system.path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.rockpro; - remoteBuild = true; - }; - }; - sshUser = "root"; - }; - packages.x86_64-linux = { proxmox = import ./packages/proxmox.nix {inherit inputs configLib;}; iso = import ./packages/iso.nix {inherit inputs configLib;}; diff --git a/hosts/rockpro64/default.nix b/hosts/rockpro64/default.nix deleted file mode 100644 index 95515ef..0000000 --- a/hosts/rockpro64/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - inputs, - configLib, - ... -}: -inputs.nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - specialArgs = {inherit inputs configLib;}; - modules = [ - inputs.home-manager.nixosModules.home-manager - inputs.disko.nixosModules.disko - ./disk-config.nix - ./hardware-config.nix - ../../configs/nixos/common.nix - ../../configs/nixos/sshd.nix - ../../configs/nixos/secrets.nix - ../../configs/nixos/i3 - ../../configs/nixos/sound.nix - ../../configs/nixos/interactive-networking.nix - ({ - config, - pkgs, - configLib, - ... - }: { - boot.initrd.kernelModules = [ - # PCIe/NVMe - "nvme" - "pcie_rockchip_host" - "rockchip_rga" - "rockchip_saradc" - "rockchip_thermal" - "rockchipdrm" - "phy_rockchip_pcie" - ]; - hardware.enableRedistributableFirmware = true; - host = { - user = "gabe"; - fullName = "Gabe Venberg"; - }; - networking.hostName = "rockpro"; # Define your hostname. - - # home-manager.sharedModules = [ - # inputs.sops-nix.homeManagerModules.sops - # ]; - home-manager.users.${config.host.user} = { - inputs, - osConfig, - lib, - ... - }: { - host = osConfig.host; - user = { - git = { - profile = { - name = config.host.fullName; - email = "gabevenberg@gmail.com"; - }; - workProfile.enable = false; - }; - }; - imports = [ - ../../roles/home-manager/terminal.nix - ../../configs/home-manager/common.nix - inputs.nixvim.homeManagerModules.nixvim - # ../../configs/home-manager/secrets.nix - ]; - - # sops = lib.mkIf (inputs ? nix-secrets) { - # secrets = { - # }; - # }; - }; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = false; - - # 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 = "24.11"; # Did you read the comment? - }) - ]; -} diff --git a/hosts/rockpro64/disk-config.nix b/hosts/rockpro64/disk-config.nix deleted file mode 100644 index 1b9d011..0000000 --- a/hosts/rockpro64/disk-config.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - disko.devices = { - disk = { - emmc = { - device = "/dev/disk/by-id/mmc-A3A442_0x7a73362f"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - type = "EF00"; - size = "512M"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/rockpro64/hardware-config.nix b/hosts/rockpro64/hardware-config.nix deleted file mode 100644 index 0a7cdb6..0000000 --- a/hosts/rockpro64/hardware-config.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - boot.initrd.kernelModules = [ - # PCIe/NVMe - "nvme" - "pcie_rockchip_host" - "phy_rockchip_pcie" - ]; -} diff --git a/packages/aarch64-iso.nix b/packages/aarch64-iso.nix index 812ac7b..28dd63b 100644 --- a/packages/aarch64-iso.nix +++ b/packages/aarch64-iso.nix @@ -46,8 +46,7 @@ users.users.${config.host.user} = { packages = with pkgs; [ - neovim - gptfdisk + firefox ]; }; diff --git a/packages/iso.nix b/packages/iso.nix index 58ba542..02e6003 100644 --- a/packages/iso.nix +++ b/packages/iso.nix @@ -45,7 +45,6 @@ users.users.${config.host.user} = { packages = with pkgs; [ firefox - gptfdisk ]; };