From 50d47ffe5a4948a76763b9f983aa9108c6c194ca Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:40:07 -0800 Subject: [PATCH] fix server, etc etc --- extras/uwuraid.nix | 22 +++++++++++----------- flake.lock | 18 +++++++++--------- flake.nix | 2 +- systems/BASED.nix | 6 ++++-- systems/NOcomputer.nix | 27 ++++++++++++++------------- users/tao.nix | 6 +++--- 6 files changed, 42 insertions(+), 39 deletions(-) diff --git a/extras/uwuraid.nix b/extras/uwuraid.nix index d0aeafc..8100637 100644 --- a/extras/uwuraid.nix +++ b/extras/uwuraid.nix @@ -4,20 +4,20 @@ let opts = { type = "cifs"; - mountConfig = { Options = "credentials=/etc/nixos/smb-secrets,noatime,uid=1000,gid=100"; }; + mountConfig = { Options = "users,noauto,credentials=/etc/nixos/smb-secrets,noatime,uid=1000,gid=100"; }; }; in [ - (opts // { what = "//100.86.160.104/anime"; where = "/mnt/uwuraid/anime"; }) - (opts // { what = "//100.86.160.104/backup"; where = "/mnt/uwuraid/backup"; }) - (opts // { what = "//100.86.160.104/everything"; where = "/mnt/uwuraid/everything"; }) - (opts // { what = "//100.86.160.104/isos"; where = "/mnt/uwuraid/isos"; }) - # (opts // { what = "//100.86.160.104/jellyfin"; where = "/mnt/uwuraid/jellyfin"; }) - (opts // { what = "//100.86.160.104/movies"; where = "/mnt/uwuraid/movies"; }) - (opts // { what = "//100.86.160.104/music"; where = "/mnt/uwuraid/music"; }) - (opts // { what = "//100.86.160.104/photos"; where = "/mnt/uwuraid/photos"; }) - (opts // { what = "//100.86.160.104/syncthing"; where = "/mnt/uwuraid/syncthing"; }) - (opts // { what = "//100.86.160.104/television"; where = "/mnt/uwuraid/television"; }) + (opts // { what = "//100.97.47.81/anime"; where = "/mnt/uwuraid/anime"; }) + (opts // { what = "//100.97.47.81/backup"; where = "/mnt/uwuraid/backup"; }) + (opts // { what = "//100.97.47.81/everything"; where = "/mnt/uwuraid/everything"; }) + (opts // { what = "//100.97.47.81/isos"; where = "/mnt/uwuraid/isos"; }) + # (opts // { what = "//100.97.47.81/jellyfin"; where = "/mnt/uwuraid/jellyfin"; }) + (opts // { what = "//100.97.47.81/movies"; where = "/mnt/uwuraid/movies"; }) + (opts // { what = "//100.97.47.81/music"; where = "/mnt/uwuraid/music"; }) + (opts // { what = "//100.97.47.81/photos"; where = "/mnt/uwuraid/photos"; }) + (opts // { what = "//100.97.47.81/syncthing"; where = "/mnt/uwuraid/syncthing"; }) + (opts // { what = "//100.97.47.81/television"; where = "/mnt/uwuraid/television"; }) ]; systemd.automounts = let diff --git a/flake.lock b/flake.lock index 9dae3d0..f79c2d4 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1703545041, - "narHash": "sha256-nvQA+k1rSszrf4kA4eK2i/SGbzoXyoKHzzyzq/Jca1w=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a15b6e525f5737a47b4ce28445c836996fb2ea8c", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703351344, - "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ad08ec0..574781f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ config.allowUnfree = true; config.permittedInsecurePackages = [ "electron-24.8.6" - "qtwebkit-5.212.0-alpha4" + # "qtwebkit-5.212.0-alpha4" ]; }; }; diff --git a/systems/BASED.nix b/systems/BASED.nix index c53c309..5b1ed97 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -2,7 +2,7 @@ environment.systemPackages = with pkgs; [ xorg.xkill macchina - unstable.rustdesk + rustdesk screen libthai bat @@ -16,7 +16,7 @@ unstable.helix localsend mesa - mpv + unstable.mpv ouch ripgrep skim @@ -29,6 +29,8 @@ programs.partition-manager.enable = lib.mkDefault true; services.tailscale.enable = true; + services.tailscale.package = pkgs.unstable.tailscale; + services.openssh.enable = true; services.flatpak.enable = lib.mkDefault true; services.printing.enable = lib.mkDefault true; diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 1d81fc4..5dc5f7a 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -1,26 +1,27 @@ -{ config, pkgs, ... }: { +{ pkgs, ... }: { services.xserver.displayManager = { autoLogin.enable = true; autoLogin.user = "tao"; }; - environment.systemPackages = with pkgs; - [ - # egl-wayland - # mesa - nvidia-vaapi-driver - gwe - liquidctl - openrgb - snapper - ]; + environment.systemPackages = with pkgs;[ + # egl-wayland + # mesa + # nvidia-vaapi-driver + gwe + liquidctl + openrgb + snapper + ]; + + services.tailscale.useRoutingFeatures = "both"; environment.sessionVariables = { # wayland chromium workaround NIXOS_OZONE_WL = "1"; # firefox nvidia-vaapi-driver - MOZ_DISABLE_RDD_SANDBOX = "1"; - LIBVA_DRIVER_NAME = "nvidia"; + # MOZ_DISABLE_RDD_SANDBOX = "1"; + # LIBVA_DRIVER_NAME = "nvidia"; }; fileSystems."/home" = { diff --git a/users/tao.nix b/users/tao.nix index 380fbe8..b1a6d12 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { users.users.tao.packages = with pkgs; [ mendeley - unstable.wkhtmltopdf + # unstable.wkhtmltopdf calibre qmk qmk-udev-rules @@ -27,7 +27,7 @@ discord gh jellyfin-media-player - jellyfin-mpv-shim + unstable.jellyfin-mpv-shim keepassxc libsForQt5.kcharselect libsForQt5.kdeconnect-kde @@ -55,7 +55,7 @@ virt-manager zathura zoom-us - zoxide + unstable.zoxide ]; programs.mosh.enable = true; environment.shells = with pkgs; [ unstable.nushell ];