forked from jan-leila/nix-config
Merge remote-tracking branch 'leyla'
This commit is contained in:
commit
8b3e0e296e
25 changed files with 449 additions and 89 deletions
|
|
@ -18,9 +18,7 @@ in {
|
|||
home.packages = lib.lists.optionals userConfig.isDesktopUser (
|
||||
with pkgs; [
|
||||
ungoogled-chromium
|
||||
krita
|
||||
gnomeExtensions.dash-to-panel
|
||||
(lib.mkIf hardware.piperMouse.enable piper)
|
||||
]
|
||||
);
|
||||
|
||||
|
|
@ -61,6 +59,8 @@ in {
|
|||
makemkv.enable = true;
|
||||
signal-desktop-bin.enable = true;
|
||||
steam.enable = true;
|
||||
piper.enable = hardware.piperMouse.enable;
|
||||
krita.enable = true;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ in {
|
|||
protonvpn-gui.enable = true;
|
||||
dbeaver-bin.enable = true;
|
||||
bruno.enable = true;
|
||||
piper.enable = hardware.piperMouse.enable;
|
||||
})
|
||||
(lib.mkIf (hardware.directAccess.enable && config.user.isDesktopUser) {
|
||||
anki.enable = true;
|
||||
|
|
@ -48,6 +49,7 @@ in {
|
|||
vscode.enable = true;
|
||||
firefox.enable = true;
|
||||
steam.enable = true;
|
||||
krita.enable = true;
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
@ -76,7 +78,6 @@ in {
|
|||
libreoffice
|
||||
inkscape
|
||||
gimp
|
||||
krita
|
||||
freecad
|
||||
# cura
|
||||
# kicad-small
|
||||
|
|
@ -105,7 +106,6 @@ in {
|
|||
noisetorch
|
||||
|
||||
# hardware management tools
|
||||
(lib.mkIf hardware.piperMouse.enable piper)
|
||||
(lib.mkIf hardware.openRGB.enable openrgb)
|
||||
(lib.mkIf hardware.viaKeyboard.enable via)
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ in {
|
|||
tauriVscode.enable = true;
|
||||
vscodeEslint.enable = true;
|
||||
vscodeJest.enable = true;
|
||||
vitest.enable = true;
|
||||
vscodeStandard.enable = true;
|
||||
vscodeStylelint.enable = true;
|
||||
|
||||
|
|
@ -67,7 +68,13 @@ in {
|
|||
go.enable = true;
|
||||
|
||||
# claude development
|
||||
claudeDev.enable = ai-tooling-enabled;
|
||||
claudeDev = lib.mkIf ai-tooling-enabled {
|
||||
enable = true;
|
||||
mcp = {
|
||||
nixos.enable = true;
|
||||
eslint.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# misc extensions
|
||||
evenBetterToml.enable = true;
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@
|
|||
extensions = {
|
||||
sonos.enable = true;
|
||||
jellyfin.enable = true;
|
||||
wyoming.enable = true;
|
||||
wyoming.enable = false; # Temporarily disabled due to dependency conflict in wyoming-piper
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
# Enable this if you have graphical corruption issues or application crashes after waking
|
||||
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
|
||||
# of just the bare essentials.
|
||||
powerManagement.enable = false;
|
||||
powerManagement.enable = true;
|
||||
|
||||
# Fine-grained power management. Turns off GPU when not in use.
|
||||
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
||||
|
|
|
|||
|
|
@ -135,6 +135,9 @@
|
|||
};
|
||||
};
|
||||
|
||||
# Enable network-online.target for better network dependency handling
|
||||
systemd.services.NetworkManager-wait-online.enable = true;
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,5 +3,6 @@
|
|||
imports = [
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
# ./network-mount.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
76
configurations/nixos/horizon/network-mount.nix
Normal file
76
configurations/nixos/horizon/network-mount.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{...}: {
|
||||
boot.supportedFilesystems = ["nfs"];
|
||||
|
||||
fileSystems = {
|
||||
"/mnt/leyla_documents" = {
|
||||
device = "defiant:/exports/leyla_documents";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"soft"
|
||||
"intr" # Allow interruption of NFS calls
|
||||
"timeo=30" # 3 second timeout (30 deciseconds)
|
||||
"retrans=2" # Only 2 retries before giving up
|
||||
"x-systemd.idle-timeout=300" # 5 minute idle timeout for mobile
|
||||
"x-systemd.device-timeout=15" # 15 second device timeout
|
||||
"bg" # Background mount - don't block boot
|
||||
"fsc" # Enable caching
|
||||
"_netdev" # Network device - wait for network
|
||||
"x-systemd.requires=network-online.target" # Require network to be online
|
||||
"x-systemd.after=network-online.target" # Start after network is online
|
||||
"x-systemd.mount-timeout=30" # 30 second mount timeout
|
||||
];
|
||||
};
|
||||
|
||||
"/mnt/users_documents" = {
|
||||
device = "defiant:/exports/users_documents";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"nofail"
|
||||
"soft"
|
||||
"intr"
|
||||
"timeo=30"
|
||||
"retrans=2"
|
||||
"x-systemd.idle-timeout=300"
|
||||
"x-systemd.device-timeout=15"
|
||||
"bg"
|
||||
"fsc"
|
||||
"_netdev"
|
||||
"x-systemd.requires=network-online.target"
|
||||
"x-systemd.after=network-online.target"
|
||||
"x-systemd.mount-timeout=30"
|
||||
];
|
||||
};
|
||||
|
||||
"/mnt/media" = {
|
||||
device = "defiant:/exports/media";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"soft"
|
||||
"intr"
|
||||
"timeo=30"
|
||||
"retrans=2"
|
||||
"x-systemd.idle-timeout=300"
|
||||
"x-systemd.device-timeout=15"
|
||||
"bg"
|
||||
# Mobile-optimized read settings
|
||||
"rsize=8192" # Smaller read size for mobile
|
||||
"wsize=8192" # Smaller write size for mobile
|
||||
"fsc"
|
||||
"_netdev"
|
||||
"x-systemd.requires=network-online.target"
|
||||
"x-systemd.after=network-online.target"
|
||||
"x-systemd.mount-timeout=30"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -131,58 +131,8 @@
|
|||
syncthing.enable = true;
|
||||
};
|
||||
|
||||
boot.supportedFilesystems = ["nfs"];
|
||||
|
||||
fileSystems = {
|
||||
"/mnt/leyla_documents" = {
|
||||
device = "defiant:/exports/leyla_documents";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"user"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"soft"
|
||||
"x-systemd.idle-timeout=600"
|
||||
"fsc"
|
||||
];
|
||||
};
|
||||
|
||||
"/mnt/users_documents" = {
|
||||
device = "defiant:/exports/users_documents";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"user"
|
||||
"nofail"
|
||||
"soft"
|
||||
"x-systemd.idle-timeout=600"
|
||||
"fsc"
|
||||
];
|
||||
};
|
||||
|
||||
"/mnt/media" = {
|
||||
device = "defiant:/exports/media";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"user"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"soft"
|
||||
"x-systemd.idle-timeout=600"
|
||||
"noatime"
|
||||
"nodiratime"
|
||||
"relatime"
|
||||
"rsize=32768"
|
||||
"wsize=32768"
|
||||
"fsc"
|
||||
];
|
||||
};
|
||||
};
|
||||
# Enable network-online.target for better network dependency handling
|
||||
systemd.services.NetworkManager-wait-online.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
cachefilesd
|
||||
|
|
|
|||
|
|
@ -4,5 +4,6 @@
|
|||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
./nvidia-drivers.nix
|
||||
# ./network-mount.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
72
configurations/nixos/twilight/network-mount.nix
Normal file
72
configurations/nixos/twilight/network-mount.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{...}: {
|
||||
boot.supportedFilesystems = ["nfs"];
|
||||
|
||||
fileSystems = {
|
||||
"/mnt/leyla_documents" = {
|
||||
device = "defiant:/exports/leyla_documents";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"soft"
|
||||
"intr" # Allow interruption of NFS calls
|
||||
"timeo=50" # 5 second timeout (50 deciseconds) - longer than mobile
|
||||
"retrans=3" # 3 retries for desktop
|
||||
"x-systemd.idle-timeout=600" # 10 minute idle timeout for desktop
|
||||
"x-systemd.device-timeout=30" # 30 second device timeout
|
||||
"bg" # Background mount - don't block boot
|
||||
"fsc" # Enable caching
|
||||
"_netdev" # Network device - wait for network
|
||||
"x-systemd.requires=network-online.target" # Require network to be online
|
||||
"x-systemd.after=network-online.target" # Start after network is online
|
||||
];
|
||||
};
|
||||
|
||||
"/mnt/users_documents" = {
|
||||
device = "defiant:/exports/users_documents";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"nofail"
|
||||
"soft"
|
||||
"intr"
|
||||
"timeo=50"
|
||||
"retrans=3"
|
||||
"x-systemd.idle-timeout=600"
|
||||
"bg"
|
||||
"fsc"
|
||||
"_netdev"
|
||||
"x-systemd.requires=network-online.target"
|
||||
"x-systemd.after=network-online.target"
|
||||
];
|
||||
};
|
||||
|
||||
"/mnt/media" = {
|
||||
device = "defiant:/exports/media";
|
||||
fsType = "nfs";
|
||||
options = [
|
||||
"x-systemd.automount"
|
||||
"noauto"
|
||||
"noatime"
|
||||
"nofail"
|
||||
"soft"
|
||||
"intr"
|
||||
"timeo=50"
|
||||
"retrans=3"
|
||||
"x-systemd.idle-timeout=600"
|
||||
"x-systemd.device-timeout=30"
|
||||
"bg"
|
||||
# Desktop-optimized read settings
|
||||
"rsize=32768" # Larger read size for desktop
|
||||
"wsize=32768" # Larger write size for desktop
|
||||
"fsc"
|
||||
"_netdev"
|
||||
"x-systemd.requires=network-online.target"
|
||||
"x-systemd.after=network-online.target"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
# Enable this if you have graphical corruption issues or application crashes after waking
|
||||
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
|
||||
# of just the bare essentials.
|
||||
powerManagement.enable = false;
|
||||
powerManagement.enable = true;
|
||||
|
||||
# Fine-grained power management. Turns off GPU when not in use.
|
||||
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue