diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 745ff91..266c2bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,6 @@ jobs: matrix: outputs: [ 'nixosConfigurations.LAPTOP-3DT4F02.config.system.build.toplevel', - 'nixosConfigurations.DESKTOP-3DT4F02.config.system.build.toplevel', 'nixosConfigurations.ISO-3DT4F02.config.system.build.isoImage' ] steps: diff --git a/flake.lock b/flake.lock index cc7d571..68235fe 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -34,24 +18,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -87,28 +53,6 @@ "type": "github" } }, - "nixos-wsl": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733516684, - "narHash": "sha256-yz3mZyTnPlxZW2f51kJyfofDsBeX7WxAPvTXZtr2lW4=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "dd20ebde771edbdececade73dbb8791ff987d0db", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NixOS-WSL", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1733392399, @@ -142,24 +86,8 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7e470a5..e23b76c 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,6 @@ nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; - - nixos-wsl = { - url = "github:nix-community/NixOS-WSL"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix deleted file mode 100644 index cbb8072..0000000 --- a/hosts/desktop/configuration.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - pkgs, - ... -}: -{ - config = { - # Install yt-dlp to save my videos - environment.systemPackages = with pkgs; [ yt-dlp ]; - - # Enable some WSL sanities - wsl = { - enable = true; - nativeSystemd = true; - useWindowsDriver = true; - }; - - # Use nix-ld for the VSCode server - programs.nix-ld.enable = true; - }; -} diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix deleted file mode 100644 index f035b5f..0000000 --- a/hosts/desktop/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ./configuration.nix - ./hardware-configuration.nix - ]; - - config = { - system.stateVersion = "25.05"; - }; -} diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix deleted file mode 100644 index 8dc6bf6..0000000 --- a/hosts/desktop/hardware-configuration.nix +++ /dev/null @@ -1,22 +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 = [ ]; - - boot.initrd.availableKernelModules = [ "virtio_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - # 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..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eth0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/nix/nixosConfigurations/default.nix b/nix/nixosConfigurations/default.nix index 2000a29..921fe1d 100644 --- a/nix/nixosConfigurations/default.nix +++ b/nix/nixosConfigurations/default.nix @@ -6,7 +6,6 @@ let inherit (inputs) nixos-hardware - nixos-wsl ; inherit (self) lib; @@ -21,14 +20,6 @@ in { ../../hosts/laptop ]; } - { - hostName = "DESKTOP-3DT4F02"; - modules = [ - nixos-wsl.nixosModules.default - - ../../hosts/desktop - ]; - } { hostName = "ISO-3DT4F02"; modules = [ diff --git a/users/frontear/nixos/per-host.nix b/users/frontear/nixos/per-host.nix index b8b8df5..f4d31b0 100644 --- a/users/frontear/nixos/per-host.nix +++ b/users/frontear/nixos/per-host.nix @@ -8,9 +8,5 @@ (lib.optionalAttrs (options ? isoImage) { services.displayManager.autoLogin.user = "frontear"; }) - - (lib.optionalAttrs (options ? wsl) { - wsl.defaultUser = "frontear"; - }) ]; }