diff --git a/flake.nix b/flake.nix index 8e3d7da..9f5facf 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; @@ -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/hardware/alpine.nix b/hardware/alpine.nix index 3c6a881..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"; @@ -132,6 +131,7 @@ in { recommendedOptimisation = true; recommendedGzipSettings = true; virtualHosts = { + "cerysb.art".globalRedirect = "instagram.com/cerys.bcreates"; "*.tristans.cloud" = { globalRedirect = "tristans.cloud"; }; 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/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..4cab3a7 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -1,30 +1,32 @@ -{pkgs, config, ...}: { +{ + pkgs, + ... +}: { home.packages = with pkgs; [ monado ]; 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 + # } + # ''; + # }; } diff --git a/nixos/default.nix b/nixos/default.nix index 04e3b7e..fd502fd 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -41,6 +41,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"; diff --git a/nixos/services/nextcloud.nix b/nixos/services/nextcloud.nix index 9694f16..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; + 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"; 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; }; diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 11c92e4..fd6c9ea 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -1,12 +1,8 @@ { inputs, - config, pkgs, - lib, ... -}: let - user = config.user; -in { +}: { imports = [ inputs.stylix.nixosModules.stylix ]; @@ -58,6 +54,11 @@ in { hardware.bluetooth.enable = true; services.blueman.enable = true; + networking.stevenblack = { + enable = true; + block = ["porn" "gambling"]; + }; + stylix = { image = ../images/nix-soft.png; base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml";