removed superfluous mounts

This commit is contained in:
Till 2023-12-03 01:12:50 +01:00
parent 78df432759
commit cd15174cd6
4 changed files with 24 additions and 33 deletions

View file

@ -22,6 +22,7 @@ in
xdg.configFile."khal/config".source = ./khal.config; xdg.configFile."khal/config".source = ./khal.config;
services.vdirsyncer.enable = true; services.vdirsyncer.enable = true;
programs.vdirsyncer.enable = true; programs.vdirsyncer.enable = true;
# programs.khal = { # programs.khal = {
# enable = true; # enable = true;
# locale = { # locale = {

View file

@ -98,6 +98,7 @@
castget castget
freetube freetube
qbittorrent qbittorrent
mindustry
rhythmbox rhythmbox
vlc vlc
yt-dlp yt-dlp

View file

@ -44,7 +44,7 @@ nnoremap <c-l> <c-w>l
nnoremap <c-q> :hide<return> nnoremap <c-q> :hide<return>
nnoremap <leader>m :make<return> nnoremap <leader>m :make<return>
nnoremap <leader>M :!home-manager --flake ~/omniflake switch<return> nnoremap <leader>M :!home-manager --flake ~/.config/omniflake switch<return>
tnoremap <esc> <c-\><c-n> tnoremap <esc> <c-\><c-n>

View file

@ -1,9 +1,14 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
let
subvolume = {
device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs";
};
in
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
@ -15,36 +20,27 @@
allowDiscards = true; allowDiscards = true;
}; };
fileSystems."/" = { fileSystems."/" = subvolume // {
device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" "discard=async" ]; options = [ "subvol=root" "compress=zstd" "discard=async" ];
}; };
fileSystems."/home" = { # the following subvolumes are automatically mounted and won't be snapshotted:
device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; # /home/till/.local/share/Steam
fsType = "btrfs"; # /home/till/.cache
options = [ "subvol=home" "compress=zstd" "discard=async" ]; # /home/till/tmp
};
fileSystems."/home/till/.local/share/Steam" = { # todo:
device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; # /home/till/.mozilla/firefox
fsType = "btrfs"; # /home/till/.config/Mattermost/Cache
options = [ "subvol=home/till/.local/share/Steam" "compress=zstd" "discard=async" ];
};
fileSystems."/home/till/.cache" = { fileSystems."/nix" = subvolume // {
device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs";
options = [ "subvol=home/till/.cache" "compress=zstd" "discard=async" ];
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs";
options = [ "subvol=nix" "compress=zstd" "noatime" "discard=async" ]; options = [ "subvol=nix" "compress=zstd" "noatime" "discard=async" ];
}; };
fileSystems."/home" = subvolume // {
options = [ "subvol=home" "compress=zstd" "discard=async" ];
};
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/7362-C4C4"; device = "/dev/disk/by-uuid/7362-C4C4";
fsType = "vfat"; fsType = "vfat";
@ -55,18 +51,11 @@
size = 8 * 1045; size = 8 * 1045;
}]; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.trackpoint.enable = true; hardware.trackpoint.enable = true;
boot.kernelParams = [ "psmouse.elantech_smbus=0" ]; boot.kernelParams = [ "psmouse.elantech_smbus=0" ];