From 180da0e0f90049a33784ba3c017ba273c764da71 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 27 Oct 2023 00:13:44 +0800 Subject: [PATCH] flake: remove iMac-NixOS --- flake.nix | 35 ------------------- .../nixos/imac-2017/machine-1/default.nix | 8 ----- machines/nixos/imac-2017/machine-1/luks.nix | 14 -------- .../nixos/imac-2017/machine-1/partition.nix | 17 --------- 4 files changed, 74 deletions(-) delete mode 100644 machines/nixos/imac-2017/machine-1/default.nix delete mode 100644 machines/nixos/imac-2017/machine-1/luks.nix delete mode 100644 machines/nixos/imac-2017/machine-1/partition.nix diff --git a/flake.nix b/flake.nix index d101502..a8e8a39 100755 --- a/flake.nix +++ b/flake.nix @@ -97,23 +97,6 @@ } ]; }; - - ## Currently un-used. - "iMac-NixOS" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./nixos/presets/desktop.nix - ./users/guanranwang/nixos/presets/desktop.nix - ./machines/nixos/imac-2017 - ./machines/nixos/imac-2017/machine-1 - - { - networking.hostName = "iMac-NixOS"; - time.timeZone = "Asia/Shanghai"; - } - ]; - }; }; @@ -156,24 +139,6 @@ } ]; }; - - "guanranwang@imac-nixos" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { inherit inputs; }; - modules = [ - sops-nix.homeManagerModules.sops - hyprland.homeManagerModules.default - { - wayland.windowManager.hyprland = { - enable = true; - #enableNvidiaPatches = true; - xwayland = { - enable = true; - }; - }; - } - ]; - }; }; }; } diff --git a/machines/nixos/imac-2017/machine-1/default.nix b/machines/nixos/imac-2017/machine-1/default.nix deleted file mode 100644 index 5190f87..0000000 --- a/machines/nixos/imac-2017/machine-1/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - imports = [ - ./partition.nix - ./luks.nix - ]; -} \ No newline at end of file diff --git a/machines/nixos/imac-2017/machine-1/luks.nix b/machines/nixos/imac-2017/machine-1/luks.nix deleted file mode 100644 index 4da95a7..0000000 --- a/machines/nixos/imac-2017/machine-1/luks.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -# I have no idea what are those options -# and I dont use LUKS on my main machine... -# Assuming those are LUKS stuff :P -# -# it just works(tm) -{ - # Setup keyfile - boot.initrd.secrets = { - "/crypto_keyfile.bin" = null; - }; - boot.initrd.luks.devices."luks-998ea901-91c0-4c20-82f4-5dbcce1e1877".device = "/dev/disk/by-uuid/998ea901-91c0-4c20-82f4-5dbcce1e1877"; -} \ No newline at end of file diff --git a/machines/nixos/imac-2017/machine-1/partition.nix b/machines/nixos/imac-2017/machine-1/partition.nix deleted file mode 100644 index eef2716..0000000 --- a/machines/nixos/imac-2017/machine-1/partition.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -{ - fileSystems = { - "/boot" = { - device = "/dev/disk/by-uuid/67E3-17ED"; - fsType = "vfat"; - }; - - "/" = { - device = "/dev/disk/by-uuid/571588f1-dc9c-4804-a89c-995a667e0574"; - fsType = "ext4"; - }; - }; - - swapDevices = [ ]; -} \ No newline at end of file