diff --git a/.stfolder/syncthing-folder-a0745f.txt b/.stfolder/syncthing-folder-a0745f.txt index b3ae570..2f6a7df 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:05:44-06:00 +created: 2026-01-29T23:06:32-06:00 diff --git a/README.md b/README.md index a61e28a..26afb8e 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,4 @@ all services on `box` are proxied through cloudflared tunnels to `*.bug.tools`. fix matrix server fix invidious instance fix redlib instance -add fish plugins -configure librewolf configure cosmic with home -make portmap system diff --git a/flake.lock b/flake.lock index 87dad03..edf08d7 100644 --- a/flake.lock +++ b/flake.lock @@ -112,15 +112,15 @@ "systems": "systems" }, "locked": { - "lastModified": 1751092982, - "narHash": "sha256-9za67Wu6iPpzhzO9YWtHVaq/bh9wOqGy3j4WlkLsA3Q=", - "owner": "different-name", + "lastModified": 1772639159, + "narHash": "sha256-kMVdp61rzAowZ7ukYq+eam6DMbOSCFXcydKyYjjm7lg=", + "owner": "4DBug", "repo": "catppuccin-userstyles-nix", - "rev": "02fdea4a171f3f1d87d7a436cb54f9b545e15d4b", + "rev": "20756f27c723caeda354950e89cd9dc041a7b1a7", "type": "github" }, "original": { - "owner": "different-name", + "owner": "4DBug", "repo": "catppuccin-userstyles-nix", "type": "github" } @@ -131,11 +131,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1771834427, - "narHash": "sha256-B1j0ahVuxyZtpbFfy34gk2DjacimPIuzyzCPvDhvxI4=", + "lastModified": 1772605780, + "narHash": "sha256-p7IzkFmB1kCtl16+bvLKP1hdP61EFQxj+VSKX2lOWgE=", "owner": "9001", "repo": "copyparty", - "rev": "ab8bd0178b26a0b6c6406f7bae835d13b16ef188", + "rev": "00e821db231d143169236971b50b85b9c9edd298", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "den": { "locked": { - "lastModified": 1771679476, - "narHash": "sha256-rU58QADljRw8/d0ciRtMeaB4/Y/V8JQBlhT1TTvaKmc=", + "lastModified": 1772645664, + "narHash": "sha256-7cf6DEczxIHuUFcfbmbLPznf/R35fyvMjgipO9DUyN0=", "owner": "vic", "repo": "den", - "rev": "61341ee04b80104bdd22a60541fb8c4c3b49d342", + "rev": "21a1d36a234e7dca490edf1f1de5f1a5033a3652", "type": "github" }, "original": { @@ -177,11 +177,11 @@ }, "flake-aspects": { "locked": { - "lastModified": 1771395573, - "narHash": "sha256-bcCOG2CW23/Eww/zULJf1xd0Shz2zS4c2AJWwLALyJ8=", + "lastModified": 1772587379, + "narHash": "sha256-Ftbenlg5Kz8j7dZ2dmsUJJbaYkB35IV41+jyvai0RpE=", "owner": "vic", "repo": "flake-aspects", - "rev": "8297f3bc41ad79b9f01d56d0dd92f7aac51bacfb", + "rev": "b0f62449459f91c050db9cd1f7709d488fcef48d", "type": "github" }, "original": { @@ -206,11 +206,11 @@ }, "flake-file": { "locked": { - "lastModified": 1771017549, - "narHash": "sha256-n68HeYEQJ67hMH2LPI0cERD2pkpNe5dyeOGg11uZ7rc=", + "lastModified": 1772343585, + "narHash": "sha256-7jADySzWscA2822JzNbfRdC+R+B7tzDoWavG8DMY1tU=", "owner": "vic", "repo": "flake-file", - "rev": "9d89918faacdbd2ce26d0aa7298da0fecad8b437", + "rev": "0f5c1039860127fa5673d362d68f8b7df29a44bc", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1771683283, - "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=", + "lastModified": 1772633327, + "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a", + "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc", "type": "github" }, "original": { @@ -371,11 +371,11 @@ }, "import-tree": { "locked": { - "lastModified": 1771045967, - "narHash": "sha256-oYO4poyw0Sb/db2PigqugMlDwsvwLg6CSpFrMUWxA3Q=", + "lastModified": 1772344373, + "narHash": "sha256-OQQ1MhB9t1J71b2wxRRTdH/Qd8UGG0p+dGspfCf5U1c=", "owner": "vic", "repo": "import-tree", - "rev": "c968d3b54d12cf5d9c13f16f7c545a06c9d1fde6", + "rev": "10fda59eee7d7970ec443b925f32a1bc7526648c", "type": "github" }, "original": { @@ -407,11 +407,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1772266502, - "narHash": "sha256-HBO3W1ooO9UwmxwwwFflnbCrAVHhaxpB8YnxFGPvOsY=", + "lastModified": 1772641310, + "narHash": "sha256-Hp3AyU0xX8kiwF5AA8BkziGhQUlUnGUV+P4FAMRG4Kc=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "e805e50f0cc8b9f2d950dc81cd9ee1c986899eaf", + "rev": "02760c85446ac5b457c994b5a2ef3168d9b4dd4f", "type": "github" }, "original": { @@ -438,11 +438,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770617025, - "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", + "lastModified": 1772465433, + "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", + "rev": "c581273b8d5bdf1c6ce7e0a54da9841e6a763913", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1771207753, - "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", + "lastModified": 1772615108, + "narHash": "sha256-lC0KbklwgeSqS+sTkaYpnSYr/HDeVMzYUZqV/dT31Lo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", + "rev": "0c39f3b5a9a234421d4ad43ab9c7cf64840172d0", "type": "github" }, "original": { @@ -565,11 +565,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771626923, - "narHash": "sha256-Mn6oeKrY+Sw6kH0jK+hp5QQH4MTcqwBRQL/ScZDNcz8=", + "lastModified": 1772296853, + "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "owner": "nix-community", "repo": "stylix", - "rev": "b09847414b50c65788936199918272377f70fb91", + "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3b2cbd..cb99363 100644 --- a/flake.nix +++ b/flake.nix @@ -3,19 +3,27 @@ inputs = { den.url = "github:vic/den"; + flake-aspects.url = "github:vic/flake-aspects"; + flake-file.url = "github:vic/flake-file"; + flake-parts = { inputs.nixpkgs-lib.follows = "nixpkgs-lib"; url = "github:hercules-ci/flake-parts"; }; + home-manager = { inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/home-manager"; }; + import-tree.url = "github:vic/import-tree"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs-lib.follows = "nixpkgs"; + systems.url = "github:nix-systems/default"; stylix = { @@ -32,7 +40,7 @@ nixcord.url = "github:FlameFlag/nixcord"; catppuccin-userstyles-nix = { - url = "github:different-name/catppuccin-userstyles-nix"; + url = "github:4DBug/catppuccin-userstyles-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -40,5 +48,7 @@ # nix-gaming.url = "github:fufexan/nix-gaming"; # nix-citizen.inputs.nix-gaming.follows = "nix-gaming"; + + # hytale-launcher.url = "github:JPyke3/hytale-launcher-nix"; }; } diff --git a/modules/core/infra/syncthing.nix b/modules/core/infra/syncthing.nix index 7c8f3d8..1506c2f 100644 --- a/modules/core/infra/syncthing.nix +++ b/modules/core/infra/syncthing.nix @@ -25,6 +25,9 @@ }; folders = { + "Archives" = mkFolder "/home/bug/Archives"; + "Software" = mkFolder "/home/bug/Software"; + "Scripts" = mkFolder "/home/bug/Scripts"; "Documents" = mkFolder "/home/bug/Documents"; "Downloads" = mkFolder "/home/bug/Downloads"; "Pictures" = mkFolder "/home/bug/Pictures"; diff --git a/modules/core/network/crab-hole.nix b/modules/core/network/crab-hole.nix index 9e26dfe..400a7c0 100644 --- a/modules/core/network/crab-hole.nix +++ b/modules/core/network/crab-hole.nix @@ -1 +1,41 @@ -{} \ No newline at end of file +{ + den.aspects.crab-hole = { + nixos = { ... }: { + services.crab-hole = { + enable = true; + + settings = { + blocklist = { + include_subdomains = true; + lists = [ + "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling-porn/hosts" + "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" + ]; + }; + + downstream = [ + { protocol = "udp"; listen = "127.0.0.1"; port = 53; } + { protocol = "udp"; listen = "::1"; port = 53; } + ]; + + upstream = { + name_servers = [ + { + socket_addr = "1.1.1.1:853"; + protocol = "tls"; + tls_dns_name = "1dot1dot1dot1.cloudflare-dns.com"; + trust_nx_responses = false; + } + { + socket_addr = "[2606:4700:4700::1111]:853"; + protocol = "tls"; + tls_dns_name = "1dot1dot1dot1.cloudflare-dns.com"; + trust_nx_responses = false; + } + ]; + }; + }; + }; + }; + }; +} diff --git a/modules/core/network/dns.nix b/modules/core/network/dns.nix index f09da26..0451fad 100644 --- a/modules/core/network/dns.nix +++ b/modules/core/network/dns.nix @@ -1,10 +1,15 @@ { den.aspects.dns = { - nixos = { + nixos = { config, lib, ... }: { networking = { - networkmanager.enable = true; + networkmanager = { + enable = true; + dns = lib.mkIf config.services.crab-hole.enable "none"; + }; - nameservers = [ "1.1.1.1" "1.0.0.1" ]; + nameservers = if config.services.crab-hole.enable + then [ "127.0.0.1" "::1" ] + else [ "1.1.1.1" "1.0.0.1" ]; }; }; }; diff --git a/modules/hosts.nix b/modules/hosts.nix index 0f80671..90cff1b 100644 --- a/modules/hosts.nix +++ b/modules/hosts.nix @@ -3,6 +3,7 @@ let isNormalUser = true; description = "bug"; extraGroups = [ "networkmanager" "wheel" "audio" "video" "libvirtd" "ydotool" "dialout" ]; + classes = [ "homeManager" ]; }; in { den.hosts.x86_64-linux = { diff --git a/modules/hosts/box.nix b/modules/hosts/box.nix index f5bf1a5..6a6e31a 100644 --- a/modules/hosts/box.nix +++ b/modules/hosts/box.nix @@ -9,7 +9,7 @@ searxng copyparty glances - # invidious + invidious mailserver # matrix redlib diff --git a/modules/hosts/common.nix b/modules/hosts/common.nix index 491b715..c8eab2d 100644 --- a/modules/hosts/common.nix +++ b/modules/hosts/common.nix @@ -22,6 +22,8 @@ music social gaming + + crab-hole ]; }; } diff --git a/modules/hosts/defaults.nix b/modules/hosts/defaults.nix index 2479b9c..e84d2e4 100644 --- a/modules/hosts/defaults.nix +++ b/modules/hosts/defaults.nix @@ -1,8 +1,6 @@ { den, ... }: { den.default = { includes = with den.aspects; [ - den.provides.home-manager - boot security locale diff --git a/modules/services/gitea/gitea.nix b/modules/services/gitea/gitea.nix index 355ffb0..d59954c 100644 --- a/modules/services/gitea/gitea.nix +++ b/modules/services/gitea/gitea.nix @@ -1,6 +1,6 @@ { den, ... }: { den.aspects.gitea = { - includes = [ den.aspects.gitea-mirrors ]; + # includes = [ den.aspects.gitea-mirrors ]; nixos = { config, ... }: { den.tunnels = [ "git" ]; @@ -11,11 +11,12 @@ database.type = "mysql"; settings.service = { - DISABLE_REGISTRATION = true; + DISABLE_REGISTRATION = false; }; settings.server.HTTP_PORT = config.den.portmap.git; + /* mirrors = { admin = { user = "admin"; @@ -35,6 +36,7 @@ { owner = "vic"; platform = "github"; } ]; }; + */ }; }; }; diff --git a/modules/services/mailserver.nix b/modules/services/mailserver.nix index 6afedc7..f75e2fd 100644 --- a/modules/services/mailserver.nix +++ b/modules/services/mailserver.nix @@ -4,7 +4,7 @@ imports = [ (fetchTarball { url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/master.tar.gz"; - sha256 = "0rm5f749xakmkqrpkl5ay1pydbnlinr50pvwg1vm795js2infmj5"; + sha256 = "1n5yxya54mdsjmdix0pjzlqbk49jqf0gfhmgqc3lywxifrdi6k0q"; }) ]; diff --git a/modules/services/ports.nix b/modules/services/ports.nix index 24b6813..d5ae0a3 100644 --- a/modules/services/ports.nix +++ b/modules/services/ports.nix @@ -3,7 +3,7 @@ options.den.portmap = lib.mkOption { type = lib.types.attrsOf lib.types.port; default = {}; - description = "ports."; + description = "ports"; }; config.den.portmap = { diff --git a/modules/software/browsers/librewolf.nix b/modules/software/browsers/librewolf.nix index 4f51419..48331ff 100644 --- a/modules/software/browsers/librewolf.nix +++ b/modules/software/browsers/librewolf.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: { +{ inputs, lib, ... }: { den.aspects.librewolf = { homeManager = { pkgs, ... }: { programs.librewolf = { @@ -161,40 +161,43 @@ DisablePocket = true; - # DisableFirefoxAccounts = true; + DisableFirefoxAccounts = false; ExtensionSettings = let - extension = slug: { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/${slug}/latest.xpi"; + mkExtensions = ids: lib.genAttrs ids (id: { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/${id}/latest.xpi"; installation_mode = "force_installed"; private_browsing = true; - }; - in - { + }); + in { "*".installation_mode = "blocked"; + } // (mkExtensions [ + "{cb31ec5d-c49a-4e5a-b240-16c767444f62}" # indie-wiki-buddy - "{1b66b5ad-408f-4300-aac6-55a68b2b24ff}" = extension "catppuccin-mocha-no-borders"; + "{1b66b5ad-408f-4300-aac6-55a68b2b24ff}" # catppuccin-mocha-no-borders - "{bbb880ce-43c9-47ae-b746-c3e0096c5b76}" = extension "catppuccin-web-file-icons"; + "{1b66b5ad-408f-4300-aac6-55a68b2b24ff}" # catppuccin-mocha-no-borders - "{60f82f00-9ad5-4de5-b31c-b16a47c51558}" = extension "cookie-quick-manager"; + "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}" # styl-us - "{88ebde3a-4581-4c6b-8019-2a05a9e3e938}" = extension "hide-youtube-shorts"; + "{60f82f00-9ad5-4de5-b31c-b16a47c51558}" # cookie-quick-manager - "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}" = extension "styl-us"; + "{88ebde3a-4581-4c6b-8019-2a05a9e3e938}" # hide-youtube-shorts - # "firefox@tampermonkey.net" = extension "tampermonkey"; + "firefox@tampermonkey.net" # tampermonkey - "deArrow@ajay.app" = extension "dearrow"; + "deArrow@ajay.app" # dearrow - "sponsorBlocker@ajay.app" = extension "sponsorblock"; + "sponsorBlocker@ajay.app" # sponsorblock - "uBlock0@raymondhill.net" = extension "ublock-origin"; + "uBlock0@raymondhill.net" # ublock-origin - # lesspass - # user agent switcher - # return youtube dislike - }; + "contact@lesspass.com" # lesspass + + "{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}" # user-agent-string-switcher + + "{762f9885-5a13-4abd-9c77-433dcd38b8fd}" # return-youtube-dislikes + ]); }; }; }; diff --git a/modules/software/development/editors.nix b/modules/software/development/editors.nix index 480ecb1..a224179 100644 --- a/modules/software/development/editors.nix +++ b/modules/software/development/editors.nix @@ -3,7 +3,6 @@ nixos = { pkgs, ... }: { users.users.bug.packages = with pkgs; [ zed-editor - vscode arduino-ide ]; }; diff --git a/modules/software/gaming/star-citizen.nix b/modules/software/gaming/star-citizen.nix new file mode 100644 index 0000000..0db3279 --- /dev/null +++ b/modules/software/gaming/star-citizen.nix @@ -0,0 +1,3 @@ +{ + +} diff --git a/modules/software/janitor/janitor.nix b/modules/software/janitor/janitor.nix index 6202e1d..82188d3 100644 --- a/modules/software/janitor/janitor.nix +++ b/modules/software/janitor/janitor.nix @@ -14,7 +14,7 @@ "Videos/Downloads" = [ "mp4" "mkv" "mov" "webm" "avi" "flv" ]; "Music/Downloads" = [ "mp3" "flac" "wav" "ogg" "m4a" "opus" ]; "Documents/Downloads" = [ "pdf" "doc" "docx" "odt" "txt" "md" "epub" "ppt" "pptx" "xls" "xlsx" "csv" ]; - "Archives/Downloads" = [ "iso" "zip" "tar" "gz" "bz2" "xz" "rar" "7z" ]; + "Archives/Downloads" = [ "iso" "zip" "tar" "gz" "bz2" "xz" "rar" "7z" "wsz" ]; "Fonts/Downloads" = [ "ttf" "otf" "woff" "woff2" ]; "3D/Downloads" = [ "blend" "obj" "fbx" "stl" "dae" "3ds" "3mf" ]; "Software/Downloads" = [ "deb" "rpm" "appimage" "jar" "exe" "msi" "flatpak" ]; diff --git a/modules/software/music/.syncthing.music.nix.tmp b/modules/software/music/.syncthing.music.nix.tmp deleted file mode 100644 index 65dcf04..0000000 Binary files a/modules/software/music/.syncthing.music.nix.tmp and /dev/null differ