diff --git a/flake.lock b/flake.lock index 64b02d4..c953f5b 100644 --- a/flake.lock +++ b/flake.lock @@ -115,57 +115,6 @@ "type": "github" } }, - "nix-formatter-pack": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs" - ], - "nmd": "nmd", - "nmt": "nmt" - }, - "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", - "type": "github" - }, - "original": { - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "type": "github" - } - }, - "nix-on-droid": { - "inputs": { - "home-manager": [ - "home-manager" - ], - "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-docs": "nixpkgs-docs", - "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", - "nmd": "nmd_2" - }, - "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", - "owner": "nix-community", - "repo": "nix-on-droid", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "nix-on-droid", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1769302137, @@ -218,38 +167,6 @@ "type": "github" } }, - "nixpkgs-docs": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-for-bootstrap": { - "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1770115704, @@ -266,86 +183,15 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1666190571, - "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", - "owner": "rycee", - "repo": "nmd", - "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmd", - "type": "gitlab" - } - }, - "nmd_2": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs-docs" - ], - "scss-reset": "scss-reset" - }, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1648075362, - "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", - "owner": "rycee", - "repo": "nmt", - "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmt", - "type": "gitlab" - } - }, "root": { "inputs": { "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", - "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_2" } - }, - "scss-reset": { - "flake": false, - "locked": { - "lastModified": 1631450058, - "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", - "owner": "andreymatin", - "repo": "scss-reset", - "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", - "type": "github" - }, - "original": { - "owner": "andreymatin", - "repo": "scss-reset", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4b42865..2656ad5 100644 --- a/flake.nix +++ b/flake.nix @@ -12,11 +12,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-24.05"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; @@ -27,7 +22,6 @@ outputs = inputs @ { nixpkgs, nix-darwin, - nix-on-droid, nixos-wsl, ... }: { @@ -64,11 +58,5 @@ ]; }; }; - - nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { - pkgs = import nixpkgs {system = "aarch64-linux";}; - extraSpecialArgs = {inherit inputs;}; - modules = [./hosts/android/configuration.nix]; - }; }; } diff --git a/hosts/android/configuration.nix b/hosts/android/configuration.nix deleted file mode 100644 index b6d2cca..0000000 --- a/hosts/android/configuration.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: { - # Simply install just the packages - environment.packages = with pkgs; [ - # User-facing stuff that you really really want to have - vim # or some other editor, e.g. nano or neovim - git - - openssh - which - nettools - - # Some common stuff that people expect to have - iproute2 - procps - killall - 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 - ''; - - user.shell = "${lib.getExe pkgs.zsh}"; - - terminal.colors = { - background = "#1d2021"; - foreground = "#ebdbb2"; - color0 = "#282828"; - color8 = "#928374"; - color1 = "#cc241d"; - color9 = "#fb4934"; - color2 = "#98971a"; - color10 = "#b8bb26"; - color3 = "#d79921"; - color11 = "#fabd2f"; - color4 = "#458588"; - color12 = "#83a598"; - color5 = "#b16286"; - color13 = "#d3869b"; - color6 = "#689d6a"; - color14 = "#8ec07c"; - color7 = "#a89984"; - color15 = "#ebdbb2h"; - }; - - # Set your time zone - time.timeZone = "America/Toronto"; - - home-manager = { - extraSpecialArgs = {inherit inputs;}; - config = ./home.nix; - backupFileExtension = "hm-bak"; - useGlobalPkgs = true; - useUserPackages = true; - }; -} diff --git a/hosts/android/home.nix b/hosts/android/home.nix deleted file mode 100644 index c144131..0000000 --- a/hosts/android/home.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - # Read the changelog before changing this value - home.stateVersion = "24.05"; - - # insert home-manager config - imports = [ - ../../modules/home-manager/neovim - ../../modules/home-manager/zsh.nix - ../../modules/home-manager/git.nix - ../../modules/home-manager/tmux.nix - ../../modules/home-manager/bitwarden.nix - ../../modules/home-manager/kubernetes.nix - ../../modules/home-manager/email-personal.nix - ../../modules/home-manager/direnv.nix - ../../modules/home-manager/emacs - ]; - - home.sessionVariables = { - ZK_NOTEBOOK_DIR = "\${HOME}/zk"; - }; - - programs = { - zk = { - enable = true; - settings = { - notebook = { - dir = "~/zk"; - }; - }; - }; - }; -} diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index e117dca..46e57f1 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -35,7 +35,6 @@ azure-cli.extensions.containerapp ]) nh - android-tools todo-txt-cli age ];