diff --git a/.git-age.yaml b/.git-age.yaml index 889843dab438cb1eb2c1ab5652b965b304c23e32..acdb86124b6d79173ccd1fbbcd6fe0156f6d19fe 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -1,4 +1,2 @@ "apps/gui/firefox/work.nix": - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 -"machines/chai/cifs.nix": - - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index bfa108fde3af2a1d40a4dfc0b951e5cc249fe1b2..728e9ab4a34a250b7cdba96741ce5c39ca4d718e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,5 @@ # Age apps/gui/firefox/work.nix filter=git-age diff=git-age -machines/chai/cifs.nix filter=git-age diff=git-age # Git LFS *.png filter=lfs diff=lfs merge=lfs -text diff --git a/flake.nix b/flake.nix index 0c88fc8b1d14b0ce85ef2201cf9f04609f2a0a6d..ae9042390bb318422ccbc91bdb3bfcf74d053ae0 100644 --- a/flake.nix +++ b/flake.nix @@ -90,13 +90,15 @@ tclip = inputs.tclip.packages.${prev.system}.tclip; }) golink.overlay ]; + nixpkgs.follows = "nixpkgs"; nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - file = path; - nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; + nixpkgs.follows = "nixpkgs"; home-manager = { { + ... - nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; + owner = username; + }; + inputs = { url = "github:nix-community/home-manager"; config = { nixpkgs.overlays = overlays; @@ -151,7 +154,6 @@ file = ./secrets/work/pip.conf.age; owner = username; path = "/home/${username}/.config/pip/pip.conf"; }; - cifs = userSecret ./secrets/work/cifs.age; }; }; }) diff --git a/machines/chai/cifs.nix b/machines/chai/cifs.nix deleted file mode 100644 index 194f004730ef6fbc807787b4c893f375f4ddb7fc..0000000000000000000000000000000000000000 Binary files a/machines/chai/cifs.nix and /dev/null differ diff --git a/machines/chai/hardware.nix b/machines/chai/hardware.nix index ea5a40b4f3023e6ca01fa606e7ba59f276b47610..fb41d6f39ffac40a83fbfff9ef4342c29031ad5c 100644 --- a/machines/chai/hardware.nix +++ b/machines/chai/hardware.nix @@ -4,7 +4,7 @@ lib, modulesPath, ... }: { - imports = [(modulesPath + "/installer/scan/not-detected.nix") ./cifs.nix]; + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = []; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 14674265c0570148f8568a13927b8b198adb568d..7028ad23f42b146ed9d5458e120abfdbfde01d38 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -13,6 +13,4 @@ "shared/irc-pw.age".publicKeys = all; "work/netrc.age".publicKeys = [jolheiser chai]; "work/pip.conf.age".publicKeys = [jolheiser chai]; let - dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53 root@dragonwell"; -let diff --git a/secrets/work/cifs.age b/secrets/work/cifs.age deleted file mode 100644 index a6afadbaa0419d2ca4f0064a0e3ddca16bbd31d0..0000000000000000000000000000000000000000 Binary files a/secrets/work/cifs.age and /dev/null differ