-
-
+ 
Screenshot updated: 2023-06-08 @@ -35,15 +34,6 @@ + :package: [pkgs](pkgs) + :lock: [secrets](secrets) -## :spiral_notepad: Features - -+ multi-config repo, with configs for servers, laptop, and desktop -+ multi-system home-manager setup -+ secrets provisioning with [sops-nix](https://github.com/Mic92/sops-nix) -+ multiple fully declarative self hosted services (and some containerized ones, with a docker backend) -+ wayland configs for hyprland and river -+ custom packages not found in nixpkgs - ## :busts_in_silhouette: Credit #### people who've inspired me to dive into nix, and i've stolen stuff from (you guys are awesome!) + [fufexan](https://github.com/fufexan) - a ton of home manager, hyprland stuff, and some gh workflows diff --git a/flake.lock b/flake.lock index c8d0a65..ac83b51 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1695052866, - "narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=", + "lastModified": 1694513707, + "narHash": "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=", "owner": "serokell", "repo": "deploy-rs", - "rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9", + "rev": "31c32fb2959103a796e07bbe47e0a5e287c343a8", "type": "github" }, "original": { @@ -148,24 +148,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1690933134, - "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -224,11 +206,11 @@ ] }, "locked": { - "lastModified": 1695984718, - "narHash": "sha256-LQwKgaaaFOkIcxarf0xQXeDJFwZ5BZWcgmPeo3xp2CM=", + "lastModified": 1694643239, + "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", "owner": "nix-community", "repo": "home-manager", - "rev": "4f02e35f9d150573e1a710afa338846c2f6d850c", + "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", "type": "github" }, "original": { @@ -248,11 +230,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1696034465, - "narHash": "sha256-4/jscEYXk8x1wkjpP6EFnsMpp9h9ITQXaZsg+iVxen4=", + "lastModified": 1694886057, + "narHash": "sha256-dvOrgJmQ5HK3YoWWXR/n6RXMY7ev5a/z7dQEv4uAyZQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c298439433f9b6861c7c62ea587289ac2e4ef2f8", + "rev": "2f01a18989f03db6f7aedd5e9ce87326f6f3be78", "type": "github" }, "original": { @@ -296,11 +278,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1695668783, - "narHash": "sha256-pXVei5KZMxALQ8ibx0oqbfh5N/FI3VzJHodDNAh41xE=", + "lastModified": 1694901460, + "narHash": "sha256-+CdSjA7Oo2XjErq3yP9biUPS0z/6zqLY9rh3GhRcwdo=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "0c0163cfa1a8c0286edf231507026dd6f5798644", + "rev": "87ee5ee50f7717c7941e6455fb7dbee176a9f273", "type": "github" }, "original": { @@ -309,26 +291,6 @@ "type": "github" } }, - "matugen": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695891200, - "narHash": "sha256-E9GbsKXRWRi47oDbO4Yj0Ydkyav923itbT15to+ExkY=", - "owner": "InioX", - "repo": "Matugen", - "rev": "10a8a9069bd2afdb00ba3c6445e01292e25bc890", - "type": "github" - }, - "original": { - "owner": "InioX", - "repo": "Matugen", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": "nixpkgs" @@ -347,63 +309,6 @@ "type": "github" } }, - "nh": { - "inputs": { - "flake-parts": "flake-parts", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694971480, - "narHash": "sha256-5UKSMDiboMIs15WN6jbctJgYfnGPfkHhvWWaboB2rGk=", - "owner": "viperML", - "repo": "nh", - "rev": "4b88da6fc89bf06d6598ce9a881590a7cc0dcafd", - "type": "github" - }, - "original": { - "owner": "viperML", - "repo": "nh", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1687178632, - "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695526222, - "narHash": "sha256-/NwZz3QcVplrfiDKk1thYg1EIHLSNucVHNUi2uwO3RI=", - "owner": "Mic92", - "repo": "nix-index-database", - "rev": "25d6369c232bbea1ec1f90226fd17982e7a0a647", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-index-database", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1693355128, @@ -418,24 +323,6 @@ "type": "indirect" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1690881714, - "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9e1960bc196baf6881340d53dccb203a951745a2", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1685004253, @@ -454,11 +341,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1694908564, - "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=", + "lastModified": 1693675694, + "narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "596611941a74be176b98aeba9328aa9d01b8b322", + "rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d", "type": "github" }, "original": { @@ -470,11 +357,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1694767346, + "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" }, "original": { @@ -491,9 +378,6 @@ "home-manager": "home-manager", "hyprland": "hyprland", "ironbar": "ironbar", - "matugen": "matugen", - "nh": "nh", - "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix" } @@ -582,11 +466,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1695284550, - "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", + "lastModified": 1694495315, + "narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", + "rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415", "type": "github" }, "original": { @@ -659,18 +543,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1695919988, - "narHash": "sha256-4RBgIZHaVqH0m1POnfzYRzwCWxifIKH4xQ0kCn2LGkA=", + "lastModified": 1694302348, + "narHash": "sha256-S9NOc88L/1jpNKJqBu2Hihvn0V1HHCK2hXE4bNBAStg=", "owner": "wlroots", "repo": "wlroots", - "rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e", + "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e", + "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", "type": "gitlab" } }, diff --git a/flake.nix b/flake.nix index 8f4946a..4ae2e8f 100755 --- a/flake.nix +++ b/flake.nix @@ -29,18 +29,6 @@ url = "github:zhaofengli/attic"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-index-database = { - url = "github:Mic92/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nh = { - url = "github:viperML/nh"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - matugen = { - url = "github:/InioX/Matugen"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = {nixpkgs, ...} @ inputs: let system = "x86_64-linux"; diff --git a/home/default.nix b/home/default.nix index e5a26eb..cb4b8c5 100644 --- a/home/default.nix +++ b/home/default.nix @@ -16,7 +16,6 @@ croc eza eva - fd du-dust bottom gnupg @@ -62,9 +61,9 @@ Hostname 100.115.234.69 User root Host basegbot - HostName 100.83.81.116 - User basegbot - IdentityFile ~/.ssh/basegbot + HostName 100.94.41.43 + User notoh + IdentityFile ~/.ssh/basegot ''; }; diff --git a/home/gtk/default.nix b/home/gtk/default.nix index 1662804..2b8f301 100644 --- a/home/gtk/default.nix +++ b/home/gtk/default.nix @@ -14,7 +14,7 @@ package = pkgs.jost; }; theme = { - name = "Catppuccin-Mocha-Standard-Pink-Dark"; + name = "Catppuccin-Mocha-Standard-Pink-dark"; package = pkgs.catppuccin-gtk.override { accents = ["pink"]; size = "standard"; diff --git a/home/librewolf/default.nix b/home/librewolf/default.nix new file mode 100644 index 0000000..4f61d66 --- /dev/null +++ b/home/librewolf/default.nix @@ -0,0 +1,41 @@ +_: { + programs.librewolf = { + enable = false; + settings = { + "webgl.disabled" = false; + "webgl.force-enabled" = true; + "webgl.enable-webgl2" = true; + "privacy.resistFingerprinting" = false; + "browser.warnOnQuitShortcut" = false; + "identity.fxaccounts.enabled" = false; + "browser.sessionstore.resume_from_crash" = true; + "privacy.resistFingerprinting.letterboxing" = false; + "privacy.clearOnShutdown.history" = false; + "privacy.clearOnShutdown.downloads" = true; + "privacy.clearOnShutdown.cookies" = false; + "security.OCSP.require" = false; + "browser.toolbars.bookmarks.visibility" = "always"; + "browser.startup.homepage" = "http://dashboard.lab/"; + }; + }; + + # enable librewolf as the default browser, with some extra config + xdg.mimeApps = { + enable = true; + defaultApplications = { + "x-scheme-handler/discord-409416265891971072" = ["discord-409416265891971072.desktop"]; + "x-scheme-handler/discord-402572971681644545" = ["discord-402572971681644545.desktop"]; + "x-scheme-handler/discord-696343075731144724" = ["discord-696343075731144724.desktop"]; + "x-scheme-handler/http" = ["brave.desktop"]; + "x-scheme-handler/https" = ["brave.desktop"]; + "x-scheme-handler/chrome" = ["brave.desktop"]; + "text/html" = ["brave.desktop"]; + "application/x-extension-htm" = ["brave.desktop"]; + "application/x-extension-html" = ["brave.desktop"]; + "application/x-extension-shtml" = ["brave.desktop"]; + "application/xhtml+xml" = ["brave.desktop"]; + "application/x-extension-xhtml" = ["brave.desktop"]; + "application/x-extension-xht" = ["brave.desktop"]; + }; + }; +} diff --git a/home/neofetch/config.conf b/home/neofetch/config.conf index d89d627..644bfa4 100644 --- a/home/neofetch/config.conf +++ b/home/neofetch/config.conf @@ -12,11 +12,11 @@ print_info() { info "${c5} ├─ Kernel " kernel info "${c5} ├─ Pkgs " packages info "${c5} ├─ Compositor " de - info "${c5} ├─ CPU " cpu - info "${c5} ├─ GPU " gpu + info "${c5} ├─ CPU " cpu + info "${c5} ├─ GPU " gpu info "${c5} ├─ Term " term info "${c5} ├─ SH " shell - info "${c5} └─ Up time " uptime + info "${c5} └─ Up time " uptime prin "$(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8)" } diff --git a/home/nushell/config.nu b/home/nushell/config.nu index d42a653..c3a3b9b 100755 --- a/home/nushell/config.nu +++ b/home/nushell/config.nu @@ -14,8 +14,6 @@ alias cat = bat alias rm = rm -i alias cp = cp -i alias mv = mv -i -alias rebuild = nh os switch . --nom -alias clean = sudo nh clean all alias sakura = nix run github:serokell/deploy-rs ".#sakura" alias kariru = nix run github:serokell/deploy-rs ".#kariru" alias yuki = nix run github:serokell/deploy-rs ".#yuki" diff --git a/home/wayland/hyprland/config.nix b/home/wayland/hyprland/config.nix index 1f51c03..a210c0b 100644 --- a/home/wayland/hyprland/config.nix +++ b/home/wayland/hyprland/config.nix @@ -8,6 +8,10 @@ _: { input { kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = follow_mouse = 1 @@ -16,8 +20,8 @@ _: { } general { - gaps_in = 10 - gaps_out = 20 + gaps_in = 6 + gaps_out = 15 border_size = 4 col.active_border = rgb(f5c2e7) col.inactive_border = rgb(6c7086) @@ -26,13 +30,16 @@ _: { } decoration { - rounding = 12 + rounding = 8 blur { enabled = true - size = 6 + size = 5 passes = 3 new_optimizations = true } + + multisample_edges = true + inactive_opacity = 1.0 active_opacity = 1.0 fullscreen_opacity = 1.0 @@ -47,18 +54,19 @@ _: { animations { enabled = yes - bezier = fastBezier, 0.05, 1.1, 0.2, 1.0 + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - animation = windows, 1, 7, fastBezier, slide - animation = windowsOut, 1, 7, fastBezier, slide - animation = border, 1, 10, fastBezier - animation = fade, 1, 7, fastBezier - animation = workspaces, 1, 6, fastBezier + animation = windows, 1, 7, myBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = fade, 1, 7, default + animation = workspaces, 1, 6, default } dwindle { pseudotile = yes preserve_split = yes + } master { diff --git a/home/wayland/hyprland/wallpapers/anny.jpg b/home/wayland/hyprland/wallpapers/anny.jpg new file mode 100644 index 0000000..7ceb01b Binary files /dev/null and b/home/wayland/hyprland/wallpapers/anny.jpg differ diff --git a/home/wayland/hyprland/wallpapers/annystartingshort.gif b/home/wayland/hyprland/wallpapers/annystartingshort.gif new file mode 100644 index 0000000..526eceb Binary files /dev/null and b/home/wayland/hyprland/wallpapers/annystartingshort.gif differ diff --git a/home/wayland/hyprland/wallpapers/miku.png b/home/wayland/hyprland/wallpapers/miku.png new file mode 100644 index 0000000..c79c0da Binary files /dev/null and b/home/wayland/hyprland/wallpapers/miku.png differ diff --git a/hosts/README.md b/hosts/README.md index 5188a00..d5b8968 100644 --- a/hosts/README.md +++ b/hosts/README.md @@ -7,7 +7,7 @@ Name | Description `ame` | T480 laptop, mainly used for experimenting atm `arashi` | postgres / redis vm `kariru` | *arr stack / seedbox vm -`sakura` | main vm, hosting most internet connected services +`sakura` | WIP new main vm `sora` | hetzner vps `tsuki` | main machine running hyprland `yuki` | my old proxmox machine, now running pure nix diff --git a/hosts/default.nix b/hosts/default.nix index 4f7c633..c2c307f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -5,7 +5,6 @@ inputs: let hyprlandModule = inputs.hyprland.homeManagerModules.default; ironbarModule = inputs.ironbar.homeManagerModules.default; atticdModule = inputs.attic.nixosModules.atticd; - nix-index-Module = inputs.nix-index-database.hmModules.nix-index; inherit (inputs.nixpkgs.lib) nixosSystem; in { tsuki = nixosSystem { @@ -15,7 +14,6 @@ in { ./tsuki sopsModule hmModule - atticdModule { home-manager = { useGlobalPkgs = true; @@ -26,7 +24,6 @@ in { ./tsuki/home.nix hyprlandModule ironbarModule - nix-index-Module ]; }; }; diff --git a/hosts/sakura/services/atticd.nix b/hosts/sakura/services/atticd.nix index aa142d2..b8ec7ec 100644 --- a/hosts/sakura/services/atticd.nix +++ b/hosts/sakura/services/atticd.nix @@ -1,9 +1,10 @@ {config, ...}: { sops.secrets.attic-secret = {}; - + sops.secrets.s3-keyid = {}; + sops.secrets.s3-secret-key = {}; services.atticd = { enable = true; - credentialsFile = "/etc/attic/atticd.env"; + credentialsFile = config.sops.secrets.attic-secret.path; settings = { listen = "[::]:8100"; allowed-hosts = ["cache.notohh.dev"]; @@ -19,6 +20,16 @@ max-size = 256 * 1024; # 256 KiB }; + storage = { + type = "s3"; + region = "auto"; + bucket = "notoh-binary-cache"; + endpoint = "https://s3.us-east-005.backblazeb2.com/"; + credentials = { + access_key_id = config.sops.secrets.s3-keyid.path; + secret_access_key = config.sops.secrets.s3-secret-key.path; + }; + }; garbage-collection = { interval = "12 hours"; default-retention-period = "2 weeks"; diff --git a/hosts/sakura/services/cloudflareddns.nix b/hosts/sakura/services/cloudflareddns.nix deleted file mode 100644 index 89fa221..0000000 --- a/hosts/sakura/services/cloudflareddns.nix +++ /dev/null @@ -1,9 +0,0 @@ -_: { - sops.secrets.cloudflareddns = {}; - virtualisation.oci-containers.containers.cloudflareddns = { - image = "oznu/cloudflare-ddns"; - environmentFiles = [ - /run/secrets/cloudflareddns - ]; - }; -} diff --git a/hosts/sakura/services/conduit.nix b/hosts/sakura/services/conduit.nix deleted file mode 100644 index c6ef1bf..0000000 --- a/hosts/sakura/services/conduit.nix +++ /dev/null @@ -1,21 +0,0 @@ -{lib, ...}: { - networking.firewall.allowedTCPPorts = [6167 8448]; - services.matrix-conduit = { - enable = true; - settings = { - global = { - address = "0.0.0.0"; - server_name = "matrix.notohh.dev"; - allow_registration = true; - allow_federation = false; - allow_encryption = true; - log = "warn"; - max_concurrent_requests = 100; - max_request_size = 20000000; - database_backend = "rocksdb"; - enable_lightning_bolt = false; - trusted_servers = ["matrix.org"]; - }; - }; - }; -} diff --git a/hosts/sakura/services/default.nix b/hosts/sakura/services/default.nix index 0701890..64727fc 100644 --- a/hosts/sakura/services/default.nix +++ b/hosts/sakura/services/default.nix @@ -1,5 +1,6 @@ {...}: { imports = [ + ./atticd.nix ./traefik.nix ./authelia.nix ./hugo.nix @@ -10,8 +11,5 @@ ./dashdot.nix ./grafana.nix ./vaultwarden.nix - ./atticd.nix - ./conduit.nix - ./cloudflareddns.nix ]; } diff --git a/hosts/sora/services/traefik.nix b/hosts/sora/services/traefik.nix index bf68fc4..606dd5e 100644 --- a/hosts/sora/services/traefik.nix +++ b/hosts/sora/services/traefik.nix @@ -46,19 +46,11 @@ tls.domains = [{main = "neko.notohh.dev";}]; tls.certresolver = "production"; }; - conduit = { - rule = "Host(`matrix.notohh.dev`)"; - entrypoints = ["websecure"]; - service = "conduit"; - tls.domains = [{main = "matrix.notohh.dev";}]; - tls.certresolver = "production"; - }; }; services = { uptime-kuma.loadBalancer.servers = [{url = "http://100.87.54.48:4000";}]; gotify.loadBalancer.servers = [{url = "http://100.87.54.48:3000";}]; neko.loadBalancer.servers = [{url = "http://100.110.140.130:8080";}]; - conduit.loadBalancer.servers = [{url = "http://100.121.201.47:6167";}]; }; }; }; diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index 9c6cbb8..f5899b4 100755 --- a/hosts/tsuki/default.nix +++ b/hosts/tsuki/default.nix @@ -1,7 +1,6 @@ { config, pkgs, - inputs, ... }: { imports = [ @@ -32,8 +31,6 @@ hostName = "tsuki"; }; - programs.sniffnet.enable = true; - services = { xserver = { enable = true; @@ -94,8 +91,5 @@ qemu_kvm pinentry-gtk2 jdk17 - attic-client - comma - inputs.matugen.packages.x86_64-linux.default ]; } diff --git a/hosts/tsuki/home.nix b/hosts/tsuki/home.nix index 5687805..e735b82 100755 --- a/hosts/tsuki/home.nix +++ b/hosts/tsuki/home.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { imports = [ ../../home + ../../home/librewolf ../../home/wezterm ../../home/zathura ../../home/gtk @@ -25,8 +26,6 @@ discord signal-desktop jellyfin-media-player - cinny-desktop - thunderbird obs-studio pavucontrol vscode-fhs diff --git a/hosts/tsuki/services/default.nix b/hosts/tsuki/services/default.nix index f49dfce..ce9e406 100644 --- a/hosts/tsuki/services/default.nix +++ b/hosts/tsuki/services/default.nix @@ -2,6 +2,5 @@ imports = [ ./restic.nix ./gotify-desktop.nix - ./hydroxide.nix ]; } diff --git a/hosts/tsuki/services/hydroxide.nix b/hosts/tsuki/services/hydroxide.nix deleted file mode 100644 index 15f6817..0000000 --- a/hosts/tsuki/services/hydroxide.nix +++ /dev/null @@ -1,19 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = [pkgs.hydroxide]; - networking.firewall.allowedTCPPorts = [1025 1143]; - - systemd.services.hydroxide = { - enable = true; - wantedBy = [ - "multi-user.target" - ]; - description = "A third-party, open-source ProtonMail bridge"; - - serviceConfig = { - User = "notoh"; - ExecStart = "${pkgs.hydroxide}/bin/hydroxide -disable-carddav serve"; - Restart = "always"; - RestartSec = 30; - }; - }; -} diff --git a/hosts/yuki/services/default.nix b/hosts/yuki/services/default.nix index d96d2dc..feb1cd0 100644 --- a/hosts/yuki/services/default.nix +++ b/hosts/yuki/services/default.nix @@ -8,6 +8,5 @@ ./dashdot.nix ./jellyfin.nix ./neko.nix - ./vikunja.nix ]; } diff --git a/hosts/yuki/services/neko.nix b/hosts/yuki/services/neko.nix index 9ba1a73..bdc81a6 100644 --- a/hosts/yuki/services/neko.nix +++ b/hosts/yuki/services/neko.nix @@ -15,8 +15,6 @@ _: { NEKO_BIND = "0.0.0.0:8080"; NEKO_CONTROL_PROTECTION = "true"; NEKO_VIDEO_CODEC = "h264"; - NEKO_ICELITE = "true"; - NEKO_ICESERVER = "stun:stun.l.google.com:19302"; }; }; } diff --git a/hosts/yuki/services/traefik.nix b/hosts/yuki/services/traefik.nix index c33752b..2e048fa 100644 --- a/hosts/yuki/services/traefik.nix +++ b/hosts/yuki/services/traefik.nix @@ -40,11 +40,6 @@ _: { entrypoints = ["web"]; service = "jellyseerr"; }; - vikunja-frontend = { - rule = "Host(`vikunja.home.arpa`)"; - entrypoints = ["web"]; - service = "vikunja-frontend"; - }; }; services = { stash.loadBalancer.servers = [{url = "http://localhost:9999";}]; @@ -53,7 +48,6 @@ _: { searxng.loadBalancer.servers = [{url = "http://localhost:8100";}]; jellyfin.loadBalancer.servers = [{url = "http://localhost:8096";}]; jellyseerr.loadBalancer.servers = [{url = "http://localhost:5055";}]; - vikunja-frontend.loadBalancer.servers = [{url = "http://localhost:6789";}]; }; }; }; diff --git a/hosts/yuki/services/vikunja.nix b/hosts/yuki/services/vikunja.nix deleted file mode 100644 index 7227d58..0000000 --- a/hosts/yuki/services/vikunja.nix +++ /dev/null @@ -1,26 +0,0 @@ -{pkgs, ...}: { - networking.firewall.allowedTCPPorts = [3456 6789]; - - virtualisation.oci-containers.containers.vikunja = { - image = "vikunja/api"; - environment = { - VIKUNJA_SERVICE_FRONTENDURL = "vikunja.home.arpa"; - }; - ports = [ - "3456:3456" - ]; - volumes = [ - "/home/notoh/docker/vikunja/files:/app/vikunja/files" - ]; - }; - - virtualisation.oci-containers.containers.vikunja-frontend = { - image = "vikunja/frontend"; - ports = [ - "6789:80" - ]; - environment = { - VIKUNJA_API_URL = "http://192.168.1.36:3456/api/v1"; - }; - }; -} diff --git a/modules/default.nix b/modules/default.nix index 5c8b421..d441150 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,5 @@ -{inputs, ...}: { +{...}: { imports = [ - inputs.nh.nixosModules.default ./security.nix ./networking.nix ./users.nix diff --git a/modules/fonts.nix b/modules/fonts.nix index afdf3f7..7dd2814 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -9,7 +9,7 @@ nerdfonts noto-fonts noto-fonts-cjk - twitter-color-emoji + twemoji-color-font font-awesome kochi-substitute ipafont @@ -24,10 +24,8 @@ sansSerif = ["Noto Sans" "Twitter Color Emoji"]; emoji = ["Twitter Color Emoji"]; }; - hinting = { - enable = true; - style = "full"; - }; + + hinting.style = "full"; }; }; } diff --git a/modules/nix.nix b/modules/nix.nix index e113a65..3a4ce3a 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,20 +1,17 @@ -_: { +{pkgs, ...}: { nixpkgs = { config = { allowUnfree = true; }; }; - nh = { - enable = true; - clean = { - enable = true; - dates = "weekly"; - extraArgs = "--keep-since 3d --keep 5"; - }; - }; - nix = { + package = pkgs.nixFlakes; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; settings = { extra-experimental-features = ["flakes" "nix-command"]; warn-dirty = false; diff --git a/pkgs/README.md b/pkgs/README.md index 3d4e5f3..a686f99 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -5,4 +5,4 @@ this directory hosts derivations of packages not found in nixpkgs, and overrides name | description --------------- | ----------- `chatterino7` | [7tv fork](https://github.com/SevenTV/chatterino7) of chatterino2, a chat client for twitch.tv -`jellyfin-rpc` | [discord rpc client](https://github.com/Radiicall/jellyfin-rpc) for jellyfin +`rustypaste-cli`| cli tool for [rustypaste](https://github.com/orhun/rustypaste) diff --git a/pkgs/chatterino7/default.nix b/pkgs/chatterino7/default.nix index 07cdb52..27f6e02 100644 --- a/pkgs/chatterino7/default.nix +++ b/pkgs/chatterino7/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { pname = "chatterino7"; - version = "7.4.6"; + version = "7.4.5"; src = pkgs.fetchFromGitHub { owner = "SevenTV"; repo = pname; - rev = "142f4e27f7cbe1e6367fdb533e5ce9ac06e3ac32"; - sha256 = "sha256-z+oWzM/wSl5OLo6ditXe5ysnQHkKu81BmAuBLUcE3Kw="; + rev = "97bc0d8efdfcb5fa02719d6e126d4fbfa86cbc35"; + sha256 = "sha256-/uv1shCCimkzshtch/tXoJQ9TkUIvTCn8nmFqpj0qz0="; fetchSubmodules = true; }; nativeBuildInputs = with pkgs; [cmake pkg-config libsForQt5.qt5.wrapQtAppsHook]; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index efd082e..add065c 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -12,7 +12,6 @@ gluetun: ENC[AES256_GCM,data:yL+LOPpwU+CAtbjc7YWbNUOTpDhq4mH3aJOl3hPYxgbFUba6NVJ miniflux: ENC[AES256_GCM,data:C4kurW7+C62ewPUalvJWnxV/fipCEwFFvkAst13aRAwi0v+R8g9skvW9F9PkSrvkyjAOFaCFKA==,iv:xEG3s9WCpjWFbBqR8dHBlrsf/ItvcdhlP+b9qOo5Wx8=,tag:XmswbqaAJaYElSYwW+V/kw==,type:str] authelia-jwt: ENC[AES256_GCM,data:cAn2uZeSGjG2FqTFgZkupcSutCZLvZXCNBsxuUQvGX4=,iv:1OTDQzQwaPTmnTEB4TfnxU6l8CdBAlHfqFThE8QZa6A=,tag:KJ6aYDczHFajhLJHemfIQw==,type:str] authelia-sek: ENC[AES256_GCM,data:yWhAvl1AuEcrUCFAv2vcz6A8BLEIMIz9sqbFRAriHpw=,iv:i887EZgqGtRfFs6mHHAJry0XfQzvrTaDliz8PRh7oLs=,tag:dmn2GSG8gZk9CVXMNmH1Dw==,type:str] -cloudflareddns: ENC[AES256_GCM,data:xow7oaqa3QbMPwggx2zmGvLcKmov7isvLLZKuC6jW/SNjst8kicSQmNhrZw8M/eq8TuqxOT4BqMILQ+I7As2ZCOjSbEBxi1DwU/z47qI,iv:W8UH4kWlh9JyxcGkeuOjRZKqjOHDg9vpzXezHYs1kEg=,tag:YgGk7svEQr9sqLJtKWcHqA==,type:str] sops: kms: [] gcp_kms: [] @@ -28,8 +27,8 @@ sops: YWNQcURKMSs2U0pOa3E0cTdCZ3RnalkKGayA7DBUQS+kn+6OYVBc6oTunF0qeZdt 5b9DLHgh0HRWFm09XGSOog8K315d93Wzblw1My1/dXeEQX/ryinqUQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-09-29T17:34:37Z" - mac: ENC[AES256_GCM,data:zvGN4HUwgnCrovOv3nS1X1s4Ead17T1cSCtCTmaUbvO36ykND+mxRt8XWhOlNGp5yFULk3VwfgbjRDKAFaePhBJEsd8lRie1uvirxPI1sPw1siE0ohBikHpjK2qLOVRkyb5m6VI6FyPPd2gmTHprRPI/izMmZodelvM9aRmp8fg=,iv:Pe1Bg/2+TWDMj3omuDxms0zM72x9cR0xgx468jXtAMc=,tag:amWJDU/1+G/G/kBhB8PN7A==,type:str] + lastmodified: "2023-06-25T23:47:38Z" + mac: ENC[AES256_GCM,data:a6Vyt6GRqbymTNJo06qyRfowz612oFf5TDf3gX8Q+E30gt2G6y4ETnilCL6G5dYXqyaYobaJpKFwbQDJ/T3CdbbcCp9pKC0tBhzHYXRl+ONA159NX58dy4G+u4GFcOGldJTcrFZQeYKOFfaTKp7l53ZNJBfZLgejP13+Tuby+tc=,iv:DGOunXWScU4LOVChnKsPe5KdQEf8spAXu1OLUW/SoNw=,tag:T5Yb038MFV5+F36BamP8WQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.8.0 + version: 3.7.3