diff --git a/flake.lock b/flake.lock index 7eb85c0..ae48cbe 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,5 @@ { "nodes": { - "hjem": { - "inputs": { - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], - "smfh": "smfh" - }, - "locked": { - "lastModified": 1767318528, - "narHash": "sha256-I2zxtEafZbFbqXe71rjqwVeTDv8SIVLaSzQd39SwfwM=", - "owner": "feel-co", - "repo": "hjem", - "rev": "8539013044624a257e8da370069107aea148e985", - "type": "github" - }, - "original": { - "owner": "feel-co", - "repo": "hjem", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -42,27 +20,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "hjem", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765065051, - "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", - "owner": "nix-darwin", - "repo": "nix-darwin", - "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", - "type": "github" - }, - "original": { - "owner": "nix-darwin", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1767983141, @@ -97,71 +54,10 @@ }, "root": { "inputs": { - "hjem": "hjem", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs" } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "hjem", - "smfh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763347184, - "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "08895cce80433978d5bfd668efa41c5e24578cbd", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "smfh": { - "inputs": { - "nixpkgs": [ - "hjem", - "nixpkgs" - ], - "rust-overlay": "rust-overlay", - "systems": "systems" - }, - "locked": { - "lastModified": 1763430012, - "narHash": "sha256-06G7pXUdpMnUqR0JWWvV7sA8oNGOZU1cSLqQS1GMf7Y=", - "owner": "feel-co", - "repo": "smfh", - "rev": "eddda76e3dd4c6deaea5f819f174fc16dbe70f90", - "type": "github" - }, - "original": { - "owner": "feel-co", - "repo": "smfh", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ee9256f..7cbdcd6 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,6 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; - hjem.url = "github:feel-co/hjem"; - hjem.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = diff --git a/home.nix b/home.nix index cb0a448..f2d693f 100644 --- a/home.nix +++ b/home.nix @@ -1,5 +1,13 @@ -{ config, pkgs, ... }: +{ + lib, + pkgs, + ... +}: +let + ninjabrain-bot = pkgs.callPackage ./hosts/sandalphon/mcsr/ninjabrain.nix { }; + waywork = pkgs.callPackage ./hosts/sandalphon/mcsr/waywork.nix { }; +in { # Enables nix commands + flakes nix = { @@ -62,5 +70,21 @@ # }; # }; + # mcsr credit to uku: https://git.uku3lig.net/uku/flake/src/branch/main/programs/mcsr + home.file.dea.source = "/home/dea/.config/waywall/init.lua"; + home.file.dea.text = '' + package.path = package.path .. ";${waywork}/?.lua" + local ninb_path = "${lib.getExe ninjabrain-bot}" + local resolution = { w = ${toString 1920}, h = ${toString 1080} } + local images = { + eye_overlay = "${./hosts/sandalphon/mcsr/eye-overlay.png}", + thin = "${./hosts/sandalphon/mcsr/yukata.jpg}", + wide = "${./hosts/sandalphon/mcsr/yukata.jpg}", + tall = "${./hosts/sandalphon/mcsr/yukata.jpg}", + } + -- end globals + '' + + builtins.readFile ./hosts/sandalphon/mcsr/waywall.lua; + programs.home-manager.enable = true; } diff --git a/hosts/sandalphon/games.nix b/hosts/sandalphon/games.nix index bbcc47c..7d65999 100644 --- a/hosts/sandalphon/games.nix +++ b/hosts/sandalphon/games.nix @@ -12,6 +12,7 @@ prismlauncher # minecraft r2modman # osu-lazer-bin + waywall ]; programs = { diff --git a/hosts/sandalphon/mcsr/default.nix b/hosts/sandalphon/mcsr/default.nix index ad60868..6f31cf5 100644 --- a/hosts/sandalphon/mcsr/default.nix +++ b/hosts/sandalphon/mcsr/default.nix @@ -1,46 +1 @@ -# credit to uku: https://git.uku3lig.net/uku/flake/src/branch/main/programs/mcsr -{ - lib, - pkgs, - config, - hjem, - ... -}: - -let - ninjabrain-bot = pkgs.callPackage ./ninjabrain.nix { }; - waywork = pkgs.callPackage ./waywork.nix { }; - cfg = config.programs.waywall; -in -{ - options = { - programs.waywall = { - width = lib.mkOption { - type = lib.types.int; - default = 1920; - }; - - height = lib.mkOption { - type = lib.types.int; - default = 1080; - }; - }; - }; - - config = { - environment.systemPackages = [ pkgs.waywall ]; - hjem.users.dea.files.".config/waywall/init.lua".text = '' - package.path = package.path .. ";${waywork}/?.lua" - local ninb_path = "${lib.getExe ninjabrain-bot}" - local resolution = { w = ${toString cfg.width}, h = ${toString cfg.height} } - local images = { - eye_overlay = "${./eye-overlay.png}", - thin = "${./yukata.jpg}", - wide = "${./yukata.jpg}", - tall = "${./yukata.jpg}", - } - -- end globals - '' - + builtins.readFile ./waywall.lua; - }; -} +{ } \ No newline at end of file