summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/desktop/configuration.nix30
-rw-r--r--hosts/desktop/disko.nix30
-rw-r--r--hosts/desktop/home.nix26
-rw-r--r--hosts/thinkpad/configuration.nix20
-rw-r--r--hosts/thinkpad/disko.nix12
-rw-r--r--hosts/thinkpad/home.nix10
6 files changed, 55 insertions, 73 deletions
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 50fb2c9..42be28c 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -2,6 +2,7 @@
config,
inputs,
username,
+ pkgs,
...
}:
{
@@ -48,10 +49,7 @@
};
locale.enable = true;
memory = {
- zram = {
- enable = true;
- percent = 25;
- };
+ zram.enable = true;
swapfile = {
enable = true;
size = 32;
@@ -64,26 +62,18 @@
users.enable = true;
};
srv = {
- sops.enable = true;
- syncthing.enable = true;
- files = {
- thunar.enable = true;
- krusader.enable = true;
- utils.enable = true;
- };
+ files.enable = true;
gaming = {
enable = true;
steam.enable = true;
- vr.enable = true;
};
virtualization.enable = true;
+ kdeconnect.enable = true;
nix-helper.enable = true;
ollama.enable = true;
- kdeconnect.enable = true;
- monero = {
- enable = true;
- # service.enable = true;
- };
+ monero.enable = true;
+ sops.enable = true;
+ syncthing.enable = true;
};
wm = {
enable = true;
@@ -91,6 +81,12 @@
};
};
+ programs.wireshark = {
+ enable = true;
+ package = pkgs.wireshark;
+ };
+ users.users.adam.extraGroups = [ "wireshark" ];
+
boot = {
kernelModules = [ "nct6687" ];
extraModulePackages = [
diff --git a/hosts/desktop/disko.nix b/hosts/desktop/disko.nix
index 86d1e71..93941e9 100644
--- a/hosts/desktop/disko.nix
+++ b/hosts/desktop/disko.nix
@@ -31,7 +31,6 @@
mountpoint = "/";
mountOptions = [
"compress=zstd:1"
- "space_cache=v2"
"discard=async"
"noatime"
];
@@ -40,56 +39,70 @@
mountpoint = "/nix";
mountOptions = [
"compress=zstd:1"
+ "discard=async"
"nodev"
+ "noatime"
];
};
"home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd:1"
+ "discard=async"
"nosuid"
"nodev"
+ "noatime"
];
};
"log" = {
mountpoint = "/var/log";
mountOptions = [
"compress=zstd:1"
+ "discard=async"
"nosuid"
"nodev"
+ "noatime"
];
};
"games" = {
mountpoint = "/games";
mountOptions = [
"compress=none"
+ "discard=async"
"nosuid"
"nodev"
+ "noatime"
];
};
"llms" = {
mountpoint = "/llms";
mountOptions = [
"compress=none"
+ "discard=async"
"nodatacow"
"nosuid"
"nodev"
+ "noatime"
];
};
"vms" = {
mountpoint = "/vms";
mountOptions = [
"compress=none"
+ "discard=async"
"nodatacow"
"nosuid"
"nodev"
+ "noatime"
];
};
"swap" = {
mountpoint = "/.swapvol";
mountOptions = [
"compress=none"
+ "discard=async"
"nodatacow"
+ "noatime"
];
};
};
@@ -119,9 +132,10 @@
mountpoint = "/storage/archive";
mountOptions = [
"compress=zstd:1"
- "autodefrag"
"nosuid"
"nodev"
+ "noatime"
+
"nofail"
"x-systemd.device-timeout=5s"
];
@@ -130,9 +144,10 @@
mountpoint = "/storage/movies";
mountOptions = [
"compress=none"
- "autodefrag"
"nosuid"
"nodev"
+ "noatime"
+
"nofail"
"x-systemd.device-timeout=5s"
];
@@ -141,9 +156,10 @@
mountpoint = "/storage/anime";
mountOptions = [
"compress=none"
- "autodefrag"
"nosuid"
"nodev"
+ "noatime"
+
"nofail"
"x-systemd.device-timeout=5s"
];
@@ -152,9 +168,10 @@
mountpoint = "/storage/pics";
mountOptions = [
"compress=none"
- "autodefrag"
"nosuid"
"nodev"
+ "noatime"
+
"nofail"
"x-systemd.device-timeout=5s"
];
@@ -163,9 +180,10 @@
mountpoint = "/storage/vids";
mountOptions = [
"compress=none"
- "autodefrag"
"nosuid"
"nodev"
+ "noatime"
+
"nofail"
"x-systemd.device-timeout=5s"
];
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index ba5777a..8211143 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,8 +1,4 @@
-{
- username,
- pkgs,
- ...
-}:
+{ username, ... }:
{
imports = [ ../../hm/default.nix ];
@@ -21,7 +17,7 @@
git.enable = true;
xdg-dirs = {
enable = true;
- mediaPath = /storage;
+ storagePath = /storage;
};
xdg-mime.enable = true;
};
@@ -63,22 +59,4 @@
yt-dlp.enable = true;
};
};
-
- home.packages = with pkgs; [
- sweethome3d.application
- sweethome3d.furniture-editor
- czkawka
- ];
-
- xdg.mimeApps = {
- enable = true;
- defaultApplications = {
- "x-scheme-handler/terminal" = [ "foot.desktop" ];
- "inode/directory" = [ "thunar.desktop" ];
- };
- };
-
- home.sessionVariables = {
- XDG_UTILS_TERMINAL = "foot";
- };
}
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index d58858a..21fc467 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -25,6 +25,7 @@
type = "grub";
efi = false;
timeout = 0;
+ grub.device = "/dev/nvme0n1";
luks.enable = true;
};
drivers = {
@@ -41,14 +42,8 @@
};
locale.enable = true;
memory = {
- zram = {
- enable = true;
- percent = 25;
- };
- swapfile = {
- enable = true;
- size = 8;
- };
+ zram.enable = true;
+ swapfile.enable = true;
};
network.enable = true;
power = {
@@ -62,13 +57,14 @@
};
srv = {
bluetooth.enable = true;
- files = {
- thunar.enable = true;
- utils.enable = true;
- };
+ files.enable = true;
+ gaming.enable = true;
+ virtualization.enable = true;
kdeconnect.enable = true;
nix-helper.enable = true;
monero.enable = true;
+ sops.enable = true;
+ syncthing.enable = true;
};
wm = {
enable = true;
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index 8b41240..b5ccdc1 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -34,7 +34,6 @@
mountpoint = "/";
mountOptions = [
"compress=zstd:1"
- "space_cache=v2"
"discard=async"
"noatime"
];
@@ -43,7 +42,6 @@
mountpoint = "/nix";
mountOptions = [
"compress=zstd:1"
- "space_cache=v2"
"discard=async"
"nodev"
"noatime"
@@ -53,7 +51,6 @@
mountpoint = "/home";
mountOptions = [
"compress=zstd:1"
- "space_cache=v2"
"discard=async"
"nosuid"
"nodev"
@@ -64,7 +61,6 @@
mountpoint = "/var/log";
mountOptions = [
"compress=zstd:1"
- "space_cache=v2"
"discard=async"
"nosuid"
"nodev"
@@ -75,7 +71,6 @@
mountpoint = "/games";
mountOptions = [
"compress=none"
- "space_cache=v2"
"discard=async"
"nosuid"
"nodev"
@@ -86,7 +81,6 @@
mountpoint = "/vms";
mountOptions = [
"compress=none"
- "space_cache=v2"
"discard=async"
"nodatacow"
"nosuid"
@@ -98,7 +92,6 @@
mountpoint = "/.swapvol";
mountOptions = [
"compress=none"
- "space_cache=v2"
"discard=async"
"nodatacow"
"noatime"
@@ -132,7 +125,6 @@
mountpoint = "/storage/archive";
mountOptions = [
"compress=zstd:1"
- "space_cache=v2"
"discard=async"
"nosuid"
"nodev"
@@ -146,7 +138,6 @@
mountpoint = "/storage/movies";
mountOptions = [
"compress=none"
- "space_cache=v2"
"discard=async"
"nosuid"
"nodev"
@@ -160,7 +151,6 @@
mountpoint = "/storage/anime";
mountOptions = [
"compress=none"
- "space_cache=v2"
"discard=async"
"nosuid"
"nodev"
@@ -174,7 +164,6 @@
mountpoint = "/storage/pics";
mountOptions = [
"compress=none"
- "space_cache=v2"
"discard=async"
"nosuid"
"nodev"
@@ -188,7 +177,6 @@
mountpoint = "/storage/vids";
mountOptions = [
"compress=none"
- "space_cache=v2"
"discard=async"
"nosuid"
"nodev"
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
index 78a39d9..3a8215d 100644
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -15,7 +15,11 @@
backend = "wayland";
};
git.enable = true;
- xdg-dirs.enable = true;
+ xdg-dirs = {
+ enable = true;
+ storagePath = /storage;
+ };
+ xdg-mime.enable = true;
};
editors.nixvim.enable = true;
env = {
@@ -36,10 +40,12 @@
starship.enable = true;
};
soft = {
- browser.brave.enable = true;
+ browser.librewolf.enable = true;
+ email.thunderbird.enable = true;
media.enable = true;
mpv.enable = true;
nixcord.enable = true;
+ onlyoffice.enable = true;
obsidian.enable = true;
spicetify.enable = true;
torrent.enable = true;
generated by cgit v1.3 (git 2.53.0) at 2026-08-17 03:40:36 +0000