From 2c08f3f50e2f691b2acba1c03442e41a657f84a3 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 25 Aug 2025 15:14:10 -0500 Subject: [PATCH] continue refactor --- flake.lock | 359 ++++++++++++------ flake.nix | 2 - home-manager/programs/ags/default.nix | 39 -- home-manager/programs/ags2/default.nix | 12 - home-manager/programs/default.nix | 1 - home-manager/programs/pywal/default.nix | 4 - .../users/nathan/packages/default.nix | 8 +- .../users/nathan/packages/scripts/default.nix | 28 +- .../users/nathan/programs/pywal/default.nix | 3 - .../configuration/android/default.nix | 17 +- system-config/users/default.nix | 2 + 11 files changed, 286 insertions(+), 189 deletions(-) delete mode 100644 home-manager/programs/ags/default.nix delete mode 100644 home-manager/programs/ags2/default.nix diff --git a/flake.lock b/flake.lock index 4d9820a..831190c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1735346349, - "narHash": "sha256-n/VeEnc6fra2SPgm2ppzwQ52ggYDhpzmBnIBrVD/f+0=", - "owner": "Aylur", - "repo": "ags", - "rev": "237601999d65a4663bcbab934f4f6ce1f579d728", - "type": "github" - }, - "original": { - "owner": "Aylur", - "ref": "v1", - "repo": "ags", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -40,11 +20,11 @@ ] }, "locked": { - "lastModified": 1753216019, - "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", + "lastModified": 1755632680, + "narHash": "sha256-EjaD8+d7AiAV2fGRN4NTMboWDwk8szDfwbzZ8DL1PhQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "be166e11d86ba4186db93e10c54a141058bdce49", + "rev": "50637ed23e962f0db294d6b0ef534f37b144644b", "type": "github" }, "original": { @@ -60,11 +40,11 @@ ] }, "locked": { - "lastModified": 1755519972, - "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=", + "lastModified": 1756115622, + "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", "owner": "nix-community", "repo": "disko", - "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d", + "rev": "bafad29f89e83b2d861b493aa23034ea16595560", "type": "github" }, "original": { @@ -81,11 +61,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1755749020, - "narHash": "sha256-K+CRKb8nxmZdLw6a+jK8AOP4i2CeTW/Wr8gYRelDIFY=", + "lastModified": 1756094605, + "narHash": "sha256-EVEL1nB9n3G5ysABWR1MYB0JX92grZ0eGUU57qIytew=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c6c533e09b519fde3b221d9de64dce6d350f211f", + "rev": "b4df8d436285dda8d83386d1df3f82be5c1a7180", "type": "gitlab" }, "original": { @@ -169,7 +149,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -187,7 +167,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -232,11 +212,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { @@ -246,6 +226,27 @@ "type": "github" } }, + "home-manager-droid": { + "inputs": { + "nixpkgs": [ + "nixpkgs-droid" + ] + }, + "locked": { + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.05", + "repo": "home-manager", + "type": "github" + } + }, "home-manager-us": { "inputs": { "nixpkgs": [ @@ -253,11 +254,11 @@ ] }, "locked": { - "lastModified": 1755739851, - "narHash": "sha256-SC703bnPGOPWSEdZN2J2MkJWQBcUHV4QzuvFPdSVUME=", + "lastModified": 1756022458, + "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c3510e61ca5c15a0f13d73c2232fa2d5478a86c", + "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", "type": "github" }, "original": { @@ -335,17 +336,17 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1755687691, - "narHash": "sha256-o9co4SENS25l3L5RQJ4PY3pCJAs35jjz7K8GU905Chs=", + "lastModified": 1756069181, + "narHash": "sha256-FPur4yuDwzM9uHhPFJW6KD3Xys5fz0xmRmZqFfWQD3Y=", "ref": "refs/heads/main", - "rev": "1ac1ff457ab8ef1ae6a8f2ab17ee7965adfa729f", - "revCount": 6383, + "rev": "0ed880f3f7dc2c746bf3590eee266c010d737558", + "revCount": 6393, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -490,11 +491,11 @@ ] }, "locked": { - "lastModified": 1754481650, - "narHash": "sha256-6u6HdEFJh5gY6VfyMQbhP7zDdVcqOrCDTkbiHJmAtMI=", + "lastModified": 1755416120, + "narHash": "sha256-PosTxeL39YrLvCX5MqqPA6NNWQ4T5ea5K55nmN7ju9Q=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "df6b8820c4a0835d83d0c7c7be86fbc555f1f7fd", + "rev": "e631ea36ddba721eceda69bfee6dd01068416489", "type": "github" }, "original": { @@ -515,11 +516,11 @@ ] }, "locked": { - "lastModified": 1751897909, - "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -558,18 +559,41 @@ "type": "github" } }, + "nix-formatter-pack": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs" + ], + "nmd": "nmd", + "nmt": "nmt" + }, + "locked": { + "lastModified": 1705252799, + "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", + "type": "github" + }, + "original": { + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "type": "github" + } + }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755741527, - "narHash": "sha256-XBP8Ld94EsXi/42MQ6H0If1vCdWPf+N6RA9M+2Wuos0=", + "lastModified": 1756001439, + "narHash": "sha256-IdIgQP6nfHgzn+pRSzm+mHiU0mwbQvOmusv+LrpSBrk=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "a13d8cd9cef44144db3bc7333882916f4454aa91", + "rev": "3a015545c12704bdeca89f3e77cacc68acd3ddb1", "type": "github" }, "original": { @@ -578,13 +602,41 @@ "type": "github" } }, + "nix-on-droid": { + "inputs": { + "home-manager": [ + "home-manager-droid" + ], + "nix-formatter-pack": "nix-formatter-pack", + "nixpkgs": [ + "nixpkgs-droid" + ], + "nixpkgs-docs": "nixpkgs-docs", + "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", + "nmd": "nmd_2" + }, + "locked": { + "lastModified": 1720396533, + "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", + "owner": "nix-community", + "repo": "nix-on-droid", + "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.05", + "repo": "nix-on-droid", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -594,6 +646,54 @@ "type": "github" } }, + "nixpkgs-docs": { + "locked": { + "lastModified": 1705957679, + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-droid": { + "locked": { + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-for-bootstrap": { + "locked": { + "lastModified": 1720244366, + "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1753579242, @@ -626,22 +726,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1748929857, "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", @@ -657,13 +741,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1755593991, - "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "type": "github" }, "original": { @@ -673,7 +757,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1755615617, "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", @@ -689,7 +773,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1755577059, "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=", @@ -708,7 +792,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim_2" }, "locked": { @@ -728,9 +812,9 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nuschtosSearch": "nuschtosSearch", - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1755741137, @@ -746,6 +830,60 @@ "type": "github" } }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1666190571, + "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", + "owner": "rycee", + "repo": "nmd", + "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmd_2": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs-docs" + ], + "scss-reset": "scss-reset" + }, + "locked": { + "lastModified": 1705050560, + "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", + "owner": "~rycee", + "repo": "nmd", + "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", + "type": "sourcehut" + }, + "original": { + "owner": "~rycee", + "repo": "nmd", + "type": "sourcehut" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_2", @@ -780,11 +918,11 @@ ] }, "locked": { - "lastModified": 1754416808, - "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", + "lastModified": 1755446520, + "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", + "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", "type": "github" }, "original": { @@ -795,20 +933,38 @@ }, "root": { "inputs": { - "ags": "ags", "disko": "disko", "firefox-addons": "firefox-addons", "home-manager": "home-manager", + "home-manager-droid": "home-manager-droid", "home-manager-us": "home-manager-us", "hyprland": "hyprland", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_4", + "nix-on-droid": "nix-on-droid", + "nixpkgs": "nixpkgs_3", + "nixpkgs-droid": "nixpkgs-droid", "nixpkgs-us": "nixpkgs-us", "nixvim": "nixvim", "sops-nix": "sops-nix", "themecord": "themecord" } }, + "scss-reset": { + "flake": false, + "locked": { + "lastModified": 1631450058, + "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", + "owner": "andreymatin", + "repo": "scss-reset", + "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", + "type": "github" + }, + "original": { + "owner": "andreymatin", + "repo": "scss-reset", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -846,16 +1002,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -889,21 +1045,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "themecord": { "inputs": { "nixpkgs": [ @@ -952,11 +1093,11 @@ ] }, "locked": { - "lastModified": 1753633878, - "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", + "lastModified": 1755354946, + "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", + "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 44e1740..23ace7d 100644 --- a/flake.nix +++ b/flake.nix @@ -60,8 +60,6 @@ nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"; #nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai"; - ags.url = "github:Aylur/ags/v1"; - themecord = { url = "github:danihek/themecord"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/programs/ags/default.nix b/home-manager/programs/ags/default.nix deleted file mode 100644 index d6dd04d..0000000 --- a/home-manager/programs/ags/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ config, lib, pkgs, inputs, ... }: { - - imports = [ inputs.ags.homeManagerModules.default ]; - - options.homeconfig.ags.enable = lib.options.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf config.homeconfig.ags.enable { - programs.ags = { - enable = true; - - extraPackages = with pkgs; [ - gtksourceview - webkitgtk - accountsservice - ]; - }; - - home.file.".config/ags/launcher.js".text = /*javascript*/ '' - function Launcher() { - return Widget.EventBox({ - class_name: "launcher", - hpack: "center", - child: Widget.Icon({ - icon: '${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake.png', - css: 'font-size: 24px;' - }), - on_primary_click: () => {Utils.execAsync('rofi -show drun')}, - margin_left: 10, - }) - } - - export default Launcher - ''; - - }; -} diff --git a/home-manager/programs/ags2/default.nix b/home-manager/programs/ags2/default.nix deleted file mode 100644 index 019c382..0000000 --- a/home-manager/programs/ags2/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, pkgs, ... }: { - - options.homeconfig.ags2.enable = lib.options.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf config.homeconfig.ags2.enable { - - - }; -} diff --git a/home-manager/programs/default.nix b/home-manager/programs/default.nix index 26fd893..2a80e0e 100644 --- a/home-manager/programs/default.nix +++ b/home-manager/programs/default.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, inputs, ... }: { imports = [ - ./ags ./git ./nh ./hyprland diff --git a/home-manager/programs/pywal/default.nix b/home-manager/programs/pywal/default.nix index 6227aa4..88583a8 100644 --- a/home-manager/programs/pywal/default.nix +++ b/home-manager/programs/pywal/default.nix @@ -8,10 +8,6 @@ config = lib.mkIf config.homeconfig.wal.enable { home.packages = with pkgs; [ - - inputs.themecord.packages.${pkgs.system}.default - vesktop - inputs.nixvim.packages.${pkgs.system}.pywal pywal16 diff --git a/home-manager/users/nathan/packages/default.nix b/home-manager/users/nathan/packages/default.nix index 22dc37b..9c1264e 100644 --- a/home-manager/users/nathan/packages/default.nix +++ b/home-manager/users/nathan/packages/default.nix @@ -3,7 +3,6 @@ pkgs-us = import inputs.nixpkgs-us { inherit system; - config.allowUnfree = true; }; in { @@ -28,8 +27,6 @@ btop zip unzip - gcc - zulu rsync curl wget @@ -44,6 +41,8 @@ cava android-tools neovim-remote + gcc + zulu (python312.withPackages (ps: with ps; [ numpy @@ -74,8 +73,9 @@ #unfree { geogebra spotify - pkgs-us.rustdesk-flutter + discord #} + pkgs-us.rustdesk-flutter pkgs-us.mpv vlc pavucontrol diff --git a/home-manager/users/nathan/packages/scripts/default.nix b/home-manager/users/nathan/packages/scripts/default.nix index 3e899db..34d8c58 100644 --- a/home-manager/users/nathan/packages/scripts/default.nix +++ b/home-manager/users/nathan/packages/scripts/default.nix @@ -16,11 +16,7 @@ echo //////Enter to close////// read '') - (pkgs.writeShellScriptBin "_homeRebuild" '' - ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/Olympus - echo //////Enter to close////// - read - '') + (pkgs.writeShellScriptBin "randWallpaper" '' file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1) @@ -62,8 +58,6 @@ pywalfox update & - themecord > ~/.cache/_.txt && rm ~/.cache/_.txt - [[ $(pidof cava) != "" ]] && pkill -USR1 cava & for i in $(ls /run/user/1000 | grep nvim); do nvr -s --servername /run/user/1000/$i --remote-send 'colorscheme pywal'; done @@ -71,25 +65,35 @@ pkill -USR1 kitty '') - (pkgs.writeShellScriptBin "onSystemStart" '' + (pkgs.writeShellScriptBin "onSystemStart" + (if config.homeconfig.ags.enable then '' ${pkgs.swww}/bin/swww-daemon & - randWallpaper & ags & + '' else if config.homeconfig.hyprpanel.enable then '' + ${pkgs.hyprpanel}/bin/hyprpanel & + '' else '''' + '' + randWallpaper & pypr & lxqt-policykit-agent & - # nmcli device wifi connect EagleNet password '~?C#@ZiH' & hyprctl setcursor Bibata-Modern-Classic 16 & sleep 3 hyprctl reload & #tmux new-session -s hyprland - '') + '')) (pkgs.writeShellScriptBin "colorPrefix" '' exec -a "$0" "$@" & sleep 0.4 && changeColors & '') - ]; + ] ++ (if config.homeconfig.standalone then [ + + (pkgs.writeShellScriptBin "_homeRebuild" '' + ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/Olympus + echo //////Enter to close////// + read + '') + ] else []); }; } diff --git a/home-manager/users/nathan/programs/pywal/default.nix b/home-manager/users/nathan/programs/pywal/default.nix index 6227aa4..04b8880 100644 --- a/home-manager/users/nathan/programs/pywal/default.nix +++ b/home-manager/users/nathan/programs/pywal/default.nix @@ -8,9 +8,6 @@ config = lib.mkIf config.homeconfig.wal.enable { home.packages = with pkgs; [ - - inputs.themecord.packages.${pkgs.system}.default - vesktop inputs.nixvim.packages.${pkgs.system}.pywal diff --git a/system-config/configuration/android/default.nix b/system-config/configuration/android/default.nix index 955a914..03cd490 100644 --- a/system-config/configuration/android/default.nix +++ b/system-config/configuration/android/default.nix @@ -3,17 +3,24 @@ config = { home-manager = { backupFileExtension = ".backup"; + useUserPackages = true; + useGlobalPkgs = true; + sharedModules = [ + inputs.sops-nix.homeManagerModules.sops + inputs.home-manager-config + ]; config = { imports = [ inputs.nathan ]; config = { homeconfig = { - wal.enable = true; - calcurse.enable = true; + graphical = false; + minimal = true; + homeScripts.enable = false; }; - home.homeDirectory = "/data/data/com.termux.nix/files/home"; + home.homeDirectory = config.user.home; }; }; }; @@ -21,9 +28,13 @@ terminal.font = "${pkgs.fira-code}/share/fonts/truetype/FiraCode-VF.ttf"; user = { + userName = "nathan"; + uid = 10472; #update this for your device! shell = "${pkgs.zsh}/bin/zsh"; }; + time.timeZone = "America/Chicago"; + android-integration = {}; system.stateVersion = "24.11"; diff --git a/system-config/users/default.nix b/system-config/users/default.nix index a570661..d009112 100644 --- a/system-config/users/default.nix +++ b/system-config/users/default.nix @@ -81,6 +81,8 @@ home-manager = { backupFileExtension = "backup"; extraSpecialArgs = { inherit inputs; }; + useUserPackages = true; + useGlobalPkgs = true; sharedModules = [ inputs.sops-nix.homeManagerModules.sops inputs.home-manager-config