Merge pull request #12 from YOUSIKI/2.0

2.0
yousiki · Mar 21, 2024 · 435c584 · 435c584
2 parents 8646e6f + b64f5b5
commit 435c584
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,4 +23,4 @@ jobs:
             name: nichijou
             authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
       - run: nix flake check --all-systems
-      - run: nix build
+      # - run: nix build
diff --git a/cells/nixos/hosts/hakase/hardware-configuration.nix b/cells/nixos/hosts/hakase/hardware-configuration.nix
@@ -7,7 +7,21 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}: let
+  mkCifs = device: {
+    device = device;
+    fsType = "cifs";
+    options = [
+      "noauto"
+      "x-systemd.automount"
+      "x-systemd.idle-timeout=60"
+      "x-systemd.device-timeout=5s"
+      "x-systemd.mount-timeout=5s"
+      "noperm"
+      "credentials=/etc/credentials"
+    ];
+  };
+in {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
@@ -39,6 +53,11 @@
     options = ["noatime"];
   };
 
+  fileSystems."/mnt/nas-yyp-home" = mkCifs "//nas.ybh1998.space/home";
+  fileSystems."/mnt/nas-yyp-share" = mkCifs "//nas.ybh1998.space/share";
+  fileSystems."/mnt/nas-mck-home" = mkCifs "//nas-changping.ybh1998.space/home";
+  fileSystems."/mnt/nas-mck-share" = mkCifs "//nas-changping.ybh1998.space/share";
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction

diff --git a/flake.nix b/flake.nix
@@ -110,6 +110,7 @@
     substituters = [
       # "https://cache.garnix.io?priority=50" # Disable in China
       "https://cache.nixos.org?priority=45"
+      "https://cuda-maintainers.cachix.org?priority=40"
       "https://hyprland.cachix.org?priority=40"
       "https://mirror.sjtu.edu.cn/nix-channels/store?priority=25"
       "https://mirrors.cqupt.edu.cn/nix-channels/store?priority=35"
@@ -124,6 +125,7 @@
     trusted-public-keys = [
       "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       "nichijou.cachix.org-1:rbaTU9nLgVW9BK/HSV41vsag6A7/A/caBpcX+cR/6Ps="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="