fix server, etc etc
This commit is contained in:
parent
827885b5b2
commit
50d47ffe5a
6 changed files with 42 additions and 39 deletions
|
|
@ -4,20 +4,20 @@
|
||||||
let
|
let
|
||||||
opts = {
|
opts = {
|
||||||
type = "cifs";
|
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
|
in
|
||||||
[
|
[
|
||||||
(opts // { what = "//100.86.160.104/anime"; where = "/mnt/uwuraid/anime"; })
|
(opts // { what = "//100.97.47.81/anime"; where = "/mnt/uwuraid/anime"; })
|
||||||
(opts // { what = "//100.86.160.104/backup"; where = "/mnt/uwuraid/backup"; })
|
(opts // { what = "//100.97.47.81/backup"; where = "/mnt/uwuraid/backup"; })
|
||||||
(opts // { what = "//100.86.160.104/everything"; where = "/mnt/uwuraid/everything"; })
|
(opts // { what = "//100.97.47.81/everything"; where = "/mnt/uwuraid/everything"; })
|
||||||
(opts // { what = "//100.86.160.104/isos"; where = "/mnt/uwuraid/isos"; })
|
(opts // { what = "//100.97.47.81/isos"; where = "/mnt/uwuraid/isos"; })
|
||||||
# (opts // { what = "//100.86.160.104/jellyfin"; where = "/mnt/uwuraid/jellyfin"; })
|
# (opts // { what = "//100.97.47.81/jellyfin"; where = "/mnt/uwuraid/jellyfin"; })
|
||||||
(opts // { what = "//100.86.160.104/movies"; where = "/mnt/uwuraid/movies"; })
|
(opts // { what = "//100.97.47.81/movies"; where = "/mnt/uwuraid/movies"; })
|
||||||
(opts // { what = "//100.86.160.104/music"; where = "/mnt/uwuraid/music"; })
|
(opts // { what = "//100.97.47.81/music"; where = "/mnt/uwuraid/music"; })
|
||||||
(opts // { what = "//100.86.160.104/photos"; where = "/mnt/uwuraid/photos"; })
|
(opts // { what = "//100.97.47.81/photos"; where = "/mnt/uwuraid/photos"; })
|
||||||
(opts // { what = "//100.86.160.104/syncthing"; where = "/mnt/uwuraid/syncthing"; })
|
(opts // { what = "//100.97.47.81/syncthing"; where = "/mnt/uwuraid/syncthing"; })
|
||||||
(opts // { what = "//100.86.160.104/television"; where = "/mnt/uwuraid/television"; })
|
(opts // { what = "//100.97.47.81/television"; where = "/mnt/uwuraid/television"; })
|
||||||
];
|
];
|
||||||
systemd.automounts =
|
systemd.automounts =
|
||||||
let
|
let
|
||||||
|
|
|
||||||
18
flake.lock
generated
18
flake.lock
generated
|
|
@ -41,11 +41,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703545041,
|
"lastModified": 1705312285,
|
||||||
"narHash": "sha256-nvQA+k1rSszrf4kA4eK2i/SGbzoXyoKHzzyzq/Jca1w=",
|
"narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "a15b6e525f5737a47b4ce28445c836996fb2ea8c",
|
"rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -105,11 +105,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703255338,
|
"lastModified": 1705496572,
|
||||||
"narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
|
"narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
|
"rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -120,11 +120,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703351344,
|
"lastModified": 1704290814,
|
||||||
"narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=",
|
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7790e078f8979a9fcd543f9a47427eeaba38f268",
|
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
config.permittedInsecurePackages = [
|
config.permittedInsecurePackages = [
|
||||||
"electron-24.8.6"
|
"electron-24.8.6"
|
||||||
"qtwebkit-5.212.0-alpha4"
|
# "qtwebkit-5.212.0-alpha4"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
xorg.xkill
|
xorg.xkill
|
||||||
macchina
|
macchina
|
||||||
unstable.rustdesk
|
rustdesk
|
||||||
screen
|
screen
|
||||||
libthai
|
libthai
|
||||||
bat
|
bat
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
unstable.helix
|
unstable.helix
|
||||||
localsend
|
localsend
|
||||||
mesa
|
mesa
|
||||||
mpv
|
unstable.mpv
|
||||||
ouch
|
ouch
|
||||||
ripgrep
|
ripgrep
|
||||||
skim
|
skim
|
||||||
|
|
@ -29,6 +29,8 @@
|
||||||
programs.partition-manager.enable = lib.mkDefault true;
|
programs.partition-manager.enable = lib.mkDefault true;
|
||||||
|
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
|
services.tailscale.package = pkgs.unstable.tailscale;
|
||||||
|
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
services.flatpak.enable = lib.mkDefault true;
|
services.flatpak.enable = lib.mkDefault true;
|
||||||
services.printing.enable = lib.mkDefault true;
|
services.printing.enable = lib.mkDefault true;
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,27 @@
|
||||||
{ config, pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
services.xserver.displayManager = {
|
services.xserver.displayManager = {
|
||||||
autoLogin.enable = true;
|
autoLogin.enable = true;
|
||||||
autoLogin.user = "tao";
|
autoLogin.user = "tao";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs;
|
environment.systemPackages = with pkgs;[
|
||||||
[
|
|
||||||
# egl-wayland
|
# egl-wayland
|
||||||
# mesa
|
# mesa
|
||||||
nvidia-vaapi-driver
|
# nvidia-vaapi-driver
|
||||||
gwe
|
gwe
|
||||||
liquidctl
|
liquidctl
|
||||||
openrgb
|
openrgb
|
||||||
snapper
|
snapper
|
||||||
];
|
];
|
||||||
|
|
||||||
|
services.tailscale.useRoutingFeatures = "both";
|
||||||
|
|
||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
# wayland chromium workaround
|
# wayland chromium workaround
|
||||||
NIXOS_OZONE_WL = "1";
|
NIXOS_OZONE_WL = "1";
|
||||||
# firefox nvidia-vaapi-driver
|
# firefox nvidia-vaapi-driver
|
||||||
MOZ_DISABLE_RDD_SANDBOX = "1";
|
# MOZ_DISABLE_RDD_SANDBOX = "1";
|
||||||
LIBVA_DRIVER_NAME = "nvidia";
|
# LIBVA_DRIVER_NAME = "nvidia";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" = {
|
fileSystems."/home" = {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
users.users.tao.packages = with pkgs; [
|
users.users.tao.packages = with pkgs; [
|
||||||
mendeley
|
mendeley
|
||||||
unstable.wkhtmltopdf
|
# unstable.wkhtmltopdf
|
||||||
calibre
|
calibre
|
||||||
qmk
|
qmk
|
||||||
qmk-udev-rules
|
qmk-udev-rules
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
discord
|
discord
|
||||||
gh
|
gh
|
||||||
jellyfin-media-player
|
jellyfin-media-player
|
||||||
jellyfin-mpv-shim
|
unstable.jellyfin-mpv-shim
|
||||||
keepassxc
|
keepassxc
|
||||||
libsForQt5.kcharselect
|
libsForQt5.kcharselect
|
||||||
libsForQt5.kdeconnect-kde
|
libsForQt5.kdeconnect-kde
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
virt-manager
|
virt-manager
|
||||||
zathura
|
zathura
|
||||||
zoom-us
|
zoom-us
|
||||||
zoxide
|
unstable.zoxide
|
||||||
];
|
];
|
||||||
programs.mosh.enable = true;
|
programs.mosh.enable = true;
|
||||||
environment.shells = with pkgs; [ unstable.nushell ];
|
environment.shells = with pkgs; [ unstable.nushell ];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue