From 4edb4e553517fee9fd9e05a96f32d4807e55b43b Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Wed, 12 Nov 2025 15:20:58 +0530 Subject: [PATCH] chore: remove deoxys VM server from configuration files --- DEVICE_ARCHITECTURE.md | 13 +-- README.md | 8 +- deploy.nix | 60 ++++++-------- flake.nix | 8 -- home/programs/neovim.nix | 5 ++ home/programs/ssh.nix | 5 -- neovim/default.nix | 5 ++ nixos/deoxys/configuration.nix | 127 ------------------------------ nixos/deoxys/deoxys.nix | 41 ---------- nixos/deoxys/services/default.nix | 3 - 10 files changed, 42 insertions(+), 233 deletions(-) delete mode 100644 nixos/deoxys/configuration.nix delete mode 100644 nixos/deoxys/deoxys.nix delete mode 100644 nixos/deoxys/services/default.nix diff --git a/DEVICE_ARCHITECTURE.md b/DEVICE_ARCHITECTURE.md index 982d37d2..66231fcf 100644 --- a/DEVICE_ARCHITECTURE.md +++ b/DEVICE_ARCHITECTURE.md @@ -30,13 +30,6 @@ This document provides a comprehensive overview of all devices managed by this N - Syncthing - And many more services -#### deoxys (VM Server) -- **Architecture**: x86_64-linux -- **User**: servius -- **Role**: Virtual machine server for testing and isolation -- **Configuration**: NixOS + Home Manager -- **Location**: Local network - #### tsuba (Raspberry Pi) - **Architecture**: aarch64-linux - **User**: servius @@ -100,7 +93,7 @@ This document provides a comprehensive overview of all devices managed by this N ### VPN Networks - **Tailscale**: Primary VPN connecting most devices - - Devices: mirai, deoxys, tsuba, deck + - Devices: mirai, tsuba, deck - **ZeroTier**: Secondary network layer - Devices: mirai, ryu @@ -111,7 +104,7 @@ This document provides a comprehensive overview of all devices managed by this N ## Configuration Management ### NixOS Flake -- **Manages**: mirai, deoxys, tsuba, ryu +- **Manages**: mirai, tsuba, ryu - **Features**: Unified configuration across Linux devices - **Inputs**: Multiple flake inputs for extended functionality @@ -147,7 +140,7 @@ This document provides a comprehensive overview of all devices managed by this N Using deploy-rs for automated deployments: ``` -ryu → mirai, deoxys, tsuba, deck +ryu → mirai, tsuba, deck kuro → mirai, shiro ``` diff --git a/README.md b/README.md index b63a8a15..3d05cb34 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ A comprehensive, multi-platform dotfiles repository managing Linux, macOS, and s ## 📊 Architecture Overview -This repository manages **7 devices** across multiple platforms and architectures: +This repository manages **6 devices** across multiple platforms and architectures: -- **3 Servers**: mirai (main), deoxys (VM), tsuba (Raspberry Pi) +- **2 Servers**: mirai (main), tsuba (Raspberry Pi) - **1 Workstation**: ryu (primary desktop) - **3 Portable devices**: kuro (MacBook), SteamDeck, and 1 desktop Mac Mini (shiro) @@ -18,7 +18,6 @@ This repository manages **7 devices** across multiple platforms and architecture | Device | Architecture | Role | Services | |--------|-------------|------|----------| | **mirai** | x86_64-linux | Main Server | Nextcloud, Gitea, Minecraft, Immich, Paperless, +20 more | -| **deoxys** | x86_64-linux | VM Server | Testing & isolation environment | | **tsuba** | aarch64-linux | Raspberry Pi | ARM-based lightweight services | ### Development Environment @@ -61,7 +60,6 @@ nix run home-manager/master -- switch --flake .#deck ### Available Devices - `mirai` - Main server - `ryu` - Primary desktop -- `deoxys` - VM server - `tsuba` - Raspberry Pi - `kuro` - MacBook (fs0c131y) - `shiro` - MacBook (servius) @@ -256,4 +254,4 @@ This repository contains configurations and scripts for personal use. Individual --- -**Infrastructure Status**: 7 devices managed • 20+ services hosted • Multi-platform deployment ready \ No newline at end of file +**Infrastructure Status**: 6 devices managed • 20+ services hosted • Multi-platform deployment ready \ No newline at end of file diff --git a/deploy.nix b/deploy.nix index c8a33789..c9eba144 100644 --- a/deploy.nix +++ b/deploy.nix @@ -28,39 +28,31 @@ user = "root"; }; }; - kuro = { - hostname = "kuro"; - interactiveSudo = true; - profiles.system = { - sshUser = "fs0c131y"; - path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro; - user = "root"; - }; - }; - shiro = { - hostname = "shiro"; - interactiveSudo = true; - profiles.system = { - sshUser = "servius"; - path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro; - user = "root"; - }; - }; - deoxys = { - hostname = "deoxys"; - profiles.system = { - sshUser = "servius"; - path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.deoxys; - user = "root"; - }; - }; - deck = { - hostname = "steamdeck"; - profiles.system = { - sshUser = "deck"; - path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck; - user = "deck"; - }; - }; + # kuro = { + # hostname = "kuro"; + # interactiveSudo = true; + # profiles.system = { + # sshUser = "fs0c131y"; + # path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.kuro; + # user = "root"; + # }; + # }; + # shiro = { + # hostname = "shiro"; + # interactiveSudo = true; + # profiles.system = { + # sshUser = "servius"; + # path = inputs.deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro; + # user = "root"; + # }; + # }; + # deck = { + # hostname = "steamdeck"; + # profiles.system = { + # sshUser = "deck"; + # path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck; + # user = "deck"; + # }; + # }; }; } diff --git a/flake.nix b/flake.nix index 87d4713d..1a2c074e 100644 --- a/flake.nix +++ b/flake.nix @@ -276,14 +276,6 @@ tertiary = "DP-1"; }; }; - deoxys = mkDevice { - name = "deoxys"; - system = "x86_64-linux"; - user = "servius"; - hasGui = false; # It's a vm so no GUI apps are used - isNix = true; - isServer = true; - }; tsuba = mkDevice { name = "tsuba"; system = "aarch64-linux"; diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index 05652967..0dfc220a 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -3,6 +3,11 @@ programs.nixvim = { enable = true; + nixpkgs = { + config = { + allowUnfree = true; + }; + }; } // (import ./../../neovim {inherit pkgs;}); } diff --git a/home/programs/ssh.nix b/home/programs/ssh.nix index 3d57ca40..7931aa3d 100644 --- a/home/programs/ssh.nix +++ b/home/programs/ssh.nix @@ -15,11 +15,6 @@ user = "git"; host = "github.com"; }; - deoxys = { - user = "servius"; - hostname = "deoxys"; - forwardAgent = true; - }; mirai = { user = "fs0c131y"; hostname = "sh.darksailor.dev"; diff --git a/neovim/default.nix b/neovim/default.nix index 04fb1430..6e101332 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -173,6 +173,11 @@ in { trouble.enable = true; ts-context-commentstring.enable = true; which-key.enable = true; + + sidekick = { + enable = true; + }; + conform-nvim = { enable = true; settings = { diff --git a/nixos/deoxys/configuration.nix b/nixos/deoxys/configuration.nix deleted file mode 100644 index e7bc3fd4..00000000 --- a/nixos/deoxys/configuration.nix +++ /dev/null @@ -1,127 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). -{ - pkgs, - lib, - ... -}: { - imports = [ - # Include the results of the hardware scan. - ./deoxys.nix - ./services - ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; - - nix = { - settings = { - auto-optimise-store = true; - extra-experimental-features = "nix-command flakes auto-allocate-uids"; - trusted-users = ["root" "servius" "fs0c131y"]; - }; - extraOptions = '' - build-users-group = nixbld - extra-nix-path = nixpkgs=flake:nixpkgs - builders-use-substitutes = true - ''; - gc = { - automatic = true; - dates = "daily"; - options = "--delete-older-than +5"; - }; - package = pkgs.nixVersions.latest; - buildMachines = []; - distributedBuilds = true; - }; - - networking.hostName = "deoxys"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "Asia/Kolkata"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US"; - LC_IDENTIFICATION = "en_US"; - LC_MEASUREMENT = "en_US"; - LC_MONETARY = "en_US"; - LC_NAME = "en_US"; - LC_NUMERIC = "en_US"; - LC_PAPER = "en_US"; - LC_TELEPHONE = "en_US"; - LC_TIME = "en_US"; - }; - - # Configure keymap in X11 - services.xserver = { - xkb = { - layout = "us"; - variant = ""; - }; - }; - - security.sudo.wheelNeedsPassword = false; - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.servius = { - isNormalUser = true; - description = "servius"; - extraGroups = ["networkmanager" "wheel"]; - packages = with pkgs; []; - openssh.authorizedKeys.keyFiles = [ - ../../secrets/id_ed25519.pub - ../../secrets/id_ios.pub - ]; - }; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - services.tailscale.enable = true; - - # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [22]; - # 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? -} diff --git a/nixos/deoxys/deoxys.nix b/nixos/deoxys/deoxys.nix deleted file mode 100644 index a5d39fc1..00000000 --- a/nixos/deoxys/deoxys.nix +++ /dev/null @@ -1,41 +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 + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/1f72dde1-a713-4e69-a272-39a8324368c2"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/2CFD-2F25"; - fsType = "vfat"; - }; - - swapDevices = []; - - # 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.wlp0s20f3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/deoxys/services/default.nix b/nixos/deoxys/services/default.nix deleted file mode 100644 index d854dccb..00000000 --- a/nixos/deoxys/services/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - imports = []; -}