From ffca372e29bdd9a6ba8ef0c2d6493a21b0dcb814 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 16 Oct 2023 16:50:55 -0500 Subject: [PATCH] GTK --- modules/home-manager/firefox.nix | 7 ++--- modules/home-manager/linux-desktop.nix | 4 +-- modules/home-manager/sway.nix | 6 ++++ modules/nixos/sway.nix | 3 +- nixos/beefcake/default.nix | 42 +++++++++++++++++++++++++- 5 files changed, 52 insertions(+), 10 deletions(-) diff --git a/modules/home-manager/firefox.nix b/modules/home-manager/firefox.nix index 933562b..33e8273 100644 --- a/modules/home-manager/firefox.nix +++ b/modules/home-manager/firefox.nix @@ -34,15 +34,12 @@ display: none; } - #main-window[tabsintitlebar=" - true "]:not([extradragspace=" - true "]) #TabsToolbar>.toolbar-items { + #main-window[tabsintitlebar="true"]:not([extradragspace="true"]) #TabsToolbar>.toolbar-items { opacity: 0; pointer-events: none; } - #main-window:not([tabsintitlebar=" - true "]) #TabsToolbar { + #main-window:not([tabsintitlebar="true"]) #TabsToolbar { visibility: collapse !important; } ''; diff --git a/modules/home-manager/linux-desktop.nix b/modules/home-manager/linux-desktop.nix index 4ada1a0..04adb2f 100644 --- a/modules/home-manager/linux-desktop.nix +++ b/modules/home-manager/linux-desktop.nix @@ -12,11 +12,11 @@ gtk = { enable = true; theme = { - name = "Catppuccin-Mocha-Compact-Sapphire-dark"; + name = "Catppuccin-Mocha-Compact-Sapphire-Dark"; package = pkgs.catppuccin-gtk.override { accents = ["sapphire"]; size = "compact"; - tweaks = ["rimless" "black"]; + tweaks = ["rimless"]; variant = "mocha"; }; }; diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix index 1f53d56..1d06388 100644 --- a/modules/home-manager/sway.nix +++ b/modules/home-manager/sway.nix @@ -15,6 +15,12 @@ linux-desktop ]; + programs.wofi = { + enable = true; + # settings = {}; + # style = '' ''; + }; + home.pointerCursor = { name = "Bibata-Modern-Classic"; package = pkgs.bibata-cursors; diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index b97c2e4..5993256 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -38,7 +38,7 @@ environment = { variables = { - GTK_THEME = "hx"; + GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark"; VISUAL = "hx"; PAGER = "less"; MANPAGER = "less"; @@ -77,7 +77,6 @@ weechat wine wl-clipboard - wofi zathura ]; }; diff --git a/nixos/beefcake/default.nix b/nixos/beefcake/default.nix index 0563f92..5cc8a9e 100644 --- a/nixos/beefcake/default.nix +++ b/nixos/beefcake/default.nix @@ -150,6 +150,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 users.extraGroups = { "plausible" = {}; + "nextcloud" = {}; "lytedev" = {}; }; users.groups.daniel.members = ["daniel"]; @@ -212,6 +213,13 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 group = "plausible"; }; + users.users.nextcloud = { + # used for anonymous samba access + isSystemUser = true; + createHome = false; + group = "nextcloud"; + }; + environment.systemPackages = [pkgs.linuxquota]; # TODO: make the client declarative? right now I think it's manually git @@ -277,6 +285,10 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 reverse_proxy :${toString config.services.plausible.server.port} } + nextcloud.lyte.dev { + reverse_proxy :${toString 9999} + } + git.lyte.dev { reverse_proxy :${toString config.services.gitea.settings.server.HTTP_PORT} } @@ -384,7 +396,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 services.postgresql = { enable = true; - ensureDatabases = ["daniel" "plausible"]; + ensureDatabases = ["daniel" "plausible" "nextcloud"]; ensureUsers = [ { name = "daniel"; @@ -398,6 +410,12 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 "DATABASE plausible" = "ALL PRIVILEGES"; }; } + { + name = "nextcloud"; + ensurePermissions = { + "DATABASE nextcloud" = "ALL PRIVILEGES"; + }; + } ]; dataDir = "/storage/postgres"; enableTCPIP = true; @@ -410,6 +428,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 local all daniel peer map=superuser_map local sameuser all peer map=superuser_map local plausible plausible peer map=superuser_map + local nextcloud nextcloud peer map=superuser_map # lan ipv4 host all all 10.0.0.0/24 trust @@ -577,6 +596,27 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 }; }; + services.redis = { + servers = { + nextcloud = { + enable = true; + user = config.systemd.services.nextcloud.serviceConfig.User; + # group = config.systemd.services.nextcloud.serviceConfig.Group; + }; + }; + }; + + services.nextcloud = { + enable = true; + package = pkgs.nextcloud27; + + config = { + dbtype = "pgsql"; + }; + + hostName = "nextcloud.lyte.dev"; + }; + # paths: # TODO: move previous backups over and put here # clickhouse and plausible analytics once they're up and running?