From 979d82018673bd0df95aee2a3a1371871211d590 Mon Sep 17 00:00:00 2001 From: Tristan Date: Sat, 2 Mar 2024 10:31:14 +0000 Subject: [PATCH 1/5] alpine: fixes cerysb.art redirect nextcloud preview app whatsapp encryption fix --- hardware/alpine.nix | 1 + nixos/services/nextcloud.nix | 2 +- nixos/services/whatsapp.nix | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hardware/alpine.nix b/hardware/alpine.nix index 3c6a881..95e41f7 100644 --- a/hardware/alpine.nix +++ b/hardware/alpine.nix @@ -132,6 +132,7 @@ in { recommendedOptimisation = true; recommendedGzipSettings = true; virtualHosts = { + "cerysb.art".globalRedirect = "instagram.com/cerys.bcreates"; "*.tristans.cloud" = { globalRedirect = "tristans.cloud"; }; diff --git a/nixos/services/nextcloud.nix b/nixos/services/nextcloud.nix index 9694f16..eb6050e 100644 --- a/nixos/services/nextcloud.nix +++ b/nixos/services/nextcloud.nix @@ -69,7 +69,7 @@ in { }; extraApps = { inherit (config.services.nextcloud.package.packages.apps) - contacts calendar mail gpoddersync memories notes maps; + contacts calendar mail gpoddersync memories notes maps previewgenerator; oidc_login = pkgs.fetchNextcloudApp { sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI="; url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz"; diff --git a/nixos/services/whatsapp.nix b/nixos/services/whatsapp.nix index 6e1e2d0..e6fceb1 100644 --- a/nixos/services/whatsapp.nix +++ b/nixos/services/whatsapp.nix @@ -65,6 +65,7 @@ in { }; encryption = { allow = true; + appservice = false; }; personal_filtering_spaces = true; }; From e2e7b8c15aa72424b8e92b5fe07da0918757db99 Mon Sep 17 00:00:00 2001 From: tristan Date: Sun, 3 Mar 2024 15:36:08 +0000 Subject: [PATCH 2/5] jellyfin mpv shim --- flake.nix | 1 + home/programs/personal/default.nix | 2 +- home/programs/xr.nix | 42 +++++++++++++++--------------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index 454f473..c19d583 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ ./home/programs/graphical.nix ./home/programs/gamer.nix ./home/programs/personal/. + ./home/programs/xr.nix ]; FCS-Tristan-Nixbook = diff --git a/home/programs/personal/default.nix b/home/programs/personal/default.nix index c466c1a..d2ff861 100644 --- a/home/programs/personal/default.nix +++ b/home/programs/personal/default.nix @@ -19,7 +19,6 @@ ardour blender # musescore - jellyfin-media-player monero-gui electrum xmrig @@ -30,5 +29,6 @@ hugo libsForQt5.neochat bookworm + jellyfin-mpv-shim ]; } diff --git a/home/programs/xr.nix b/home/programs/xr.nix index 117ac8c..93a9824 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -5,26 +5,26 @@ home.file.".config/openxr/1/openxr_monado.json" = { source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; }; - home.file.".config/openvr/openvrpaths.vrpath" = { - text = '' - { - "config" : - [ - "${config.home.homeDirectory}/.local/share/Steam/config" - ], - "external_drivers" : null, - "jsonid" : "vrpathreg", - "log" : - [ - "${config.home.homeDirectory}/.local/share/Steam/logs" - ], - "runtime" : - [ - "${pkgs.opencomposite}/lib/opencomposite" - ], - "version" : 1 - } - ''; - }; + # home.file.".config/openvr/openvrpaths.vrpath" = { + # text = '' + # { + # "config" : + # [ + # "${config.home.homeDirectory}/.local/share/Steam/config" + # ], + # "external_drivers" : null, + # "jsonid" : "vrpathreg", + # "log" : + # [ + # "${config.home.homeDirectory}/.local/share/Steam/logs" + # ], + # "runtime" : + # [ + # "${pkgs.opencomposite}/lib/opencomposite" + # ], + # "version" : 1 + # } + # ''; + # }; } From 664400f223739dd07becb3f27063c96358a5bec3 Mon Sep 17 00:00:00 2001 From: Tristan Date: Tue, 5 Mar 2024 18:11:31 +0000 Subject: [PATCH 3/5] fix snapraid --- hardware/alpine.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hardware/alpine.nix b/hardware/alpine.nix index 95e41f7..7babbd0 100644 --- a/hardware/alpine.nix +++ b/hardware/alpine.nix @@ -101,7 +101,6 @@ in { "/mnt/disk1/SnapRAID.content" "/mnt/disk2/SnapRAID.content" "/mnt/disk3/SnapRAID.content" - "/var/snapraid/SnapRAID.content" ]; dataDisks = { d1 = "/mnt/disk1"; From 0eb4b3921618a45c18d723b18bda44a39c28f4f0 Mon Sep 17 00:00:00 2001 From: Tristan Date: Tue, 5 Mar 2024 20:14:02 +0000 Subject: [PATCH 4/5] add tailscale ips to /etc/hosts --- nixos/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/default.nix b/nixos/default.nix index 05363ab..973431b 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -35,6 +35,12 @@ in { } ]; }; + networking.hosts = { + "100.65.29.110" = ["zenix"]; + "100.106.241.122" = ["alpine" "tristans.cloud"]; + "100.71.130.111" = ["fcs-tristan-nixbook"]; + "100.69.60.83" = ["google-pixel-8"]; + }; time.timeZone = lib.mkDefault "Europe/London"; From 594ec240eb7eb1dfc176861dd23c33d49e497558 Mon Sep 17 00:00:00 2001 From: Tristan Date: Tue, 5 Mar 2024 20:29:08 +0000 Subject: [PATCH 5/5] format --- flake.nix | 2 +- home/desktop/hyprland/default.nix | 2 +- home/programs/xr.nix | 41 +++++++++++++++++-------------- nixos/services/nextcloud.nix | 13 ++++++++-- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/flake.nix b/flake.nix index 454f473..1b34f7d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ outputs = inputs: let system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { inherit system; }; + pkgs = import inputs.nixpkgs {inherit system;}; user = "tristan"; userFullname = "Tristan Beedell"; auto-login = import ./nixos/programs/auto-login.nix; diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 021f539..9402090 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -184,7 +184,7 @@ in { device { name = zsa-technology-labs-moonlander-mark-i - kb_variant = + kb_variant = kb_options = esperanto:qwerty,lv3:ralt_switch } ''; diff --git a/home/programs/xr.nix b/home/programs/xr.nix index 117ac8c..1b71829 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -1,4 +1,8 @@ -{pkgs, config, ...}: { +{ + pkgs, + config, + ... +}: { home.packages = with pkgs; [ monado ]; @@ -7,24 +11,23 @@ }; home.file.".config/openvr/openvrpaths.vrpath" = { text = '' - { - "config" : - [ - "${config.home.homeDirectory}/.local/share/Steam/config" - ], - "external_drivers" : null, - "jsonid" : "vrpathreg", - "log" : - [ - "${config.home.homeDirectory}/.local/share/Steam/logs" - ], - "runtime" : - [ - "${pkgs.opencomposite}/lib/opencomposite" - ], - "version" : 1 - } + { + "config" : + [ + "${config.home.homeDirectory}/.local/share/Steam/config" + ], + "external_drivers" : null, + "jsonid" : "vrpathreg", + "log" : + [ + "${config.home.homeDirectory}/.local/share/Steam/logs" + ], + "runtime" : + [ + "${pkgs.opencomposite}/lib/opencomposite" + ], + "version" : 1 + } ''; }; - } diff --git a/nixos/services/nextcloud.nix b/nixos/services/nextcloud.nix index eb6050e..0417b08 100644 --- a/nixos/services/nextcloud.nix +++ b/nixos/services/nextcloud.nix @@ -68,8 +68,17 @@ in { datadirectory = "/mnt/storage/nextcloud"; }; extraApps = { - inherit (config.services.nextcloud.package.packages.apps) - contacts calendar mail gpoddersync memories notes maps previewgenerator; + inherit + (config.services.nextcloud.package.packages.apps) + contacts + calendar + mail + gpoddersync + memories + notes + maps + previewgenerator + ; oidc_login = pkgs.fetchNextcloudApp { sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI="; url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz";