AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Dmitriy Kholkin 2021-06-27 20:44:49 +03:00
parent dc5b3c7285
commit 32c30aae88
5 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install/install-btrfs.sh
View File

@ -4,10 +4,10 @@
set -e set -e
CONFIG_FOLDER="$(dirname "$(pwd)")" CONFIG_FOLDER="$(dirname "$(pwd)")"
DEVICE_NAME=NixOS-VM DEVICE_NAME=Dell-Laptop
MAX_JOBS=4 MAX_JOBS=8
SWAP_SIZE=2GiB SWAP_SIZE=8GiB
NIXOS_COMMIT="432fc2d9a67f92e05438dff5fdc2b39d33f77997" NIXOS_COMMIT="1905f5f2e55e0db0bb6244cfe62cb6c0dbda391d"
USE_ECNRYPTION=false USE_ECNRYPTION=false
clean_stdin() { clean_stdin() {
@ -239,4 +239,4 @@ fi
pprint "Copy config to destination system" pprint "Copy config to destination system"
mkdir -p /mnt/home/alukard/nixos-config mkdir -p /mnt/home/alukard/nixos-config
cp -aT $CONFIG_FOLDER /mnt/home/alukard/nixos-config cp -aT $CONFIG_FOLDER /mnt/home/alukard/nixos-config

47
machines/Dell-Laptop/hardware-configuration.nix
View File

@ -8,56 +8,55 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "rpool/system/root"; { device = "/dev/disk/by-uuid/27bedbc3-b6c7-43b1-ba60-792a755ba01f";
fsType = "zfs"; fsType = "btrfs";
options = [ "subvol=nixos" "compress-force=zstd" "noatime" "autodefrag" "ssd" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "rpool/local/nix"; { device = "/dev/disk/by-uuid/27bedbc3-b6c7-43b1-ba60-792a755ba01f";
fsType = "zfs"; fsType = "btrfs";
}; options = [ "subvol=nix" "compress-force=zstd" "noatime" "autodefrag" "ssd" ];
fileSystems."/var" =
{ device = "rpool/system/var";
fsType = "zfs";
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "rpool/user/home"; { device = "/dev/disk/by-uuid/27bedbc3-b6c7-43b1-ba60-792a755ba01f";
fsType = "zfs"; fsType = "btrfs";
options = [ "subvol=home" "compress-force=zstd" "noatime" "autodefrag" "ssd" ];
}; };
fileSystems."/bittorrent" = fileSystems."/var" =
{ device = "rpool/local/bittorrent"; { device = "/dev/disk/by-uuid/27bedbc3-b6c7-43b1-ba60-792a755ba01f";
fsType = "zfs"; fsType = "btrfs";
options = [ "subvol=var" "compress-force=zstd" "noatime" "autodefrag" "ssd" ];
}; };
fileSystems."/home/alukard/.libvirt" = fileSystems."/media/bittorrent" =
{ device = "rpool/local/libvirt"; { device = "/dev/disk/by-uuid/27bedbc3-b6c7-43b1-ba60-792a755ba01f";
fsType = "zfs"; fsType = "btrfs";
options = [ "subvol=bittorrent" "nodatacow" "ssd" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/4F6D-537A"; { device = "/dev/disk/by-uuid/B0FE-7362";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ swapDevices = [
{ {
device = "/dev/disk/by-partuuid/3043db40-1d67-47f0-b6d6-d8f1a68b47c6"; device = "/dev/disk/by-partuuid/bd1405c3-eab1-465e-a83b-0781b430a5bb";
randomEncryption.enable = true; randomEncryption.enable = true;
} }
]; ];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
networking.hostId = "d107d6c6"; networking.hostId = "3efba84e";
boot.zfs.devNodes = "/dev/disk/by-partuuid/8454c73b-e50a-407c-86d7-e970d0fdb09e"; boot.initrd.supportedFilesystems = [ "btrfs" ];
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "btrfs" ];
boot.kernelParams = [ "zfs.zfs_arc_max=4294967296" ];
} }

BIN
misc/Passwords.kdbx Executable file → Normal file
View File

Binary file not shown.

3
modules/applications/spotify/default.nix
View File

@ -45,6 +45,7 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" "sound.target" ]; after = [ "network-online.target" "sound.target" ];
partOf = [ "pulseeffects.service" ]; partOf = [ "pulseeffects.service" ];
path = [ pkgs.zsh pkgs.pass-nodmenu ];
serviceConfig = { serviceConfig = {
ExecStart = ExecStart =
"${cfg.package}/bin/spotifyd --no-daemon --config-path ${configFile}"; "${cfg.package}/bin/spotifyd --no-daemon --config-path ${configFile}";
@ -65,7 +66,7 @@ in {
settings = { settings = {
global = { global = {
username = "alukard.files@gmail.com"; username = "alukard.files@gmail.com";
password_cmd = "${pkgs.coreutils}/bin/cat ${config.secrets.spotify.decrypted}"; password_cmd = "pass spotify";
backend = "pulseaudio"; backend = "pulseaudio";
volume_controller = "softvol"; volume_controller = "softvol";
device_name = "nix"; device_name = "nix";

11
modules/services.nix
View File

@ -4,6 +4,7 @@ with config.deviceSpecific; {
services.acpid.enable = true; services.acpid.enable = true;
services.acpid.logEvents = false; services.acpid.logEvents = false;
hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
services.redshift = { services.redshift = {
@ -69,11 +70,11 @@ with config.deviceSpecific; {
}; };
}; };
services.undervolt = lib.mkIf (config.device == "Dell-Laptop") { # services.undervolt = lib.mkIf (config.device == "Dell-Laptop") {
enable = true; # enable = true;
coreOffset = -110; # -120 # coreOffset = -110; # -120
gpuOffset = -46; # -54 # gpuOffset = -46; # -54
}; # };
services.thermald.enable = isLaptop; services.thermald.enable = isLaptop;
} }