From 120e6c60ed37eac15121d2f44b1a23f4bfe9d194 Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Thu, 5 Feb 2026 21:55:28 -0600 Subject: [PATCH] push --- .stfolder/syncthing-folder-a0745f.txt | 2 +- .stignore | 2 ++ device.nix | 2 +- flake.lock | 24 ++++++++++++------------ home.nix | 6 +++++- main.nix | 2 +- modules/copyparty.nix | 4 ++-- modules/packages.nix | 2 +- 8 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 .stignore diff --git a/.stfolder/syncthing-folder-a0745f.txt b/.stfolder/syncthing-folder-a0745f.txt index 2f6a7df..b3ae570 100644 --- a/.stfolder/syncthing-folder-a0745f.txt +++ b/.stfolder/syncthing-folder-a0745f.txt @@ -2,4 +2,4 @@ # Do not delete. folderID: nix -created: 2026-01-29T23:06:32-06:00 +created: 2026-01-29T23:05:44-06:00 diff --git a/.stignore b/.stignore new file mode 100644 index 0000000..27f2bde --- /dev/null +++ b/.stignore @@ -0,0 +1,2 @@ +device.nix +hardware-configuration.nix \ No newline at end of file diff --git a/device.nix b/device.nix index 29cb6fb..4a699cd 100644 --- a/device.nix +++ b/device.nix @@ -1 +1 @@ -{ device = "laptop"; } \ No newline at end of file +{ device = "desktop"; } \ No newline at end of file diff --git a/flake.lock b/flake.lock index f1750a7..351ef87 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769832985, - "narHash": "sha256-PKONM6JUGWviRsv3tZWj72HE0aeHKcHTrzTskj58MRM=", + "lastModified": 1770329357, + "narHash": "sha256-Z5bDEg5TwVF+v7LHS6PaKO6+2eekNGc4Y6kvKHSOt6c=", "owner": "LovingMelody", "repo": "nix-citizen", - "rev": "47823c1ea4c53153dabd43f08b26f3c67c557542", + "rev": "f5f929f6b1d8c292e450f217e98e5c0a4fd5557a", "type": "github" }, "original": { @@ -465,11 +465,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -769,11 +769,11 @@ ] }, "locked": { - "lastModified": 1769515380, - "narHash": "sha256-CWWK3PaQ7zhr+Jcf5zyaTR2cfRBXPo09H7+5nWApL8s=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9911802c2822def2eec3d22e2cafd1619ede94a5", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 8766ef4..5effb26 100644 --- a/home.nix +++ b/home.nix @@ -16,9 +16,13 @@ stateVersion = "25.11"; packages = with pkgs; [ + + ] ++ (if device == "server" then [ gh luajit - ]; + nodejs + node2nix + ] else []); file = {}; diff --git a/main.nix b/main.nix index 2838666..a3ef6f4 100644 --- a/main.nix +++ b/main.nix @@ -76,7 +76,7 @@ bash.shellAliases = { fetch = "fastfetch --file ~/nix/nix.ans"; - rebuild = "ns os switch ~/nix"; #"sudo nixos-rebuild switch --impure"; # home-manager switch --impure + rebuild = "nh os switch ~/nix"; #"sudo nixos-rebuild switch --impure"; # home-manager switch --impure #pissh = "ssh -t $(avahi-resolve-host-name -4 pi.home | awk '{print $2}')"; #pi = "pissh \"cd $(pwd) && bash\""; diff --git a/modules/copyparty.nix b/modules/copyparty.nix index db2e466..088c8a8 100644 --- a/modules/copyparty.nix +++ b/modules/copyparty.nix @@ -6,7 +6,7 @@ services.copyparty = { enable = true; - user = "copyparty"; + user = "bug"; group = "copyparty"; @@ -19,7 +19,7 @@ accounts = { bug = { - passwordFile = ""; + passwordFile = "/home/bug/mailserver/bug.passwd"; }; }; diff --git a/modules/packages.nix b/modules/packages.nix index d58cf0e..5d69aae 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -198,7 +198,7 @@ in #}) inputs.nix-citizen.packages.${system}.rsi-launcher - + libxshmfence (appimage-run.override {