From d29e73e6aaf3016c50517d3fbb0457c491141d88 Mon Sep 17 00:00:00 2001 From: quinm0 Date: Sun, 5 Apr 2026 19:31:46 -0400 Subject: [PATCH] so far nothing work :( --- docker-compose/.gitignore | 3 -- flake.nix | 60 +++++++++++++++++++++++---------------- rclone.nix | 24 ---------------- 3 files changed, 36 insertions(+), 51 deletions(-) delete mode 100644 docker-compose/.gitignore delete mode 100644 rclone.nix diff --git a/docker-compose/.gitignore b/docker-compose/.gitignore deleted file mode 100644 index 579563e..0000000 --- a/docker-compose/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -immich.env -downloadin.env -matrix.env \ No newline at end of file diff --git a/flake.nix b/flake.nix index 19d4181..93b1ce7 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + flake-parts.url = "github:hercules-ci/flake-parts"; home-manager = { url = "github:nix-community/home-manager/release-23.05"; @@ -11,31 +12,42 @@ }; }; - outputs = { self, nixpkgs, home-manager, nixos-hardware, ... }@inputs: { - nixosConfigurations.qmoran-laptop = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./nix/qlhc.nix - ./nix/common.nix - ./nix/user-quin.nix - ./nix/gui1.nix - ./nix/mega.nix - nixos-hardware.nixosModules.framework-11th-gen-intel + outputs = inputs@{ flake-parts, nixos-hardware, lib, ... }: + # https://flake.parts/module-arguments.html + flake-parts.lib.mkFlake { inherit inputs; } (top@{ config, withSystem, moduleWithSystem, ... }: { + imports = [ ]; - }; - - nixosConfigurations.qmoran-desktop = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./nix/qdhc.nix - ./nix/common.nix - ./nix/user-quin.nix - ./nix/gui1.nix - ./nix/mega.nix - ./nix/jf-server.nix + flake = { + nixosConfigurations.qmoran-laptop = lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./nix/qlhc.nix + ./nix/common.nix + ./nix/user-quin.nix + ./nix/gui1.nix + ./nix/mega.nix + nixos-hardware.nixosModules.framework-11th-gen-intel + ]; + }; + nixosConfigurations.qmoran-desktop = lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./nix/qdhc.nix + ./nix/common.nix + ./nix/user-quin.nix + ./nix/gui1.nix + ./nix/mega.nix + ./nix/jf-server.nix + ]; + }; + }; + systems = [ + "x86_64-linux" ]; - }; - - }; + perSystem = { config, pkgs, ... }: { + }; + }); } + + \ No newline at end of file diff --git a/rclone.nix b/rclone.nix deleted file mode 100644 index afa06a8..0000000 --- a/rclone.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, lib, ... }: -let - mountPoint = "/mnt/mega"; - remoteName = "data"; - bucketName = "enc"; - configFile = "/etc/rclone.conf"; -in -{ - environment.systemPackages = with pkgs;[ - rclone - ]; - systemd.mounts = lib.singleton { - where = mountPoint; - what = "${remoteName}:${bucketName}"; - type = "rclone"; - # I think we need to be able to set a timeout here but nix is too new - options = "_netdev,allow-other,vfs-cache-mode=full,vfs-read-chunk-size=512M,vfs-read-chunk-size-limit=1G,vfs-write-back=48h,vfs-cache-max-age=3h,config=${configFile},vvv,daemon-wait=0"; - }; - - #systemd.automounts = lib.singleton { - # where = mountPoint; - # wantedBy = [ "multi-user.target" ]; - #}; -} \ No newline at end of file