diff --git a/README.md b/README.md index cb41f51..457b428 100755 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ + :house_with_garden: [home](home) + :computer: [hosts](hosts) - - :full_moon: [tsuki](hosts/tsuki) - - :princess: [hime](hosts/hime) + - :cherry_blossom: [sakura](hosts/sakura) - :white_flower: [sutakku](hosts/sutakku) + - :full_moon: [tsuki](hosts/tsuki) + :electric_plug: [modules](modules) + :package: [pkgs](pkgs) + :lock: [secrets](secrets) diff --git a/home/default.nix b/home/default.nix index 36a87c9..db8be0b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -21,10 +21,6 @@ programs.ssh = { enable = true; extraConfig = '' - Host hime - HostName 192.168.1.66 - User oh - IdentityFile /home/notoh/.ssh/hime Host sutakku HostName 192.168.1.72 User oh diff --git a/hosts/README.md b/hosts/README.md index 8c65c98..ac75154 100644 --- a/hosts/README.md +++ b/hosts/README.md @@ -4,7 +4,6 @@ my different hosts, each with their own unique configurations and purposes. Name | Description --------------- | ----------- -`hime` | portainer vm, hosting a ton of docker services `sakura` | my WIP new main vm `sutakku` | (currently) my *arr stack / seedbox vm `tsuki` | my main machine running hyprland \ No newline at end of file diff --git a/hosts/deploy.nix b/hosts/deploy.nix index efb0688..ec529b2 100644 --- a/hosts/deploy.nix +++ b/hosts/deploy.nix @@ -1,15 +1,5 @@ inputs: { nodes = with inputs.deploy-rs.lib.x86_64-linux; { - hime = { - hostname = "hime"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.hime; - }; - sshUser = "oh"; - sshOpts = ["-t" "-i" "~/.ssh/hime"]; - magicRollback = false; - }; sutakku = { hostname = "sutakku"; profiles.system = { diff --git a/hosts/hime/default.nix b/hosts/hime/default.nix deleted file mode 100644 index 5d589cf..0000000 --- a/hosts/hime/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{pkgs, lib, ...}: { - imports = [ - ./hardware-configuration.nix - ../../modules - ]; - - boot.loader = { - grub = { - enable = true; - configurationLimit = 5; - device = "/dev/sda"; - useOSProber = false; - }; - }; - - networking = { - hostName = "hime"; - }; - - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; - - users = { - defaultUserShell = pkgs.nushell; - users.notoh = lib.mkForce { - isNormalUser = true; - description = "notoh"; - extraGroups = ["networkmanager" "wheel" "docker"]; - }; - }; - - environment.systemPackages = with pkgs; [ - wget - ]; -} diff --git a/hosts/hime/hardware-configuration.nix b/hosts/hime/hardware-configuration.nix deleted file mode 100644 index 48a4632..0000000 --- a/hosts/hime/hardware-configuration.nix +++ /dev/null @@ -1,33 +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 = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/f5a0738c-d027-4ffb-82ec-9901ca6b310b"; - fsType = "ext4"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/f28bad28-ae14-4aa7-85c5-47abe46bae56"; } - ]; - - # 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.ens18.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/hosts/hime/home.nix b/hosts/hime/home.nix deleted file mode 100644 index 287c42a..0000000 --- a/hosts/hime/home.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - imports = [ - ../../home - ]; - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = lib.mkDefault "notoh"; - homeDirectory = lib.mkDefault "/home/notoh"; - stateVersion = "23.05"; - }; -}