diff --git a/hosts/nb-new.cloonar.com/configuration.nix b/hosts/nb-new.cloonar.com/configuration.nix index 362890f..e28374e 100644 --- a/hosts/nb-new.cloonar.com/configuration.nix +++ b/hosts/nb-new.cloonar.com/configuration.nix @@ -39,6 +39,8 @@ in { fonts.packages = with pkgs; [ open-sans + nix-prefetch + jq ]; swapDevices = [ { diff --git a/hosts/nb-new.cloonar.com/modules/sway/sway.conf b/hosts/nb-new.cloonar.com/modules/sway/sway.conf index 1c78640..b15ab7c 100644 --- a/hosts/nb-new.cloonar.com/modules/sway/sway.conf +++ b/hosts/nb-new.cloonar.com/modules/sway/sway.conf @@ -5,7 +5,7 @@ # i3 config file (v4) # font for window titles and bar -font pango:Source Sans Pro 10 +font pango:Source Sans Pro 8 # use win key set $mod Mod4 @@ -17,16 +17,16 @@ set $up k set $right l # define names for workspaces -set $ws1 "1:  " -set $ws2 "2:  " -set $ws3 "3:  " -set $ws4 "4:  " -set $ws5 "5:  " -set $ws6 "6:  " -set $ws7 "7:  " -set $ws8 "8:  " -set $ws9 "9:  " -set $ws10 "10:  " +set $ws1 "1: " +set $ws2 "2: " +set $ws3 "3: " +set $ws4 "4: " +set $ws5 "5: " +set $ws6 "6: " +set $ws7 "7: " +set $ws8 "8: " +set $ws9 "9: " +set $ws10 "10: " # assign workspaces to primary monitor workspace $ws1 output primary @@ -271,12 +271,12 @@ assign [class="Lightdm-gtk-greeter-settings"] → $ws10 assign [class="Software-properties-gtk"] → $ws10 # class border backgr. text indicator child_border -client.focused #2b83a6 #2b83a6 #ffffff #dddddd #2b83a6 -client.focused_inactive #212121 #212121 #86888c #292d2e #5a5a5a -client.unfocused #212121 #212121 #86888c #292d2e #5a5a5a -client.urgent #d64e4e #d64e4e #ffffff #d64e4e #d64e4e -client.placeholder #212121 #0c0c0c #ffffff #212121 #262626 -client.background #212121 +client.focused #252525 #252525 #8be9fd #dddddd #252525 +client.focused_inactive #282a36 #282a36 #86888c #282a36 #5a5a5a +client.unfocused #282a36 #282a36 #86888c #292d2e #5a5a5a +client.urgent #282a36 #282a36 #ffb86c #282a36 #5a5a5a +client.placeholder #282a36 #282a36 #ffffff #282a36 #262626 +client.background #282a36 bar { swaybar_command waybar diff --git a/hosts/nb-new.cloonar.com/modules/sway/waybar.conf b/hosts/nb-new.cloonar.com/modules/sway/waybar.conf index 9fb4d81..4f370a4 100644 --- a/hosts/nb-new.cloonar.com/modules/sway/waybar.conf +++ b/hosts/nb-new.cloonar.com/modules/sway/waybar.conf @@ -149,7 +149,7 @@ "path": "/nix/" }, "tray": { - "icon-size": 20 + "icon-size": 14 } } diff --git a/hosts/nb-new.cloonar.com/modules/sway/waybar.css b/hosts/nb-new.cloonar.com/modules/sway/waybar.css index cc812ab..82c1eba 100644 --- a/hosts/nb-new.cloonar.com/modules/sway/waybar.css +++ b/hosts/nb-new.cloonar.com/modules/sway/waybar.css @@ -1,5 +1,5 @@ * { - font-size: 16px; + font-size: 10px; font-family: monospace; } @@ -10,10 +10,12 @@ window#waybar { #custom-right-arrow-dark, #custom-left-arrow-dark { + font-size: 20px; color: #252525; } #custom-right-arrow-light, #custom-left-arrow-light { + font-size: 20px; color: #282a36; background: #252525; } @@ -34,6 +36,7 @@ window#waybar { #workspaces button { padding: 0 4px; + padding-right: 8px; color: #f8f8f2; } #workspaces button.focused { @@ -44,9 +47,7 @@ window#waybar { text-shadow: inherit; } #workspaces button:hover { - background: #252525; - border: #252525; - padding: 0 6px; + color: #bd93f9; } #network { @@ -68,12 +69,18 @@ window#waybar { color: #ffb86c; } -#clock, +#clock { + padding: 0 10px; +} + #network, #pulseaudio, #memory, #cpu, #battery, #disk { - padding: 0 20px; + padding: 0 10px; + padding-left: 5px; } + + diff --git a/hosts/web-arm/configuration.nix b/hosts/web-arm/configuration.nix index 7627419..c629bdd 100644 --- a/hosts/web-arm/configuration.nix +++ b/hosts/web-arm/configuration.nix @@ -43,6 +43,7 @@ ./sites/gbv-aktuell.cloonar.dev.nix ./sites/stage.myhidden.life.nix ./sites/stage.korean-skin.care.nix + ./sites/feeds.jordanrannells.com.nix ]; nixpkgs.config.permittedInsecurePackages = [ diff --git a/hosts/web-arm/modules/nextcloud/default.nix b/hosts/web-arm/modules/nextcloud/default.nix index 02fe354..a3f3b64 100644 --- a/hosts/web-arm/modules/nextcloud/default.nix +++ b/hosts/web-arm/modules/nextcloud/default.nix @@ -1,4 +1,12 @@ { pkgs, config, ... }: +let + nextcloud30 = pkgs.nextcloud30.overrideAttrs (oldAttrs: { + src = pkgs.fetchurl { + url = "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; + sha256 = "sha256-kpu4BF6WIW/iKmXc1mJ55b17oauynZm/QB1CO2RqRF8="; + }; + }); +in { sops.secrets.nextcloud-adminpass.owner = "nextcloud"; sops.secrets.nextcloud-secrets.owner = "nextcloud"; @@ -8,7 +16,7 @@ enable = true; hostName = "nextcloud.cloonar.com"; https = true; - package = pkgs.nextcloud30; + package = nextcloud30; # Instead of using pkgs.nextcloud27Packages.apps, # we'll reference the package version specified above extraApps = { diff --git a/hosts/web-arm/sites/feeds.jordanrannells.com.nix b/hosts/web-arm/sites/feeds.jordanrannells.com.nix new file mode 100644 index 0000000..bb90cdf --- /dev/null +++ b/hosts/web-arm/sites/feeds.jordanrannells.com.nix @@ -0,0 +1,68 @@ +{ pkgs, lib, config, ... }: +let + domain = "feeds.jordanrannells.com"; + dataDir = "/var/www/${domain}"; +in { + + sops.secrets.nextcloud-smb-credentials-feeds = { + owner = "feeds_cloonar_com"; + key = "nextcloud-smb-credentials"; + }; + fileSystems."${dataDir}/public" = { + device = "//u149513.your-backup.de/u149513-sub4/Jordanellisrannells@gmail.com/files/Feeds/"; + fsType = "cifs"; + options = let + automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,user,users,file_mode=0770,dir_mode=0770"; + in ["${automount_opts},credentials=${config.sops.secrets.nextcloud-smb-credentials-feeds.path},uid=1011,gid=60"]; + }; + + services.borgbackup.jobs.default.exclude = [ + "${dataDir}/public" + ]; + + + services.webstack.instances."${domain}" = { + enableDefaultLocations = false; + enableMysql = false; + authorizedKeys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDDBGlzrg6NP5ezRFVu1CV8r0uCcS2oIgYG2/u6Cit++ARWQRO5Y0+9qC1Y2RNUaLPbvTmXg7ShskolUeuLryqvp10K2kXQ4E9NlmJ3BNLiAfWCzfe6gAgr6u5unVlXHttnP0leYpGGMUCKuiJpzy/bR6rMIUrCQC6W/MeXkwysNWKvL+ZD0IeQbogtfMFZmag9PO04RKZZvuUn9YvlgkTEK97g5dtyP1NxdtE9dDYf0G+0HcHITcw+lVmGNNwi43nAoUHieQd1kWc8YmxFB+y5O+vRH2O6pZBSdr0tdK6bPcezxd3Gk6i3a54yZfbvSislWA+o7s6uw/qExocpZb7xWa5ymPrGlEPbpYdT1y3hFO25+L1lR4QdG9oUNtJ974bL+EmYmHU+j32K3f8fxDg6BRo8FuriLtAzP7/2/7W8K4nIdMoosS+Ond2JE6XFkg1kSrXCivDBQoetZLO2y+ZPYcsQwIZsdjOnZqVr76nTepqCGIKYCuNM/9sl4AWCsyU=" + ]; + extraConfig = '' + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-Content-Type-Options "nosniff"; + + index index.php + + charset utf-8; + + error_page 404 /index.php; + ''; + + locations = { + "/favicon.ico".extraConfig = '' + log_not_found off; + access_log off; + ''; + "/robots.txt".extraConfig = '' + access_log off; + log_not_found off; + ''; + + "~ ^/[^/]+/".extraConfig = '' + try_files $uri $uri/index.php /index.php; + ''; + + # "/".extraConfig = '' + # try_files $uri $uri/index.php; + # ''; + # + # "~ /$".extraConfig = '' + # try_files $uri $uri/index.php /index.php; + # ''; + }; + + phpPackage = pkgs.php82; + }; + + services.nginx.virtualHosts."${domain}".acmeRoot = lib.mkForce "/var/lib/acme/acme-challenge"; +}