From f7225b9babd9cfcbc19c835b221106b558f3c948 Mon Sep 17 00:00:00 2001 From: macronova Date: Fri, 8 Mar 2024 20:14:20 -0800 Subject: [PATCH] Try writefreely --- common/constants.nix | 1 + flake.lock | 98 ++++++++++++++++++++++-------------- linux/blitzar/gui.nix | 10 ++-- linux/nebula/default.nix | 1 + linux/nebula/writefreely.nix | 18 +++++++ linux/protostar/gui.nix | 2 +- linux/singularity/caddy.nix | 14 +++--- 7 files changed, 95 insertions(+), 49 deletions(-) create mode 100644 linux/nebula/writefreely.nix diff --git a/common/constants.nix b/common/constants.nix index 2d940a8..12bf53d 100644 --- a/common/constants.nix +++ b/common/constants.nix @@ -33,6 +33,7 @@ with lib; { https = 443; jellyfin = 8096; vault = 25487; + writefreely = 61116; }; description = '' The mapping from service to ports. diff --git a/flake.lock b/flake.lock index 84e7b54..b23ff09 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1709599612, - "narHash": "sha256-3fCm3BIc2iva90E/lbkkt+fPXkZr9pnC7tJk3QPOf7Q=", + "lastModified": 1709773529, + "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=", "owner": "nix-community", "repo": "disko", - "rev": "c54e7e2b2b7e394440be36305a8fdeeba6339712", + "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1709578243, - "narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=", + "lastModified": 1709938482, + "narHash": "sha256-2Vw2WOFmEXWQH8ziFNOr0U48Guh5FacuD6BOEIcE99s=", "owner": "nix-community", "repo": "home-manager", - "rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3", + "rev": "17431970b4ebc75a92657101ccffcfc9e1f9d8f0", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1709295149, - "narHash": "sha256-+blV8vKyvh3gYnUFYTOu2yuWxEEBqwS7hfLm6qdpoe4=", + "lastModified": 1709910040, + "narHash": "sha256-tsgHcous8puhTz02H/lLRoTeC4OsFWJOKQvCJHdfDhQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0ef51034dcc8b65b8be72eedd0d5db7d426ea054", + "rev": "77fc86c1b4c2c8464316f7744f9fba63fe6df7ce", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1706742486, - "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=", + "lastModified": 1709905972, + "narHash": "sha256-18OF2/ypr0n4Lp6Fk5SLHPu12ok6jM+Hv3sC0PCim0Q=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29", + "rev": "572c1b4d69deea1093ac231c37927cfa8ccad477", "type": "gitlab" }, "original": { @@ -148,11 +148,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1709278248, - "narHash": "sha256-ceZXyzxTLSOrQlcTPQmvQnDV696NNMBwFmVPb9jpX2E=", + "lastModified": 1709714234, + "narHash": "sha256-fnuVQqdK48c66EC4mL8t7uLhwsY6JDyn7H5tjRpx9Sg=", "owner": "viperML", "repo": "nh", - "rev": "6947e6f6f234d303131ecc1e54ef6703c82257e3", + "rev": "3f148b0c7f2d56be65dc55628f6b2e68ee10e231", "type": "github" }, "original": { @@ -165,16 +165,17 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_6", - "wallpaper-engine-kde-plugin": "wallpaper-engine-kde-plugin", + "wallpaper-engine-plasma5-plugin": "wallpaper-engine-plasma5-plugin", + "wallpaper-engine-plasma6-plugin": "wallpaper-engine-plasma6-plugin", "yorha-grub-theme": "yorha-grub-theme", "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1708667314, - "narHash": "sha256-zB0dZwJDllD/nOqv2P9ENMcADRbnaHNY4kIiydIk3Uw=", + "lastModified": 1709883391, + "narHash": "sha256-z2dr1zt5FqQlqGPjMcEDlXo48F+1sXCQR2eAP+Sexc8=", "ref": "refs/heads/main", - "rev": "b18c4d6be88585045b161126ea6fa8ba7568d1c4", - "revCount": 9, + "rev": "117cd71f52760eeb79cf24d6601a0c904726a8b2", + "revCount": 10, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -207,11 +208,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708815994, - "narHash": "sha256-hL7N/ut2Xu0NaDxDMsw2HagAjgDskToGiyZOWriiLYM=", + "lastModified": 1709675310, + "narHash": "sha256-w61tqFEmuJ+/1rAwU7nkYZ+dN6sLwyobfLwX2Yn42FE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a9dae8f6319600fa9aebde37f340975cab4b8c0", + "rev": "43d259f8d726113fac056e8bb17d5ac2dea3e0a8", "type": "github" }, "original": { @@ -269,11 +270,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" }, "original": { @@ -332,11 +333,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -348,11 +349,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -397,11 +398,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1709591996, - "narHash": "sha256-0sQcalXSgqlO6mnxBTXkSQChBHy2GQsokB1XY8r+LpQ=", + "lastModified": 1709711091, + "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "291aad29b59ceda517a06e59809f35cb0bb17c6b", + "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", "type": "github" }, "original": { @@ -440,7 +441,7 @@ "type": "github" } }, - "wallpaper-engine-kde-plugin": { + "wallpaper-engine-plasma5-plugin": { "flake": false, "locked": { "lastModified": 1708352840, @@ -458,6 +459,25 @@ "url": "https://github.com/catsout/wallpaper-engine-kde-plugin" } }, + "wallpaper-engine-plasma6-plugin": { + "flake": false, + "locked": { + "lastModified": 1709859681, + "narHash": "sha256-umQ1R+XenuNze2xdFGauQZ/an6Q0zN/BG/8TDQsV0jM=", + "ref": "qt6", + "rev": "8a111b99405bd092974cd9bac654a83d4c3e86c2", + "revCount": 590, + "submodules": true, + "type": "git", + "url": "https://github.com/catsout/wallpaper-engine-kde-plugin" + }, + "original": { + "ref": "qt6", + "submodules": true, + "type": "git", + "url": "https://github.com/catsout/wallpaper-engine-kde-plugin" + } + }, "yorha-grub-theme": { "flake": false, "locked": { diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 3690777..10ef72d 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -14,6 +14,7 @@ let usr = config.constants.userName; in { home.packages = with pkgs; [ exactaudiocopy haruna + joplin-desktop lutris nvtop-amd picard @@ -22,13 +23,16 @@ let usr = config.constants.userName; in { tauon telegram-desktop thunderbird - wallpaper-engine-kde-plugin + wallpaper-engine-plasma6-plugin wineWowPackages.waylandFull winetricks yorha-sound-theme - yuzu - ] ++ (with kdePackages; [ + # yuzu + ] ++ (with kdePackages;[ # polonium + qtmultimedia + qtwebchannel + qtwebengine qtwebsockets ]); programs = { diff --git a/linux/nebula/default.nix b/linux/nebula/default.nix index 8c533ed..a719bdf 100644 --- a/linux/nebula/default.nix +++ b/linux/nebula/default.nix @@ -15,6 +15,7 @@ ./network.nix ./syncthing.nix ./tailscale.nix + ./writefreely.nix ./zfs.nix ]; } diff --git a/linux/nebula/writefreely.nix b/linux/nebula/writefreely.nix new file mode 100644 index 0000000..141bf29 --- /dev/null +++ b/linux/nebula/writefreely.nix @@ -0,0 +1,18 @@ +{ config, ... }: + +{ + services.writefreely = with config.constants; { + enable = true; + host = "writefreely.${domain}"; + settings = { + app = { + site_name = domain; + site_description = "Random thoughts"; + }; + server = { + bind = wildcard; + port = port.writefreely; + }; + }; + }; +} diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix index f8e056e..33ed284 100644 --- a/linux/protostar/gui.nix +++ b/linux/protostar/gui.nix @@ -12,7 +12,7 @@ in ppsspp ]; }) - yuzu + # yuzu ]; jovian = { devices.steamdeck.enable = true; diff --git a/linux/singularity/caddy.nix b/linux/singularity/caddy.nix index 7882116..ed184d5 100644 --- a/linux/singularity/caddy.nix +++ b/linux/singularity/caddy.nix @@ -47,12 +47,14 @@ root ${pkgs.cinny} } ''; - "vault.${dn}".extraConfig = - '' - reverse_proxy ${local}:${portStr.vault} { - header_up X-Real-IP {remote_host} - } - ''; + "vault.${dn}".extraConfig = '' + reverse_proxy ${local}:${portStr.vault} { + header_up X-Real-IP {remote_host} + } + ''; + "writefreely.${dn}".extraConfig = '' + reverse_proxy ${home}:${portStr.writefreely} + ''; }; };