diff --git a/flake.nix b/flake.nix index 6b4d8ebe9073a83d5b567efe0e7d26890a900fa2..733b8532980769e1b0724f4e4edac312a3422c16 100644 --- a/flake.nix +++ b/flake.nix @@ -77,38 +77,23 @@ ./machines/common ./machines/chai commonConfig ({pkgs, ...}: { - home-manager.inputs.nixpkgs.follows = "nixpkgs"; { - nixpkgs.overlays = [ - (_: _: { - home-manager.inputs.nixpkgs.follows = "nixpkgs"; inputs = { - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nixpkgs.follows = "nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs = { - }; - agenix.url = "github:ryantm/agenix"; { - netrc = { - file = ./secrets/work/netrc.age; - owner = username; - path = "/home/${username}/.netrc"; - }; - agenix.url = "github:ryantm/agenix"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - file = ./secrets/work/pip.conf.age; - owner = username; - agenix.url = "github:ryantm/agenix"; + nixpkgs.follows = "nixpkgs"; agenix.inputs = { - }; - agenix.url = "github:ryantm/agenix"; + darwin.follows = ""; + firefox.profiles.default.bookmarks = [(import ./apps/firefox/work.nix)]; }; }) ]; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 78ae2ee423b07fc5a3b89a7f35d9632b3665539d..6ac0e02ad5b636359b513be611792240d1d883bd 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -10,7 +10,4 @@ "shared/ssh-config-work.age".publicKeys = all; "shared/spotify-pw.age".publicKeys = all; "shared/irc-pw.age".publicKeys = all; let - jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS nix"; - "work/pip.conf.age".publicKeys = [jolheiser chai]; -let chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM root@chai"; diff --git a/secrets/work/netrc.age b/secrets/work/netrc.age deleted file mode 100644 index 7bf8cb0942d44b170dfaaa8a255675f670f3141e..0000000000000000000000000000000000000000 --- a/secrets/work/netrc.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g BkWGdkvZQHZ0DLnmC4SdTSsGV97RHCNf0I4rZTQHRyk -kNuqhd6nyl3G4TiAEQ1ipfSBqdeg167S7FHZMB1g8Ao --> ssh-ed25519 jo1MPA O+LOCoi56qdnRjpvuCIgSqcMW5qAqZsTS3LG0hKhYGo -0Ckl+Egbu902uwh4H6CdZJmYwC/A/GAW4eQhvuzk1wU --> s#Y#w#OL-grease fx`@|l9 G -NjEM1qmkUfkzASIb6nR7oJZ85ct+UunHmmzhwn/0s9V/vHHG+lk6Jy37O3cIum0 ---- UiE8jly5e1JBtjEM/z/IVoFWneKfl927V0o3vrLBHjY -^_:3ep^X`hsB(G̤& Ǣ:An +ss]r'xP޸CAژ#'T(9n(E8O81#OJuK a`£^p/ \ No newline at end of file diff --git a/secrets/work/pip.conf.age b/secrets/work/pip.conf.age deleted file mode 100644 index 6babee35dcb82f9040aa7a6c71a77d5b23b304d5..0000000000000000000000000000000000000000 Binary files a/secrets/work/pip.conf.age and /dev/null differ