diff --git a/README.md b/README.md index 94f73c6..49c7402 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# nix{os,-darwin,-on-droid} config +# nix{os,-darwin} config It just works™ diff --git a/flake.lock b/flake.lock index 51199ca..c3feae8 100644 --- a/flake.lock +++ b/flake.lock @@ -283,42 +283,6 @@ "type": "github" } }, - "nix-on-droid": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nix-formatter-pack": [ - "nix-formatter-pack" - ], - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-docs": [ - "nixpkgs" - ], - "nixpkgs-for-bootstrap": [ - "nixpkgs" - ], - "nmd": [ - "nmd" - ] - }, - "locked": { - "lastModified": 1709879753, - "narHash": "sha256-zEpy3eweBus/cW/oRMBINps6Bnlazpa7TadonwWibHA=", - "owner": "nix-community", - "repo": "nix-on-droid", - "rev": "7b3cc6e3f9919b2d23003cfafb60c146c3f45793", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "nix-on-droid", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1722114937, @@ -479,7 +443,6 @@ "neovim": "neovim", "nix-darwin": "nix-darwin", "nix-formatter-pack": "nix-formatter-pack", - "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixos-sensible": "nixos-sensible", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 0b0cbbd..fb9d02c 100644 --- a/flake.nix +++ b/flake.nix @@ -56,15 +56,6 @@ nixos-sensible = { url = "github:Guanran928/nixos-sensible"; }; - nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-23.11"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-for-bootstrap.follows = "nixpkgs"; - inputs.nixpkgs-docs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - inputs.nix-formatter-pack.follows = "nix-formatter-pack"; - inputs.nmd.follows = "nmd"; - }; nur = { url = "github:nix-community/NUR"; }; @@ -168,12 +159,6 @@ inherit system modules; specialArgs = {inherit inputs;}; }; - - mkDroid = modules: - inputs.nix-on-droid.lib.nixOnDroidConfiguration { - inherit modules; - extraSpecialArgs = {inherit inputs;}; - }; in { ### imports = []; nixosModules.default = ./nixos/modules; @@ -195,10 +180,6 @@ "whitesteel" = mkDarwin "x86_64-darwin" [./hosts/whitesteel]; }; - nixOnDroidConfigurations = { - "enchilada" = mkDroid [./hosts/enchilada]; - }; - colmena = { meta = { specialArgs = {inherit inputs;}; diff --git a/home/default.nix b/home/default.nix index 5597f50..5f88ba4 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,15 +6,10 @@ ... }: { home = { - # for nix-on-droid - username = lib.mkDefault "guanranwang"; - homeDirectory = - lib.mkDefault - ( - if pkgs.stdenv.hostPlatform.isDarwin - then "/Users/${config.home.username}" - else "/home/${config.home.username}" - ); + username = "guanranwang"; + homeDirectory = if pkgs.stdenv.hostPlatform.isDarwin + then "/Users/${config.home.username}" + else "/home/${config.home.username}"; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage diff --git a/hosts/enchilada/default.nix b/hosts/enchilada/default.nix deleted file mode 100644 index 2da5845..0000000 --- a/hosts/enchilada/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: { - environment.packages = with pkgs; [ - git - openssh - curl - - diffutils - findutils - utillinux - tzdata - hostname - man - gnugrep - gnupg - gnused - gnutar - bzip2 - gzip - xz - zip - unzip - ]; - - # Backup etc files instead of failing to activate generation if a file already exists in /etc - environment.etcBackupExtension = ".bak"; - - # Read the changelog before changing this value - system.stateVersion = "24.05"; - - # Set up nix for flakes - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; - - # Set your time zone - time.timeZone = "Asia/Shanghai"; - - # Set termux font - # NOTE: Use "Mono" variation, or Termux will cut your icons in half - terminal.font = "${pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf"; - - # Set user shell - user.shell = lib.getExe pkgs.fish; - environment.sessionVariables."SHELL" = lib.getExe pkgs.fish; - - # Set up HM - home-manager = { - backupFileExtension = "hmbak"; - useGlobalPkgs = true; - extraSpecialArgs = { - inherit inputs; - osConfig = config; - }; - config = ../../home; - sharedModules = [ - ({...}: { - imports = [ - ../../home/applications/nix - ]; - }) - ]; - }; -}