remove Redis service configuration from JuiceFS package

add JuiceFS custom mount service configuration
update flake.lock files to reflect latest dependencies and revisions
2025-03-19 00:55:04 +01:00 · 2025-03-19 00:53:22 +01:00 · 2025-03-04 11:36:08 +01:00 · 2025-01-28 15:17:15 +01:00
8 changed files with 193 additions and 44 deletions
--- a/config/home-manager/flake.lock
+++ b/config/home-manager/flake.lock
@ -3,11 +3,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@ -21,11 +21,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -37,16 +37,18 @@
    "ghostty": {
      "inputs": {
        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
        "nixpkgs-stable": "nixpkgs-stable",
        "nixpkgs-unstable": "nixpkgs-unstable",
-        "zig": "zig"
+        "zig": "zig",
+        "zig2nix": "zig2nix"
      },
      "locked": {
-        "lastModified": 1736911212,
-        "narHash": "sha256-OLly4X2kN1tDb2gMYcWeim6uJECPoc52ltJsz1iD5Ug=",
+        "lastModified": 1740954062,
+        "narHash": "sha256-VVsSwi1sTVCL0fijNHqw1hv/546acgxxrTAChl/K254=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "ff9414d9ea7b16a375d41cde8f6f193de7e5db72",
+        "rev": "ee8ae196ee0fad3824c7ae9eac947f2128b4ae4f",
        "type": "github"
      },
      "original": {
@ -62,11 +64,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1739757849,
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
        "type": "github"
      },
      "original": {
@ -78,11 +80,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1736867362,
-        "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
+        "lastModified": 1740932899,
+        "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
+        "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
        "type": "github"
      },
      "original": {
@ -94,11 +96,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1733423277,
-        "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=",
+        "lastModified": 1738255539,
+        "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e36963a147267afc055f7cf65225958633e536bf",
+        "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5",
        "type": "github"
      },
      "original": {
@ -110,11 +112,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1733229606,
-        "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
+        "lastModified": 1738136902,
+        "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
+        "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c",
        "type": "github"
      },
      "original": {
@ -126,11 +128,11 @@
    },
    "nixpkgs-unstable_2": {
      "locked": {
-        "lastModified": 1736798957,
-        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
+        "lastModified": 1741010256,
+        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
+        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
        "type": "github"
      },
      "original": {
@ -168,18 +170,21 @@
        "flake-compat": [
          "ghostty"
        ],
-        "flake-utils": "flake-utils",
+        "flake-utils": [
+          "ghostty",
+          "flake-utils"
+        ],
        "nixpkgs": [
          "ghostty",
          "nixpkgs-stable"
        ]
      },
      "locked": {
-        "lastModified": 1717848532,
-        "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
+        "lastModified": 1738239110,
+        "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
+        "rev": "1a8fb6f3a04724519436355564b95fce5e272504",
        "type": "github"
      },
      "original": {
@ -187,6 +192,32 @@
        "repo": "zig-overlay",
        "type": "github"
      }
+    },
+    "zig2nix": {
+      "inputs": {
+        "flake-utils": [
+          "ghostty",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ghostty",
+          "nixpkgs-stable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738263917,
+        "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=",
+        "owner": "jcollie",
+        "repo": "zig2nix",
+        "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jcollie",
+        "ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a",
+        "repo": "zig2nix",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/config/nixos/flake.lock
+++ b/config/nixos/flake.lock
@ -23,11 +23,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1736944949,
-        "narHash": "sha256-rZJtjYBZe5vmanJ/yh5GoZgdISm+EU4iUhG6WD1SwBs=",
+        "lastModified": 1741055622,
+        "narHash": "sha256-z1y6MSfJ9pntwJ7YCkjNyGnqvYMHMnB9kH3v5Z/g9vQ=",
        "owner": "lilyinstarlight",
        "repo": "nixos-cosmic",
-        "rev": "0dc33f0eb391a1a942a358a01b47f763703d7097",
+        "rev": "f3f91440dfd18518445d9ab757cf3e540c7fd6ab",
        "type": "github"
      },
      "original": {
@ -38,11 +38,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1736798957,
-        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
+        "lastModified": 1740828860,
+        "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
+        "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
        "type": "github"
      },
      "original": {
@ -54,11 +54,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1736867362,
-        "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
+        "lastModified": 1740865531,
+        "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
+        "rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
        "type": "github"
      },
      "original": {
@ -70,11 +70,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1736798957,
-        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
+        "lastModified": 1741010256,
+        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
+        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
        "type": "github"
      },
      "original": {
@ -86,11 +86,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1736867362,
-        "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
+        "lastModified": 1740932899,
+        "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
+        "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
        "type": "github"
      },
      "original": {
--- a/config/nixos/packages/server/default.nix
+++ b/config/nixos/packages/server/default.nix
@ -2,5 +2,14 @@
 {
  # Import all the package modules
  imports = [
+    ./juicefs.nix
  ];
+  
+  # Enable JuiceFS
+  services.juicefsCustom = {
+    enable = true;
+    redisUrl = "redis://:your-redis-password@localhost:6379/0";
+    mountPoint = "/mnt/object_storage";
+    cacheDir = "/var/jfsCache";
+  };
 }
--- a/config/nixos/packages/server/juicefs.nix
+++ b/config/nixos/packages/server/juicefs.nix
@ -0,0 +1,97 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.juicefsCustom;
+in {
+  options.services.juicefsCustom = {
+    enable = mkEnableOption "JuiceFS custom mount service";
+    
+    mountPoint = mkOption {
+      type = types.str;
+      default = "/mnt/object_storage";
+      description = "Directory where JuiceFS should mount the filesystem";
+    };
+    
+    cacheDir = mkOption {
+      type = types.str;
+      default = "/var/jfsCache";
+      description = "Directory for JuiceFS cache";
+    };
+    
+    cacheSize = mkOption {
+      type = types.int;
+      default = 204800;
+      description = "Cache size in MiB";
+    };
+    
+    redisUrl = mkOption {
+      type = types.str;
+      default = "redis://:PASSWORD@localhost:6379/0";
+      description = "Redis URL for metadata storage (replace PASSWORD with actual password)";
+    };
+    
+    bufferSize = mkOption {
+      type = types.int;
+      default = 1024;
+      description = "Buffer size in MiB";
+    };
+    
+    prefetch = mkOption {
+      type = types.int;
+      default = 4;
+      description = "Prefetch size";
+    };
+    
+    attrCache = mkOption {
+      type = types.int;
+      default = 3;
+      description = "Attribute cache expiration time in seconds";
+    };
+    
+    entryCache = mkOption {
+      type = types.int;
+      default = 3;
+      description = "Entry cache expiration time in seconds";
+    };
+    
+    openCache = mkOption {
+      type = types.int;
+      default = 3;
+      description = "Open file cache expiration time in seconds";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Install JuiceFS package
+    environment.systemPackages = [ pkgs.juicefs ];
+    
+    # Create the mount and cache directories
+    systemd.tmpfiles.rules = [
+      "d ${cfg.mountPoint} 0755 root root -"
+      "d ${cfg.cacheDir} 0755 root root -"
+    ];
+    
+    # Add the JuiceFS systemd service
+    systemd.services.juicefs = {
+      description = "JuiceFS Mount Service";
+      wantedBy = [ "multi-user.target" ];
+      before = [ "docker.service" ];
+      after = [ "network.target" ];
+      
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.juicefs}/bin/juicefs mount ${cfg.redisUrl} ${cfg.mountPoint} "
+                  + "--cache-dir=${cfg.cacheDir} "
+                  + "--buffer-size=${toString cfg.bufferSize} "
+                  + "--prefetch=${toString cfg.prefetch} "
+                  + "--cache-size=${toString cfg.cacheSize} "
+                  + "--attr-cache=${toString cfg.attrCache} "
+                  + "--entry-cache=${toString cfg.entryCache} "
+                  + "--open-cache=${toString cfg.openCache}";
+        Restart = "on-failure";
+      };
+    };
+  };
+}
--- a/config/ssh/authorized_keys/homeserver-pc
+++ b/config/ssh/authorized_keys/homeserver-pc
@ -3,3 +3,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr

 # Samsung S24U
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost
+
+# Menno's 2025 SSH Key
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE22Hfx8wgkc57TXX1TCMHcNrCdjbfog5QeHFJfl7IeD mennos-2025-sshkey
--- a/config/ssh/authorized_keys/mennos-gamingpc
+++ b/config/ssh/authorized_keys/mennos-gamingpc
@ -3,3 +3,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr

 # Samsung S24U
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost
+
+# Menno's 2025 SSH Key
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE22Hfx8wgkc57TXX1TCMHcNrCdjbfog5QeHFJfl7IeD mennos-2025-sshkey
--- a/config/ssh/authorized_keys/mennos-laptop
+++ b/config/ssh/authorized_keys/mennos-laptop
@ -3,3 +3,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr

 # Samsung S24U
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost
+
+# Menno's 2025 SSH Key
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE22Hfx8wgkc57TXX1TCMHcNrCdjbfog5QeHFJfl7IeD mennos-2025-sshkey
--- a/config/ssh/authorized_keys/mennos-server
+++ b/config/ssh/authorized_keys/mennos-server
@ -3,3 +3,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr

 # Samsung S24U
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSJwfqOZQxGDbM07JziQeBNirvQxhFd6nEwWPjy1zCo u0_a555@localhost
+
+# Menno's 2025 SSH Key
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE22Hfx8wgkc57TXX1TCMHcNrCdjbfog5QeHFJfl7IeD mennos-2025-sshkey
Author	SHA1	Message	Date
Menno van Leeuwen	18913b9120	remove Redis service configuration from JuiceFS package	2025-03-19 00:55:04 +01:00
Menno van Leeuwen	49d0088595	add JuiceFS custom mount service configuration	2025-03-19 00:53:22 +01:00
Menno van Leeuwen	c2adf02a55	update flake.lock files to reflect latest dependencies and revisions	2025-03-04 11:36:08 +01:00
Menno van Leeuwen	60bfa228e6	adds 2025 ssh key pub Signed-off-by: Menno van Leeuwen <menno@mennos-desktop.dory-gorgon.ts.net>	2025-01-28 15:17:15 +01:00