diff --git a/flake.lock b/flake.lock index 1c41f87..2041716 100644 --- a/flake.lock +++ b/flake.lock @@ -50,17 +50,17 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1771309191, - "narHash": "sha256-Y83E1JrimzUPQ1a7FpOd9dIQFJFucbV4lYPI7ik3Piw=", - "ref": "refs/heads/master", - "rev": "8cf458087edb5f2ff7e3563d4bb6e489c3264d1d", - "revCount": 2, - "type": "git", - "url": "file:///home/thegeneralist/calorie-tracker" + "lastModified": 1771341818, + "narHash": "sha256-rR3AWsRiBBXWm4ZabCaAjqwAGPrXEzPzRnbHnoIAdQw=", + "owner": "thegeneralist01", + "repo": "calorie-tracker", + "rev": "5ef47d51c66a9156ff30cc59472e2d5cd6c87c4b", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/thegeneralist/calorie-tracker" + "owner": "thegeneralist01", + "repo": "calorie-tracker", + "type": "github" } }, "fenix": { @@ -100,6 +100,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -154,6 +170,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ghostty": { "inputs": { "flake-compat": "flake-compat", @@ -177,6 +211,28 @@ "type": "github" } }, + "helium": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772006043, + "narHash": "sha256-TZfnQqC2kvP6eDlDrKjbClijnpCPEcoCiopdy3M3ib4=", + "owner": "AlvaroParker", + "repo": "helium-nix", + "rev": "2bcf84a8e83984e3b7054d29d8890d7ae903c91f", + "type": "github" + }, + "original": { + "owner": "AlvaroParker", + "repo": "helium-nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -350,21 +406,21 @@ }, "readlater-bot": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1771250778, - "narHash": "sha256-lmWwzbuMer8vjGXh37p79dSctaFNjTBW6Cp0T5R+ZiE=", - "ref": "refs/heads/master", - "rev": "181c03915b93d21c5d15a1375d3bc621b2992700", - "revCount": 17, - "type": "git", - "url": "file:///home/thegeneralist/infofeeder-bot" + "lastModified": 1772524468, + "narHash": "sha256-h/NmNoiBVPzxm/yDhl+Z8PaFJeDtPz8Ef7NQeZgn8TE=", + "owner": "thegeneralist01", + "repo": "bookkeeper", + "rev": "e1afcc51485ed9b80211a2c48a3e93ef4d6b35f5", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/thegeneralist/infofeeder-bot" + "owner": "thegeneralist01", + "repo": "bookkeeper", + "type": "github" } }, "root": { @@ -373,6 +429,7 @@ "calorie-tracker": "calorie-tracker", "fenix": "fenix", "ghostty": "ghostty", + "helium": "helium", "home-manager": "home-manager", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", @@ -459,6 +516,21 @@ "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" + } + }, "zig": { "inputs": { "flake-compat": [ diff --git a/flake.nix b/flake.nix index 40029a4..a30bc26 100644 --- a/flake.nix +++ b/flake.nix @@ -42,12 +42,18 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + helium = { + # url = "github:FKouhai/helium2nix/main"; + url = "github:AlvaroParker/helium-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + readlater-bot = { - url = "git+file:///home/thegeneralist/infofeeder-bot"; + url = "github:thegeneralist01/bookkeeper"; }; calorie-tracker = { - url = "git+file:///home/thegeneralist/calorie-tracker"; + url = "github:thegeneralist01/calorie-tracker"; }; }; diff --git a/modules/common/ghostty.nix b/modules/common/ghostty.nix index 69d59f6..afa847a 100644 --- a/modules/common/ghostty.nix +++ b/modules/common/ghostty.nix @@ -12,6 +12,7 @@ settings = { # theme = "tokyonight"; theme = config.theme.ghosttyTheme; + # theme = if config.onLinux then "GruvboxDarkHard" else "Gruvbox Dark Hard"; font-family = "Berkeley Mono"; font-size = 16; diff --git a/modules/common/packages.nix b/modules/common/packages.nix index eedaada..75f0e21 100644 --- a/modules/common/packages.nix +++ b/modules/common/packages.nix @@ -45,6 +45,7 @@ in { yq-go eza fzf + fd gh fastfetch carapace diff --git a/modules/linux/helium.nix b/modules/linux/helium.nix new file mode 100644 index 0000000..388987b --- /dev/null +++ b/modules/linux/helium.nix @@ -0,0 +1,6 @@ +{ inputs, pkgs, ... }: { + environment.systemPackages = [ + # inputs.helium.defaultPackage.${pkgs.system} + inputs.helium.packages.${pkgs.system}.default + ]; +} diff --git a/modules/linux/packages.nix b/modules/linux/packages.nix index c617ba3..0b1f9b9 100644 --- a/modules/linux/packages.nix +++ b/modules/linux/packages.nix @@ -7,7 +7,10 @@ in { pwvucontrol wireplumber playerctl - ntfs3g; + ntfs3g + + obsidian + tor-browser; } ++ (if (!config.isServer) then (attrValues { inherit (pkgs) protonup-qt xsane diff --git a/modules/linux/tor.nix b/modules/linux/tor.nix new file mode 100644 index 0000000..396a0eb --- /dev/null +++ b/modules/linux/tor.nix @@ -0,0 +1,24 @@ +{ + services.tor = { + enable = true; + settings = { + # WE DO NOT WANT GERMAN NODES ANYWHERE IN THE CIRCUIT!!!! + ExcludeExitNodes = "{de}"; + ExcludeNodes = "{de}"; + StrictNodes = 1; + + # optionally also avoid unknown-geoip nodes + GeoIPExcludeUnknown = 1; + + # listen on socks5 port for local apps (like transmission/qbittorrent) + SOCKSPort = "9050"; + }; + }; + services.transmission = { + enable = true; + settings = { + proxy = "socks5://127.0.0.1:9050"; # assuming tor daemon + proxy-auth-enabled = false; + }; + }; +}