From d7ae540ebf2f9fbe3cc657015b92d32dcb11168b Mon Sep 17 00:00:00 2001 From: blake Date: Tue, 4 Nov 2025 00:02:26 -0600 Subject: [PATCH] make this dumb unstable and stable shit work --- flake.lock | 6 +++--- hosts/nixos/snowbelle/configuration.nix | 8 ++++---- modules/holocron/copyparty/default.nix | 4 ++-- modules/homelab/tailscale/default.nix | 4 ++-- users/blake/dots/core/default.nix | 13 +++++++++++++ users/blake/home.nix | 10 ++-------- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 823f82a..0a639d4 100644 --- a/flake.lock +++ b/flake.lock @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1762226328, - "narHash": "sha256-N+blVILhS9bfu6OO3ZV40Rj9z5XJPM9AtEzZgidZ5+o=", + "lastModified": 1762228452, + "narHash": "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg=", "owner": "nix-community", "repo": "home-manager", - "rev": "6feb3685114e5807b5effe7806b425b75b1b75c0", + "rev": "aa6936bb637e46a49cf1292486200ba41dd4bcf7", "type": "github" }, "original": { diff --git a/hosts/nixos/snowbelle/configuration.nix b/hosts/nixos/snowbelle/configuration.nix index 426cdf6..607b720 100644 --- a/hosts/nixos/snowbelle/configuration.nix +++ b/hosts/nixos/snowbelle/configuration.nix @@ -16,9 +16,9 @@ in ../../../modules/gameservers/minecraft_recpro ]; - home-manager.users.blake.imports = [ - ../../../users/blake/hosts/snowbelle.nix - ]; +# home-manager.users.blake.imports = [ +# ../../../users/blake/hosts/snowbelle.nix +# ]; system = { ssh.enable = true; @@ -29,7 +29,7 @@ in }; holocron = { syncthing.enable = true; - copyparty.enable = true; + copyparty.enable = false; ensure_perms.enable = false; zfs.enable = true; smb.enable = true; diff --git a/modules/holocron/copyparty/default.nix b/modules/holocron/copyparty/default.nix index 06a3897..7028718 100644 --- a/modules/holocron/copyparty/default.nix +++ b/modules/holocron/copyparty/default.nix @@ -102,7 +102,7 @@ in { flags = { chmod_f = 660; chmod_d = 770; - gid = 700; + gid = "700"; }; }; "/users/blake" = { @@ -113,7 +113,7 @@ in { flags = { chmod_f = 660; chmod_d = 770; - gid = 1000; + gid = "1000"; }; }; }; diff --git a/modules/homelab/tailscale/default.nix b/modules/homelab/tailscale/default.nix index 801bc8f..fe3b40b 100644 --- a/modules/homelab/tailscale/default.nix +++ b/modules/homelab/tailscale/default.nix @@ -4,10 +4,10 @@ lib, ... }: let - cfg = config.system.tailscale; + cfg = config.homelab.tailscale; authkey_file = config.sops.secrets."tailscale_authkey".path; in { - options.system.tailscale = { + options.homelab.tailscale = { enable = lib.mkEnableOption "enables tailscale"; }; diff --git a/users/blake/dots/core/default.nix b/users/blake/dots/core/default.nix index 4212cfe..34939d8 100644 --- a/users/blake/dots/core/default.nix +++ b/users/blake/dots/core/default.nix @@ -14,4 +14,17 @@ ./git ./xdg ]; + + dots = { + btop.enable = lib.mkDefault true; + nvf.enable = lib.mkDefault true; + lf.enable = lib.mkDefault true; + zsh.enable = lib.mkDefault true; + ssh.enable = lib.mkDefault true; + gpg.enable = lib.mkDefault true; + git.enable = lib.mkDefault true; + xdg.enable = lib.mkDefault true; + }; + + } diff --git a/users/blake/home.nix b/users/blake/home.nix index f79b326..aa96aa3 100644 --- a/users/blake/home.nix +++ b/users/blake/home.nix @@ -21,14 +21,8 @@ in { imports = [ inputs.sops-nix.homeManagerModules.sops - ./dots - ./dots/core/nvf - ./dots/core/lf - ./dots/core/zsh - ./dots/core/ssh - ./dots/core/gpg - ./dots/core/git - ./dots/core/xdg + #./dots + ./dots/core ]; # set home manager config based on system type