Merge branch 'tryingFlakeParts'

docker-compose/.gitignore

@@ -1,3 +0,0 @@
-immich.env
-downloadin.env
-matrix.env

flake.lock

@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1775087534,
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -21,6 +39,21 @@
         "type": "github"
       }
     },
+    "import-tree": {
+      "locked": {
+        "lastModified": 1773693634,
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vic",
+        "repo": "import-tree",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1773533765,
@@ -53,9 +86,26 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1774748309,
+        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager",
+        "import-tree": "import-tree",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
       }

flake.nix

@@ -4,6 +4,8 @@
   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";
+    import-tree.url = "github:vic/import-tree";
 
     home-manager = {
       url = "github:nix-community/home-manager/release-23.05";
@@ -11,31 +13,36 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, nixos-hardware, ... }@inputs: {
+  outputs = inputs@{ flake-parts, nixos-hardware, import-tree, nixpkgs, ... }:
-    nixosConfigurations.qmoran-laptop = nixpkgs.lib.nixosSystem {
+    # https://flake.parts/module-arguments.html
-      system = "x86_64-linux";
+    flake-parts.lib.mkFlake { inherit inputs; } (top@{ config, withSystem, moduleWithSystem, ... }: {
-      modules = [
+      imports = [
-        ./nix/qlhc.nix
-        ./nix/common.nix
-        ./nix/user-quin.nix
-        ./nix/gui1.nix
-        ./nix/mega.nix
-        nixos-hardware.nixosModules.framework-11th-gen-intel
       ];
-    };
+      flake = {
-
+        nixosConfigurations.qmoran-laptop = nixpkgs.lib.nixosSystem {
-    nixosConfigurations.qmoran-desktop = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
-      system = "x86_64-linux";
+          modules = [
-      modules = [
+            (import-tree ./modules)
-        ./nix/qdhc.nix
+            nixos-hardware.nixosModules.framework-11th-gen-intel
-        ./nix/common.nix
+            ./nix/qlhc.nix
-        ./nix/user-quin.nix
+          ];
-        ./nix/gui1.nix
+        };
-        ./nix/mega.nix
+        nixosConfigurations.qmoran-desktop = nixpkgs.lib.nixosSystem {
-        ./nix/jf-server.nix
+          system = "x86_64-linux";
+          modules = [
+            (import-tree ./modules)
+            ./nix/qdhc.nix
+            ./nix/jf-server.nix
+          ];
+        };
+      };
+      systems = [
+        "x86_64-linux"
       ];
-    };
+      perSystem = { config, pkgs, ... }: {
-
+      };
-  };
+    });
 }
 
+
+    

nix/README.md

@@ -1,13 +0,0 @@
-# It's NixOS!
-
-Hello MtV and welcome to my crib. These are all the things pertaining to my nixos stuff.
-
-- [./common.nix](./common.nix) is all the common things that hosts will have configured
-  - Services
-  - locale settings
-  - timezone
-- [./gui1](./gui1.nix) all config things for a linux UX experience, KDE Plasma in this instance, but perhaps there could be a gui2 someday...
-- [./qlhc.nix](./qlhc.nix) this stands for quins-laptop-hardware-configuraion. I'll find a better way to do this stuff later.
-- [./user-quin](./user-quin.nix) my personal user account, here for all to see.
-  - packages
-  - groups

rclone.nix

@@ -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" ];
-  #};
-}