Home

dotnix @main - refs - log -
-
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
feat: add cifs Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmVSivIACgkQuFOtpdp7 v3royBAAoi9hFAEDltCK6N0VFoiYD007fTEmydCQulAwOu/WD8gInd7RLRO/aMD5 H5alCdo8WRkZO8v/+iqxcPcot2l2MAF3qyG6K5r8XouGVxf9JsohUcw7+Nurxg9c MLK9nP7DO3g12uie645k0ExNgd1n26L9hKsA+x31vlnutBkDxU/AaQZx+/771Z+K lOdEjhhHzYLtgtp6pNPj+Nqb3vJcf55gsjccCkXoom3FzcIbNHIttKYau08KCRfi /nQTrYbkRlJTpElQMNwL8ZgZuStGwF9mhCcpcfDmqziPED6naPezCqbPbznJpo0y EghEwqbYa8Mba6oTiAMZ706982VB7PAwAR3Tygu+dhwWqqx7wtTmcQ363PeMxVKg SrjHr0ZVDptnsQb+qTsQOJwcTU189zyR2R9xvQSv0vqrElr/T7EfuidHhHpzzFNh dR0z5/o7vYwI8Kk5oIcm0Llb/eoMEhkeGcz94aSzA5a1O9ohEWmLSszwv5DQO2K/ AixRmDeWxtfpIWijupJwinxSEGciL8P49pljxzhg0YsiS7TZjqo2Wi/nQfo+j5wD qip/hvvcJJo7MWpvmKYPzGvoyZrhs8xp1HkutqPuSaNQbVTPL89L3KNlIqLMP4hV ZSUV75YuoTPeIVKPRUcgenEy+ll9bLmfQ03M1nilb0Bz9+XvQJg= =1x78 -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
1 year ago
5 changed files, 12 additions(+), 7 deletions(-)
M .git-age.yaml -> .git-age.yaml
diff --git a/.git-age.yaml b/.git-age.yaml
index acdb86124b6d79173ccd1fbbcd6fe0156f6d19fe..889843dab438cb1eb2c1ab5652b965b304c23e32 100644
--- a/.git-age.yaml
+++ b/.git-age.yaml
@@ -1,2 +1,4 @@
 "apps/gui/firefox/work.nix":
   - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
+"machines/chai/cifs.nix":
+  - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
M .gitattributes -> .gitattributes
diff --git a/.gitattributes b/.gitattributes
index 728e9ab4a34a250b7cdba96741ce5c39ca4d718e..bfa108fde3af2a1d40a4dfc0b951e5cc249fe1b2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 # 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
M flake.nix -> flake.nix
diff --git a/flake.nix b/flake.nix
index ae9042390bb318422ccbc91bdb3bfcf74d053ae0..0c88fc8b1d14b0ce85ef2201cf9f04609f2a0a6d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,16 +90,15 @@         tclip = inputs.tclip.packages.${prev.system}.tclip;
       })
       golink.overlay
     ];
-    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+        nixpkgs.follows = "nixpkgs";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+        nixpkgs.follows = "nixpkgs";
     nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
-    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+        nixpkgs.follows = "nixpkgs";
     home-manager = {
-        owner = username;
+    };
 {
-    home-manager = {
-    in {
+    ...
       config = {
         nixpkgs.overlays = overlays;
         home-manager = {
@@ -154,6 +153,7 @@                     file = ./secrets/work/pip.conf.age;
                     owner = username;
                     path = "/home/${username}/.config/pip/pip.conf";
                   };
+                  cifs = userSecret ./secrets/work/cifs.age;
                 };
               };
             })
I machines/chai/cifs.nix
diff --git a/machines/chai/cifs.nix b/machines/chai/cifs.nix
new file mode 100644
index 0000000000000000000000000000000000000000..194f004730ef6fbc807787b4c893f375f4ddb7fc
Binary files /dev/null and b/machines/chai/cifs.nix differ
M machines/chai/hardware.nix -> machines/chai/hardware.nix
diff --git a/machines/chai/hardware.nix b/machines/chai/hardware.nix
index fb41d6f39ffac40a83fbfff9ef4342c29031ad5c..ea5a40b4f3023e6ca01fa606e7ba59f276b47610 100644
--- a/machines/chai/hardware.nix
+++ b/machines/chai/hardware.nix
@@ -4,7 +4,7 @@   lib,
   modulesPath,
   ...
 }: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  imports = [(modulesPath + "/installer/scan/not-detected.nix") ./cifs.nix];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
   boot.initrd.kernelModules = [];
M secrets/secrets.nix -> secrets/secrets.nix
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 7028ad23f42b146ed9d5458e120abfdbfde01d38..14674265c0570148f8568a13927b8b198adb568d 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -13,4 +13,6 @@   "shared/irc-pw.age".publicKeys = all;
   "work/netrc.age".publicKeys = [jolheiser chai];
   "work/pip.conf.age".publicKeys = [jolheiser chai];
 let
+
+let
   dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53 root@dragonwell";
I secrets/work/cifs.age
diff --git a/secrets/work/cifs.age b/secrets/work/cifs.age
new file mode 100644
index 0000000000000000000000000000000000000000..a6afadbaa0419d2ca4f0064a0e3ddca16bbd31d0
Binary files /dev/null and b/secrets/work/cifs.age differ