diff --git a/machines/niczos/default.nix b/machines/niczos/default.nix index 3cc8f49..a0dbe8f 100644 --- a/machines/niczos/default.nix +++ b/machines/niczos/default.nix @@ -18,6 +18,7 @@ in /etc/nixos/modules/tailscale.nix /etc/nixos/modules/backup /etc/nixos/modules/ssh.nix + /etc/nixos/modules/ipfs.nix # machine-specific config ./bootloader.nix diff --git a/machines/niczos/users.nix b/machines/niczos/users.nix index 37265f3..dcd0fdd 100644 --- a/machines/niczos/users.nix +++ b/machines/niczos/users.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: let source = import /etc/nixos/npins; home-manager = source.home-manager; @@ -18,6 +18,7 @@ in "video" "network" "docker" + config.services.kubo.group ]; packages = [ pkgs.home-manager ]; shell = pkgs.bash; diff --git a/modules/ipfs.nix b/modules/ipfs.nix new file mode 100644 index 0000000..887c7fe --- /dev/null +++ b/modules/ipfs.nix @@ -0,0 +1,27 @@ +let + npins = import /etc/nixos/npins/default.nix; + pkgs-unstable = import npins.nixpkgs-unstable { }; +in +{ + warnings = [ + "Ensure you added your primary user to the ipfs group !!!" + ]; + services.kubo = { + autoMount = true; + package = pkgs-unstable.kubo; + enable = true; + settings = { + Addresses.API = "/ip4/127.0.0.1/tcp/5001"; + Discovery.MDNS.Enabled = false; + Plugins.Plugins.telemetry.Config.Mode = "off"; + Plugins.Plugins.telemetry.Disabled = "true"; + Swarm.DisableBandwidthMetrics = "true"; + Datastore.StorageMax = "10G"; + }; + }; + + # Firewall + networking.firewall.interfaces."tailscale0".allowedTCPPorts = [ + 4001 + ]; +} diff --git a/npins/sources.json b/npins/sources.json index 3dc2409..9c1f7fb 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -38,10 +38,31 @@ "url": "https://github.com/xddxdd/nix-cachyos-kernel/archive/c9a4fc582b213bfc8cc9068302c7ad72abc36c7c.tar.gz", "hash": "sha256-k6HoyMr33AtlCxdxEmq15uLbwosj1KNxN/H2DYlFrwg=" }, - "nixpkgs": { - "type": "Tarball", - "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.2462.e8210c649915/nixexprs.tar.xz", - "hash": "sha256-2khLdWQw7Z9psJUEORs8dKPwivbhLbiBTas81jEZtJs=" + "nixpkgs-26.05": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "nixos", + "repo": "nixpkgs" + }, + "branch": "nixos-26.05", + "submodules": false, + "revision": "062346a6d85bc4b49dfaa61c986e9c5be21217d1", + "url": "https://github.com/nixos/nixpkgs/archive/062346a6d85bc4b49dfaa61c986e9c5be21217d1.tar.gz", + "hash": "sha256-BZWCi9ZRJiARTuKTbbtvFTj7t1TK4G3UEckT3HyNfRg=" + }, + "nixpkgs-unstable": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "nixos", + "repo": "nixpkgs" + }, + "branch": "nixos-unstable", + "submodules": false, + "revision": "56c02bc00adcf003215cc4bd996d6efaf4cff188", + "url": "https://github.com/nixos/nixpkgs/archive/56c02bc00adcf003215cc4bd996d6efaf4cff188.tar.gz", + "hash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=" }, "sops-nix": { "type": "Git", diff --git a/pkgs/jailed-packages.nix b/pkgs/jailed-packages.nix index e794112..dafa4ce 100644 --- a/pkgs/jailed-packages.nix +++ b/pkgs/jailed-packages.nix @@ -14,7 +14,7 @@ let ]; }; }; - pkgs = import sources.nixpkgs { + pkgs = import sources."nixpkgs-26.05" { overlays = [ jailOverlay ]; }; in