many changes i made in the last weeks
This commit is contained in:
@@ -66,13 +66,15 @@ in {
|
||||
boot.zfs.forceImportRoot = false;
|
||||
networking.hostId = "7552c83e";
|
||||
|
||||
fileSystems."/home/files/storage" = {
|
||||
device = "storage";
|
||||
fsType = "zfs";
|
||||
};
|
||||
fileSystems."/data" = {
|
||||
device = "storage";
|
||||
fsType = "zfs";
|
||||
options = [ "defaults" "nofail" ];
|
||||
};
|
||||
|
||||
fileSystems."/home/files/storage" = {
|
||||
device = "/data";
|
||||
options = [ "bind" "defaults" "nofail" ];
|
||||
};
|
||||
|
||||
# Use the GRUB 2 boot loader.
|
||||
|
||||
@@ -144,9 +144,13 @@
|
||||
|
||||
####################### MIZE ###########################
|
||||
mize.enable = true;
|
||||
mize.debugConfigFile = "/home/me/host/mize-config.toml";
|
||||
mize.debugBinary = "/home/me/here/mize/target/debug/mize";
|
||||
mize.enableConfigFile = false;
|
||||
mize.debugBinary = "/home/me/here/config/target/debug/lush-os";
|
||||
systemd.user.services.mize.environment.LOG= "trace";
|
||||
systemd.user.services.mize.environment.MIZE_STORE= "/home/me/host/mize";
|
||||
systemd.user.services.mize.serviceConfig.EnvironmentFile = "/home/me/host/mize/daemon.env";
|
||||
#systemd.user.services.mize.environment.WAYLAND_DISPLAY= "wayland-1";
|
||||
systemd.user.services.mize.environment.DISPLAY= ":0";
|
||||
|
||||
|
||||
home-manager.users.me.home.file = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, secretsDir, pkgs, inputs, unstable, ... }: let
|
||||
{ lib, secretsDir, pkgs, inputs, unstable, config, ... }: let
|
||||
|
||||
myobs = pkgs.wrapOBS {
|
||||
plugins = with pkgs.obs-studio-plugins; [
|
||||
@@ -24,10 +24,20 @@ in {
|
||||
inputs.mize.nixosModules.default
|
||||
];
|
||||
mize.enable = true;
|
||||
mize.debugBinary = "/home/me/here/mize/target/debug/mize";
|
||||
mize.debugBinary = "/data/external/config/target/debug/mac-os";
|
||||
mize.debugConfigFile = "/home/me/host/mize-config.toml";
|
||||
systemd.user.services.mize.environment.LOG= "trace";
|
||||
systemd.user.services.mize.serviceConfig.EnvironmentFile = "/home/me/host/mize/daemon.env";
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
# https://nixos.wiki/wiki/OBS_Studio
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; lib.mkForce [
|
||||
v4l2loopback
|
||||
];
|
||||
boot.extraModprobeConfig = ''
|
||||
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 kvm_intel nested=1
|
||||
'';
|
||||
security.polkit.enable = true;
|
||||
|
||||
#services.pid-fan-controller.enable = true;
|
||||
|
||||
@@ -69,7 +79,6 @@ in {
|
||||
swapDevices = [ { device = "/swapfile"; } ];
|
||||
|
||||
boot.kernelModules = [ "usbip_core" ];
|
||||
boot.extraModprobeConfig = "options kvm_intel nested=1";
|
||||
|
||||
# to build rpi images
|
||||
boot.binfmt.emulatedSystems = [
|
||||
@@ -146,6 +155,12 @@ in {
|
||||
device = "/dev/disk/by-label/EFI";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/data/external" = {
|
||||
device = "/dev/disk/by-uuid/62933892-a6b9-4a10-8b9d-f47dc1380e85";
|
||||
fsType = "ext4";
|
||||
options = [ "defaults" "nofail" ];
|
||||
};
|
||||
|
||||
networking = {
|
||||
nameservers = [ "1.1.1.1" "8.8.8.8" ];
|
||||
@@ -182,7 +197,7 @@ in {
|
||||
{
|
||||
position = "left";
|
||||
hostname = "main";
|
||||
activate_on_startup = true;
|
||||
activate_on_startup = false;
|
||||
ips = [ "192.168.4.2" "100.88.218.34" ];
|
||||
port = 4410;
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
*/
|
||||
|
||||
services.openssh.enable = true;
|
||||
boot.kernelModules = [ "vhci-hcd" ];
|
||||
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
@@ -271,8 +272,9 @@ fileSystems."/home/me/nico" = {
|
||||
####################### MIZE ###########################
|
||||
mize.enable = true;
|
||||
mize.debugConfigFile = "/home/me/secrets/mize-config.toml";
|
||||
mize.debugBinary = "/home/me/work/path-extra/mize";
|
||||
mize.debugBinary = "/home/me/work/config/target/debug/main-os";
|
||||
systemd.user.services.mize.environment.LOG= "trace";
|
||||
systemd.user.services.mize.serviceConfig.EnvironmentFile = "/home/me/work/app-data/mize/daemon.env";
|
||||
|
||||
|
||||
#services.udev.packages = [ inputs.waveforms.packages.${system}.adept2-runtime ];
|
||||
@@ -474,7 +476,7 @@ fileSystems."/home/me/nico" = {
|
||||
elif [[ "$host" == "phone" ]]
|
||||
then
|
||||
ssh phone "source ~/.bashrc && on" &
|
||||
${pkgs.rustdesk}/bin/rustdesk --connect 100.77.80.77
|
||||
${pkgs.rustdesk}/bin/rustdesk --connect 100.88.245.227
|
||||
|
||||
elif [[ "$host" == "vnc-fwin" ]]
|
||||
then
|
||||
@@ -550,6 +552,8 @@ fileSystems."/home/me/nico" = {
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
5357 # wsdd
|
||||
1234 # for general use
|
||||
12345 # for general use
|
||||
8888 # for general usage
|
||||
9999 # for general usage
|
||||
8080 # for mitm proxy
|
||||
|
||||
8
hosts/nico/setup.sh
Executable file
8
hosts/nico/setup.sh
Executable file
@@ -0,0 +1,8 @@
|
||||
#!/bin/sh
|
||||
SRC=root//work/config-c2vi
|
||||
|
||||
# ~/.hermes link
|
||||
ln -fs ~/work/nico/hermes ~/.hermes
|
||||
|
||||
# ssh config
|
||||
ln -fs $SRC/hosts/nico/ssh_config ~/.ssh/config
|
||||
2
hosts/nico/ssh_config
Normal file
2
hosts/nico/ssh_config
Normal file
@@ -0,0 +1,2 @@
|
||||
Host *
|
||||
IdentityFile /root/work/nico/private-key
|
||||
20
hosts/te.nix
20
hosts/te.nix
@@ -60,6 +60,26 @@ in {
|
||||
size = 4 * 1024;
|
||||
}
|
||||
];
|
||||
|
||||
services.keyd = {
|
||||
enable = true;
|
||||
/*
|
||||
keyboards.bluetooth-3-0-keyboard = {
|
||||
ids = [ "05ac:0255:f22563e9" ];
|
||||
settings.main = {
|
||||
leftalt = "meta";
|
||||
leftcontrol = "leftalt";
|
||||
};
|
||||
};
|
||||
*/
|
||||
#keyboards.default.ids = [ "-05ac:0255" ]; completely disables my rebinding...... hmmmm
|
||||
keyboards.default.settings = {
|
||||
main = {
|
||||
leftalt = "leftcontrol";
|
||||
leftcontrol = "leftalt";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
boot.kernelModules = [ "usbip_core" ];
|
||||
boot.extraModprobeConfig = "options kvm_intel nested=1";
|
||||
|
||||
Reference in New Issue
Block a user