From 7236f5078559460f23fc575bd3815a9f0643eacf Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 1/6] hermit/configuration.nix: disable kdeconnect --- hosts/hermit/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 82d1618..90db491 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -9,7 +9,7 @@ i18n.defaultLocale = "en_US.UTF-8"; console.keyMap = "uk"; security.polkit.enable = true; - programs.kdeconnect.enable = true; + programs.kdeconnect.enable = false; programs.nix-ld.enable = false; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; services = { From 39bf3c035e2f7c5395391e94d0a178d65136acf9 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 2/6] hermit/programs.nix: add comma --- hosts/hermit/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index b44fb58..00de886 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -16,6 +16,7 @@ cbonsai cinny-desktop cmus + comma difftastic element element-desktop From 302646e996122b63cd70583bfdd363a283a31df2 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 10 Apr 2025 18:51:10 +0200 Subject: [PATCH 3/6] forgejo/module.nix: add codeberg theme --- modules/services/forgejo/module.nix | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/modules/services/forgejo/module.nix b/modules/services/forgejo/module.nix index f8a9e72..fbd48cb 100644 --- a/modules/services/forgejo/module.nix +++ b/modules/services/forgejo/module.nix @@ -4,8 +4,10 @@ pkgs, ... }: let + inherit (pkgs) fetchurl; inherit (lib.modules) mkIf; inherit (config.services.forgejo) customDir user group; + cfg = config.modules.system.services.forgejo; port = 3000; @@ -126,17 +128,40 @@ in { User-agent: * Disallow: / ''; + base-brand = fetchurl { + url = "https://codeberg.org/Codeberg-Infrastructure/forgejo/raw/branch/codeberg-10/web_src/css/themes/codeberg/base-brand.css"; + hash = lib.fakeHash; + }; + dark-variables = fetchurl { + url = "https://codeberg.org/Codeberg-Infrastructure/forgejo/raw/branch/codeberg-10/web_src/css/themes/codeberg/dark-variables.css"; + hash = lib.fakeHash; + }; + theme-codeberg-dark = fetchurl { + url = "https://codeberg.org/Codeberg-Infrastructure/forgejo/raw/branch/codeberg-10/web_src/css/themes/theme-codeberg-dark.css"; + hash = lib.fakeHash; + }; in [ "d '${customDir}/public' 0750 ${user} ${group} - -" "d '${customDir}/public/assets' 0750 ${user} ${group} - -" "d '${customDir}/public/assets/img' 0750 ${user} ${group} - -" - + # Copeberg logo, thanks Raf <3 "L+ '${customDir}/public/assets/img/logo.svg' - - - - ${img}/logo.svg" "L+ '${customDir}/public/assets/img/logo.png' - - - - ${img}/logo.png" "L+ '${customDir}/public/assets/img/apple-touch-icon' - - - - ${img}/logo.png" "L+ '${customDir}/public/assets/img/favicon.svg' - - - - ${img}/logo.svg" "L+ '${customDir}/public/assets/img/favicon.png' - - - - ${img}/logo.png" + # Theming shenanigans + "d '${customDir}/web_src' 0750 ${user} ${group} - -" + "d '${customDir}/web_src/css' 0750 ${user} ${group} - -" + "d '${customDir}/web_src/css/themes' 0750 ${user} ${group} - -" + "d '${customDir}/web_src/css/themes/codeberg' 0750 ${user} ${group} - -" + + "L+ '${customDir}/web_src/css/themes/theme-codeberg-dark.css' - - - - ${theme-codeberg-dark}" + "L+ '${customDir}/web_src/css/themes/codeberg/base-brand.css' - - - - ${base-brand}" + "L+ '${customDir}/web_src/css/themes/codeberg/dark-variables.css' - - - - ${dark-variables}" + + # Fuck off scrapers "L+ ${customDir}/public/robots.txt - - - - ${robots.outPath}" ]; }; From b46922bd1c6ee690c2ed5cf253feca93ed8cbdca Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 4/6] services/nextcloud: switch to owncloud --- modules/services/{nextcloud => owncloud}/module.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename modules/services/{nextcloud => owncloud}/module.nix (77%) diff --git a/modules/services/nextcloud/module.nix b/modules/services/owncloud/module.nix similarity index 77% rename from modules/services/nextcloud/module.nix rename to modules/services/owncloud/module.nix index 5a3a570..2d7974e 100644 --- a/modules/services/nextcloud/module.nix +++ b/modules/services/owncloud/module.nix @@ -7,13 +7,13 @@ inherit (lib.meta) getExe'; inherit (lib.modules) mkIf; - cfg = config.modules.system.services.nextcloud; + cfg = config.modules.system.services.owncloud; in { - options.modules.system.services.nextcloud.enable = lib.mkEnableOption "nextcloud"; + options.modules.system.services.owncloud.enable = lib.mkEnableOption "owncloud"; config = { - systemd.user.services.nextcloud = mkIf cfg.enable { - description = "Nextcloud client service"; + systemd.user.services.owncloud = mkIf cfg.enable { + description = "Owncloud client service"; # makes the graphical session start this service when it starts wantedBy = ["graphical-session.target"]; @@ -23,7 +23,7 @@ in { after = ["graphical-session.target"]; serviceConfig = { - ExecStart = "${getExe' pkgs.nextcloud-client "nextcloud"} --background"; + ExecStart = "${getExe' pkgs.owncloud-client "owncloud"}"; Restart = "always"; RestartSec = 30; From 113a2433fb659b36e75672b7ad41a7eeac351a41 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 5/6] hosts: switch from nextcloud to owncloud --- hosts/hermit/configuration.nix | 2 +- hosts/temperance/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 90db491..a33bdc4 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -30,7 +30,7 @@ boot.systemd-boot.enable = true; impermanence.enable = false; services = { - nextcloud.enable = true; + owncloud.enable = true; }; hardware = { nvidia.enable = true; diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index 71af206..cfc2982 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -48,7 +48,7 @@ in { systemd-boot.enable = true; }; services = { - nextcloud.enable = true; + owncloud.enable = true; }; programs = { editors = { From 0f0f6c54844e66a117865fcee0e9e90d5f62af7d Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 10 Apr 2025 18:51:10 +0200 Subject: [PATCH 6/6] forgejo/module.nix: add codeberg theme --- modules/services/forgejo/module.nix | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/modules/services/forgejo/module.nix b/modules/services/forgejo/module.nix index f8a9e72..fbd48cb 100644 --- a/modules/services/forgejo/module.nix +++ b/modules/services/forgejo/module.nix @@ -4,8 +4,10 @@ pkgs, ... }: let + inherit (pkgs) fetchurl; inherit (lib.modules) mkIf; inherit (config.services.forgejo) customDir user group; + cfg = config.modules.system.services.forgejo; port = 3000; @@ -126,17 +128,40 @@ in { User-agent: * Disallow: / ''; + base-brand = fetchurl { + url = "https://codeberg.org/Codeberg-Infrastructure/forgejo/raw/branch/codeberg-10/web_src/css/themes/codeberg/base-brand.css"; + hash = lib.fakeHash; + }; + dark-variables = fetchurl { + url = "https://codeberg.org/Codeberg-Infrastructure/forgejo/raw/branch/codeberg-10/web_src/css/themes/codeberg/dark-variables.css"; + hash = lib.fakeHash; + }; + theme-codeberg-dark = fetchurl { + url = "https://codeberg.org/Codeberg-Infrastructure/forgejo/raw/branch/codeberg-10/web_src/css/themes/theme-codeberg-dark.css"; + hash = lib.fakeHash; + }; in [ "d '${customDir}/public' 0750 ${user} ${group} - -" "d '${customDir}/public/assets' 0750 ${user} ${group} - -" "d '${customDir}/public/assets/img' 0750 ${user} ${group} - -" - + # Copeberg logo, thanks Raf <3 "L+ '${customDir}/public/assets/img/logo.svg' - - - - ${img}/logo.svg" "L+ '${customDir}/public/assets/img/logo.png' - - - - ${img}/logo.png" "L+ '${customDir}/public/assets/img/apple-touch-icon' - - - - ${img}/logo.png" "L+ '${customDir}/public/assets/img/favicon.svg' - - - - ${img}/logo.svg" "L+ '${customDir}/public/assets/img/favicon.png' - - - - ${img}/logo.png" + # Theming shenanigans + "d '${customDir}/web_src' 0750 ${user} ${group} - -" + "d '${customDir}/web_src/css' 0750 ${user} ${group} - -" + "d '${customDir}/web_src/css/themes' 0750 ${user} ${group} - -" + "d '${customDir}/web_src/css/themes/codeberg' 0750 ${user} ${group} - -" + + "L+ '${customDir}/web_src/css/themes/theme-codeberg-dark.css' - - - - ${theme-codeberg-dark}" + "L+ '${customDir}/web_src/css/themes/codeberg/base-brand.css' - - - - ${base-brand}" + "L+ '${customDir}/web_src/css/themes/codeberg/dark-variables.css' - - - - ${dark-variables}" + + # Fuck off scrapers "L+ ${customDir}/public/robots.txt - - - - ${robots.outPath}" ]; };