From 2e41153c43a8c3c1729b8deccc841d3bad38fcd9 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sun, 1 Jun 2025 16:37:12 -0500
Subject: [PATCH] reverted nixos-anywhere devshell
---
flake.lock | 153 -----------------------
flake.nix | 8 +-
modules/home-manager-modules/openssh.nix | 16 +--
3 files changed, 9 insertions(+), 168 deletions(-)
diff --git a/flake.lock b/flake.lock
index fe1ba7d..fa3ad83 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,28 +20,6 @@
"type": "github"
}
},
- "disko_2": {
- "inputs": {
- "nixpkgs": [
- "nixos-anywhere",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1748225455,
- "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=",
- "owner": "nix-community",
- "repo": "disko",
- "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "master",
- "repo": "disko",
- "type": "github"
- }
- },
"firefox-addons": {
"inputs": {
"nixpkgs": [
@@ -79,27 +57,6 @@
"type": "github"
}
},
- "flake-parts": {
- "inputs": {
- "nixpkgs-lib": [
- "nixos-anywhere",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1743550720,
- "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "c621e8422220273271f52058f618c94e405bb0f5",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -194,27 +151,6 @@
"url": "https://git.jan-leila.com/jan-leila/nix-syncthing"
}
},
- "nix-vm-test": {
- "inputs": {
- "nixpkgs": [
- "nixos-anywhere",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1748765518,
- "narHash": "sha256-vftOR+7zwnMWl5UpG32GL1VBeNGTDZZT0hv+2uNuBGw=",
- "owner": "Mic92",
- "repo": "nix-vm-test",
- "rev": "d6642fbaf42fc98883d84bab66cd0ec720d9dd0c",
- "type": "github"
- },
- "original": {
- "owner": "Mic92",
- "repo": "nix-vm-test",
- "type": "github"
- }
- },
"nix-vscode-extensions": {
"inputs": {
"flake-utils": "flake-utils",
@@ -236,32 +172,6 @@
"type": "github"
}
},
- "nixos-anywhere": {
- "inputs": {
- "disko": "disko_2",
- "flake-parts": "flake-parts",
- "nix-vm-test": "nix-vm-test",
- "nixos-images": "nixos-images",
- "nixos-stable": "nixos-stable",
- "nixpkgs": [
- "nixpkgs"
- ],
- "treefmt-nix": "treefmt-nix"
- },
- "locked": {
- "lastModified": 1748794949,
- "narHash": "sha256-kfqIyYpXMRgmaLOTx+AFd1Kzo+I3mOg9vexUx2qWENA=",
- "owner": "nix-community",
- "repo": "nixos-anywhere",
- "rev": "b7686308b281917d63137373a2eb5c566a973d03",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nixos-anywhere",
- "type": "github"
- }
- },
"nixos-hardware": {
"locked": {
"lastModified": 1747900541,
@@ -278,47 +188,6 @@
"type": "github"
}
},
- "nixos-images": {
- "inputs": {
- "nixos-stable": [
- "nixos-anywhere",
- "nixos-stable"
- ],
- "nixos-unstable": [
- "nixos-anywhere",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1748481078,
- "narHash": "sha256-jwKRF2EDzlv0VBF8pImPFT7DAJma7stDun25utHtwBw=",
- "owner": "nix-community",
- "repo": "nixos-images",
- "rev": "191a461dc38313ff41bd3df4b82e49f74a56560d",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nixos-images",
- "type": "github"
- }
- },
- "nixos-stable": {
- "locked": {
- "lastModified": 1748437600,
- "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-25.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
"lastModified": 1748370509,
@@ -345,7 +214,6 @@
"nix-darwin": "nix-darwin",
"nix-syncthing": "nix-syncthing",
"nix-vscode-extensions": "nix-vscode-extensions",
- "nixos-anywhere": "nixos-anywhere",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"secrets": "secrets",
@@ -402,27 +270,6 @@
"repo": "default",
"type": "github"
}
- },
- "treefmt-nix": {
- "inputs": {
- "nixpkgs": [
- "nixos-anywhere",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1748243702,
- "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=",
- "owner": "numtide",
- "repo": "treefmt-nix",
- "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "treefmt-nix",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index c0a72cf..ac651f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,11 +28,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
- nixos-anywhere = {
- url = "github:nix-community/nixos-anywhere";
- inputs.nixpkgs.follows = "nixpkgs";
- };
-
# disk configurations
disko = {
url = "github:nix-community/disko";
@@ -84,7 +79,6 @@
sops-nix,
nix-syncthing,
home-manager,
- nixos-anywhere,
impermanence,
...
} @ inputs: let
@@ -153,7 +147,7 @@
# for viewing configuration options defined in this repo
nix-inspect
# for installing flakes from this repo onto other systems
- nixos-anywhere.packages.${system}.nixos-anywhere
+ nixos-anywhere
# for updating disko configurations
disko
];
diff --git a/modules/home-manager-modules/openssh.nix b/modules/home-manager-modules/openssh.nix
index 7b646b8..d7a0873 100644
--- a/modules/home-manager-modules/openssh.nix
+++ b/modules/home-manager-modules/openssh.nix
@@ -41,14 +41,14 @@
(
lib.mkIf ((builtins.length config.programs.openssh.hostKeys) != 0) {
services.ssh-agent.enable = true;
- programs.ssh = {
- enable = true;
- compression = true;
- addKeysToAgent = "confirm";
- extraConfig = lib.strings.concatLines (
- builtins.map (hostKey: "IdentityFile ~/.ssh/${hostKey.path}") config.programs.openssh.hostKeys
- );
- };
+ # programs.ssh = {
+ # enable = true;
+ # compression = true;
+ # addKeysToAgent = "confirm";
+ # extraConfig = lib.strings.concatLines (
+ # builtins.map (hostKey: "IdentityFile ~/.ssh/${hostKey.path}") config.programs.openssh.hostKeys
+ # );
+ # };
systemd.user.services = builtins.listToAttrs (
builtins.map (hostKey: