Reinitialized repo after massive overhaul

home/flake.nix

@@ -3,11 +3,11 @@
 
   inputs = {
 
-    prgms.url = "../programs";
+    prgms.url = "./programs";
 
-    srvcs.url = "../services";
+    srvcs.url = "./services";
 
-    packages.url = "../packages";
+    packages.url = "./packages";
   };
 
   outputs = { self, ... }@inputs: {

home/packages/external/flake.nix

@@ -1,14 +1,8 @@
 {
-  description = "External Flakes";
+  description = "Nathan user External Flakes";
 
   inputs = {
 
-    lobster.url = "github:justchokingaround/lobster";
-
-    swww.url = "github:LGFae/swww";
-
-    waveforms.url = "github:liff/waveforms-flake";
-
     digital = {
       url = "https://github.com/hneemann/Digital/releases/latest/download/Digital.zip";
       flake = false;
@@ -40,20 +34,9 @@
 
     };
 
-    module = { config, lib, pkgs, ... }: {
-
-      imports = [
-	    inputs.waveforms.nixosModule
-      ];
-
-    };
-
     hmModule = { config, lib, pkgs, ... }: {
 
       home.packages = [
-
-        inputs.lobster.packages.${pkgs.system}.lobster
-	inputs.swww.packages.${pkgs.system}.swww
         packages.${pkgs.system}.digital
       ];
 

home/packages/flake.nix

@@ -26,12 +26,6 @@
 
   in {
 
-    module = { config, lib, pkgs, ... }: {
-      imports = [
-	inputs.external.module
-      ];
-    };
-
     hmModule = { config, lib, pkgs, ... }: {
 
         imports = [ 

home/packages/scripts/flake.nix

@@ -6,8 +6,6 @@
 
   outputs = { self, ... }: {
 
-    module = { config, lib, pkgs, ... }: {};
-
     hmModule = { config, lib, pkgs, ... }: {
       
       home.packages = [
@@ -42,12 +40,9 @@
 	  (pkgs.writeShellScriptBin "setWallpaper" ''
 
 	    img=''$(realpath ''${1:-~/.cache/bg})
-            
-	    if [[ ''${1:-~/.cache/bg} != ~/.cache/bg ]]; then
-	    swww img $img --transition-step 10 --transition-fps 30 --transition-type center && changeColors $img $2
-	    else
+        killall .mpvpaper-wrapp
+        ${pkgs.mpvpaper}/bin/mpvpaper -f -o "loop" '*' $img
 	    changeColors $img $2
-	    fi
 	  '')
 
 	  (pkgs.writeShellScriptBin "changeColors" ''
@@ -89,13 +84,12 @@
 	  '')
 
 	  (pkgs.writeShellScriptBin "onSystemStart" ''
-            ags &
-	    swww-daemon &
+        ags &
 	    pypr &
 	    setWallpaper &
 	    lxqt-policykit-agent &
 	    nmcli device wifi connect EagleNet password '~?C#@ZiH' &
-            hyprctl setcursor Bibata-Modern-Classic 16 &
+        hyprctl setcursor Bibata-Modern-Classic 16 &
 	  '')
 
 	  (pkgs.writeShellScriptBin "colorPrefix" ''

home/programs/ags/flake.nix

@@ -9,14 +9,6 @@
 
   outputs = { self, ... }@inputs: {
 
-    module = { config, lib, pkgs, ... }: {
-      services = {
-        upower.enable = true;
-	gvfs.enable = true;
-	power-profiles-daemon.enable = true;
-      };
-    };
-
     hmModule = { config, lib, pkgs, ... }: {
 
       imports = [ inputs.ags.homeManagerModules.default ];

home/programs/flake.nix

@@ -18,14 +18,6 @@
 
   outputs = { self, ... }@inputs: {
 
-    module = { config, lib, pkgs, ... }: {
-
-      imports = [
-        inputs.hyprland.module
-	inputs.ags.module
-      ];
-    };
-
     hmModule = { config, lib, pkgs, ... }: {
 
       imports = [

home/programs/hyprland/flake.nix

@@ -7,20 +7,6 @@
 
   outputs = { self, ... }@inputs: {
 
-    module = { config, lib, pkgs, ... }: {
-
-      programs.hyprland = {
-        enable = true;
-
-	xwayland.enable = true;
-	
-	package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-
-	portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-      };
-
-    };
-
     hmModule = { config, lib, pkgs, ... }: {
 
       home.sessionVariables.NIX_OZONE_WL = "1";

home/services/flake.nix

@@ -5,18 +5,10 @@
 
     mpdris.url = "./mpdris";
 
-    ollama.url = "./ollama";
-    
   };
 
   outputs = { self, ... }@inputs: {
 
-    module = { config, lib, pkgs, ... }: {
-      imports = [
-        inputs.ollama.module
-      ];
-    };
-
     hmModule = { config, lib, pkgs, ... }: {
 
       imports = [

home/services/mpdris/flake.nix

@@ -7,8 +7,6 @@
 
   outputs = { self, ... }@inputs: {
 
-    module = {}: {};
-
     hmModule = { config, lib, pkgs, ... }: {
 
       imports = [];

packages/external/flake.lock

@@ -1,209 +0,0 @@
-{
-  "nodes": {
-    "digital": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725393562,
-        "narHash": "sha256-xukWBh9LuxlfHcmlScEY49j/M+rhJoEaoWPXT4bWfSM=",
-        "type": "tarball",
-        "url": "https://github.com/hneemann/Digital/releases/latest/download/Digital.zip"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/hneemann/Digital/releases/latest/download/Digital.zip"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "lobster": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1726728133,
-        "narHash": "sha256-6UNJxOcFKZCE20yVdeXi3hhsNdo82o0WdI52bjw/Zx0=",
-        "owner": "justchokingaround",
-        "repo": "lobster",
-        "rev": "3cfac574621d0ffc3c44df053fb8df94b4c2480a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "justchokingaround",
-        "repo": "lobster",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1703961334,
-        "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1727264057,
-        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1724819573,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
-        "path": "/nix/store/mvz96grv31nxq69ldw5a5pn2qh1s6ca6-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "digital": "digital",
-        "lobster": "lobster",
-        "nixpkgs": "nixpkgs_2",
-        "swww": "swww",
-        "waveforms": "waveforms"
-      }
-    },
-    "swww": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs_3",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1726747651,
-        "narHash": "sha256-Yg7c0XUgn82aNftvzSXTKMtZT1gdskun710aO5Dnd9M=",
-        "owner": "LGFae",
-        "repo": "swww",
-        "rev": "ddb0d5dbc83960d0c834d2a4dcb7f541474cb854",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LGFae",
-        "repo": "swww",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "waveforms": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1726518634,
-        "narHash": "sha256-VsEAoGNO21d6irv6TyFd/m75o/+XoHz9ggRp4Nx583Y=",
-        "owner": "liff",
-        "repo": "waveforms-flake",
-        "rev": "eeb5438261394f3d0e35b7e20b511d6b865400c8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "liff",
-        "repo": "waveforms-flake",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

packages/external/result

@@ -1 +0,0 @@
-/nix/store/b7f8lzhzksy3rhhzma1r5iascqahhzzz-digital

system/flake.nix

@@ -4,14 +4,24 @@
   inputs = {
 
     sddm.url = "./sddm";
+
+    services.url = "./services";
+
+    packages.url = "./packages";
+
+    programs.url = "./programs";
+
   };
 
-  outputs = { self, sddm, ... }@inputs: {
+  outputs = { self, ... }@inputs: {
 
-    nixosModule = { config, lib, pkgs, inputs, ... }: {
+    nixosModule = { config, lib, pkgs, core_inputs, ... }: {
       imports = [ 
         ./configuration/configuration.nix
-	sddm.module
+	    inputs.sddm.module
+        inputs.services.module
+        inputs.packages.module
+        inputs.programs.module
       ];
     };
 

system/packages/external/flake.nix

@@ -0,0 +1,21 @@
+{
+  description = "System External Flakes";
+
+  inputs = {
+
+    waveforms.url = "github:liff/waveforms-flake";
+
+  };
+
+  outputs = { self, ... }@inputs: {
+
+    module = { config, lib, pkgs, ... }: {
+
+      imports = [
+	    inputs.waveforms.nixosModule
+      ];
+
+    };
+
+  };
+}

system/packages/flake.nix

@@ -0,0 +1,17 @@
+{
+  description = "System packages";
+
+  inputs = {
+    external.url = "./external";
+  };
+
+  outputs = { self, ... }@inputs: {
+
+    module = { config, lib, pkgs, ... }: {
+      imports = [
+	    inputs.external.module
+      ];
+    };
+
+  };
+}

system/packages/scripts/flake.nix

@@ -0,0 +1,12 @@
+{
+  description = "System scripts";
+
+  inputs = {
+  };
+
+  outputs = { self, ... }: {
+
+    module = { config, lib, pkgs, ... }: {};
+
+  };
+}

system/programs/ags/flake.nix

@@ -0,0 +1,19 @@
+{
+  description = "ags dependancies";
+
+  inputs = {
+
+  };
+
+  outputs = { self, ... }: {
+
+    module = { config, lib, pkgs, ... }: {
+      services = {
+        upower.enable = true;
+	    gvfs.enable = true;
+	    power-profiles-daemon.enable = true;
+      };
+    };
+
+  };
+}

system/programs/flake.nix

@@ -0,0 +1,22 @@
+{
+  description = "System program config";
+
+  inputs = {
+    
+    ags.url = "./ags";
+
+    hyprland.url = "./hyprland";
+  };
+
+  outputs = { self, ... }@inputs: {
+
+    module = { config, lib, pkgs, ... }: {
+
+      imports = [
+        inputs.hyprland.module
+	    inputs.ags.module
+      ];
+    };
+
+  };
+}

system/programs/hyprland/flake.nix

@@ -0,0 +1,25 @@
+{
+  description = "Hyprland Config";
+
+  inputs = {
+    	hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+  };
+
+  outputs = { self, ... }@inputs: {
+
+    module = { config, lib, pkgs, ... }: {
+
+      programs.hyprland = {
+        enable = true;
+
+	    xwayland.enable = true;
+	
+	    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+
+	    portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+      };
+
+    };
+
+  };
+}

system/services/flake.nix

@@ -0,0 +1,19 @@
+{
+  description = "System service config";
+
+  inputs = {
+
+    ollama.url = "./ollama";
+    
+  };
+
+  outputs = { self, ... }@inputs: {
+
+    module = { config, lib, pkgs, ... }: {
+      imports = [
+        inputs.ollama.module
+      ];
+    };
+
+  };
+}