From 0b49fda0fff0b9f6278d4a2dccebb814835af806 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Wed, 21 Feb 2024 00:26:07 +0300 Subject: [PATCH] Live : Do not use GUI installer as it will not work. --- .config/linux/system/flake.nix | 2 +- .config/linux/system/host/dasha/Configuration.nix | 4 +--- .config/linux/system/host/dasha/Tablet.nix | 4 +--- .config/linux/system/host/desktop/Configuration.nix | 7 ++----- .config/linux/system/host/fsight/Configuration.nix | 4 +--- .config/linux/system/host/home/Backup.nix | 4 +--- .config/linux/system/host/home/Configuration.nix | 4 +--- .config/linux/system/host/home/GnomeRdp.nix | 4 +--- .config/linux/system/host/home/Nextcloud.nix | 4 +--- .config/linux/system/host/home/PhotosProcess.nix | 4 +--- .config/linux/system/host/home/YandexMusic.nix | 4 +--- .config/linux/system/host/laptop/Configuration.nix | 8 ++------ .config/linux/system/host/laptop/MsiKeyboard.nix | 5 ----- .config/linux/system/host/live/Configuration.nix | 4 ++++ .config/linux/system/host/work/Configuration.nix | 4 +--- .config/linux/system/host/work/Fprint.nix | 4 +--- .config/linux/system/module/AmdGpu.nix | 4 +--- .config/linux/system/module/Docker.nix | 4 +--- .config/linux/system/module/DockerRootless.nix | 4 +--- .config/linux/system/module/Ftpd.nix | 4 +--- .config/linux/system/module/Gnome.nix | 2 +- .config/linux/system/module/Powerlimit.nix | 6 ++---- .config/linux/system/module/PowersaveAmd.nix | 6 ++---- .config/linux/system/module/PowersaveIntel.nix | 6 ++---- .config/linux/system/module/Print.nix | 4 +--- .config/linux/system/module/VirtManager.nix | 11 +---------- .config/linux/system/module/common/Bootloader.nix | 4 +--- .config/linux/system/module/common/Distrobox.nix | 4 +--- .config/linux/system/module/common/Firewall.nix | 4 +--- .config/linux/system/module/common/Locale.nix | 4 +--- .config/linux/system/module/common/Network.nix | 4 +--- .config/linux/system/module/common/Package.nix | 4 +--- .config/linux/system/module/common/Root.nix | 4 +--- .config/linux/system/module/common/Sshd.nix | 4 +--- .config/linux/system/module/common/Swap.nix | 4 +--- .config/linux/system/module/common/Users.nix | 4 +--- 36 files changed, 43 insertions(+), 118 deletions(-) delete mode 100644 .config/linux/system/host/laptop/MsiKeyboard.nix diff --git a/.config/linux/system/flake.nix b/.config/linux/system/flake.nix index 9b3934b..82b007b 100644 --- a/.config/linux/system/flake.nix +++ b/.config/linux/system/flake.nix @@ -115,7 +115,7 @@ hostname = "live"; system = "x86_64-linux"; modules = [ - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix" + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" { networking.wireless.enable = nixpkgs.lib.mkForce false; } ({ pkgs, ... }: { boot.kernelPackages = nixpkgs.lib.mkForce pkgs.linuxPackages; }) ./module/Gnome.nix diff --git a/.config/linux/system/host/dasha/Configuration.nix b/.config/linux/system/host/dasha/Configuration.nix index 4afe50a..19cdab4 100644 --- a/.config/linux/system/host/dasha/Configuration.nix +++ b/.config/linux/system/host/dasha/Configuration.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{ ... }: { imports = [ ./Tablet.nix ]; diff --git a/.config/linux/system/host/dasha/Tablet.nix b/.config/linux/system/host/dasha/Tablet.nix index b5df0ae..a5e98be 100644 --- a/.config/linux/system/host/dasha/Tablet.nix +++ b/.config/linux/system/host/dasha/Tablet.nix @@ -1,5 +1,3 @@ -{ ... }: - -{ +{ ... }: { hardware.opentabletdriver.enable = true; } diff --git a/.config/linux/system/host/desktop/Configuration.nix b/.config/linux/system/host/desktop/Configuration.nix index 1e67552..dc7158b 100644 --- a/.config/linux/system/host/desktop/Configuration.nix +++ b/.config/linux/system/host/desktop/Configuration.nix @@ -1,8 +1,5 @@ -{ config, pkgs, ... }: - -{ - imports = [ - ]; +{ config, pkgs, ... }: { + imports = [ ]; # Filesystems. fileSystems."/storage/hot" = { diff --git a/.config/linux/system/host/fsight/Configuration.nix b/.config/linux/system/host/fsight/Configuration.nix index 145a246..95a39f8 100644 --- a/.config/linux/system/host/fsight/Configuration.nix +++ b/.config/linux/system/host/fsight/Configuration.nix @@ -1,6 +1,4 @@ -{ lib, ... }: - -{ +{ lib, ... }: { imports = [ ]; diff --git a/.config/linux/system/host/home/Backup.nix b/.config/linux/system/host/home/Backup.nix index d12bddd..8589c75 100644 --- a/.config/linux/system/host/home/Backup.nix +++ b/.config/linux/system/host/home/Backup.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { systemd.services.backup = { enable = true; description = "Home system backup."; diff --git a/.config/linux/system/host/home/Configuration.nix b/.config/linux/system/host/home/Configuration.nix index b2e8c6c..6575d7a 100644 --- a/.config/linux/system/host/home/Configuration.nix +++ b/.config/linux/system/host/home/Configuration.nix @@ -1,6 +1,4 @@ -{ config, pkgs, lib, ... }: - -{ +{ config, pkgs, lib, ... }: { imports = [ ./Backup.nix ./GnomeRdp.nix diff --git a/.config/linux/system/host/home/GnomeRdp.nix b/.config/linux/system/host/home/GnomeRdp.nix index 0698296..bc23f5d 100644 --- a/.config/linux/system/host/home/GnomeRdp.nix +++ b/.config/linux/system/host/home/GnomeRdp.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ openssl gnome.gnome-remote-desktop diff --git a/.config/linux/system/host/home/Nextcloud.nix b/.config/linux/system/host/home/Nextcloud.nix index 95a1fbd..6bc0ed8 100644 --- a/.config/linux/system/host/home/Nextcloud.nix +++ b/.config/linux/system/host/home/Nextcloud.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { systemd.services.nextcloud = { enable = true; description = "Nextcloud worker."; diff --git a/.config/linux/system/host/home/PhotosProcess.nix b/.config/linux/system/host/home/PhotosProcess.nix index 6ed6ac7..6cb10c4 100644 --- a/.config/linux/system/host/home/PhotosProcess.nix +++ b/.config/linux/system/host/home/PhotosProcess.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { systemd.services.photos_process = { enable = true; description = "Process uploaded photos."; diff --git a/.config/linux/system/host/home/YandexMusic.nix b/.config/linux/system/host/home/YandexMusic.nix index 425ff19..602efd7 100644 --- a/.config/linux/system/host/home/YandexMusic.nix +++ b/.config/linux/system/host/home/YandexMusic.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { systemd.services.yandex_music = { enable = true; description = "Sync music from Yandex.Music."; diff --git a/.config/linux/system/host/laptop/Configuration.nix b/.config/linux/system/host/laptop/Configuration.nix index dccc3ab..da0269b 100644 --- a/.config/linux/system/host/laptop/Configuration.nix +++ b/.config/linux/system/host/laptop/Configuration.nix @@ -1,9 +1,5 @@ -{ config, pkgs, ... }: - -{ - imports = [ - # ./MsiKeyboard.nix - ]; +{ config, pkgs, ... }: { + imports = [ ]; # Filesystems. fileSystems."/storage/hot" = { diff --git a/.config/linux/system/host/laptop/MsiKeyboard.nix b/.config/linux/system/host/laptop/MsiKeyboard.nix deleted file mode 100644 index 52ef600..0000000 --- a/.config/linux/system/host/laptop/MsiKeyboard.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ haskellPackages.msi-kb-backlit ]; -} diff --git a/.config/linux/system/host/live/Configuration.nix b/.config/linux/system/host/live/Configuration.nix index 6b39407..234feb2 100644 --- a/.config/linux/system/host/live/Configuration.nix +++ b/.config/linux/system/host/live/Configuration.nix @@ -1,3 +1,7 @@ { config, pkgs, ... }: { imports = [ ]; + + environment.systemPackages = with pkgs; [ + firefox + ]; } diff --git a/.config/linux/system/host/work/Configuration.nix b/.config/linux/system/host/work/Configuration.nix index ad53a86..6e387f7 100644 --- a/.config/linux/system/host/work/Configuration.nix +++ b/.config/linux/system/host/work/Configuration.nix @@ -1,6 +1,4 @@ -{ config, pkgs, ... }: - -{ +{ config, pkgs, ... }: { imports = [ ./Fprint.nix ]; diff --git a/.config/linux/system/host/work/Fprint.nix b/.config/linux/system/host/work/Fprint.nix index 5571757..1c2f085 100644 --- a/.config/linux/system/host/work/Fprint.nix +++ b/.config/linux/system/host/work/Fprint.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ fprintd ]; diff --git a/.config/linux/system/module/AmdGpu.nix b/.config/linux/system/module/AmdGpu.nix index 6e6b05c..d705490 100644 --- a/.config/linux/system/module/AmdGpu.nix +++ b/.config/linux/system/module/AmdGpu.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { boot.initrd.kernelModules = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ]; hardware.opengl.extraPackages = with pkgs; [ diff --git a/.config/linux/system/module/Docker.nix b/.config/linux/system/module/Docker.nix index 9070f88..ddc3bb3 100644 --- a/.config/linux/system/module/Docker.nix +++ b/.config/linux/system/module/Docker.nix @@ -1,5 +1,3 @@ -{ ... }: - -{ +{ ... }: { virtualisation.docker.enable = true; } diff --git a/.config/linux/system/module/DockerRootless.nix b/.config/linux/system/module/DockerRootless.nix index c8a7803..72ce32b 100644 --- a/.config/linux/system/module/DockerRootless.nix +++ b/.config/linux/system/module/DockerRootless.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{ ... }: { virtualisation.docker.enable = true; virtualisation.docker.rootless = { enable = true; diff --git a/.config/linux/system/module/Ftpd.nix b/.config/linux/system/module/Ftpd.nix index 91523e0..a589111 100644 --- a/.config/linux/system/module/Ftpd.nix +++ b/.config/linux/system/module/Ftpd.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{ ... }: { services.vsftpd = { enable = true; anonymousUser = true; diff --git a/.config/linux/system/module/Gnome.nix b/.config/linux/system/module/Gnome.nix index 8f87026..41a6264 100644 --- a/.config/linux/system/module/Gnome.nix +++ b/.config/linux/system/module/Gnome.nix @@ -43,7 +43,7 @@ in { # Sound. sound.enable = true; - hardware.pulseaudio.enable = lib.mkForce false; + hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/.config/linux/system/module/Powerlimit.nix b/.config/linux/system/module/Powerlimit.nix index 29c6fd1..a707b47 100644 --- a/.config/linux/system/module/Powerlimit.nix +++ b/.config/linux/system/module/Powerlimit.nix @@ -1,9 +1,7 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { systemd.services.powerlimit = { - enable = true; description = "Limit battery charge."; + enable = true; serviceConfig = { Type = "simple"; RemainAfterExit = "yes"; diff --git a/.config/linux/system/module/PowersaveAmd.nix b/.config/linux/system/module/PowersaveAmd.nix index 2cfcf07..27f41d1 100644 --- a/.config/linux/system/module/PowersaveAmd.nix +++ b/.config/linux/system/module/PowersaveAmd.nix @@ -1,9 +1,7 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { systemd.services.powersave = { - enable = true; description = "AMD disable Boost"; + enable = true; serviceConfig = { Type = "simple"; RemainAfterExit = "yes"; diff --git a/.config/linux/system/module/PowersaveIntel.nix b/.config/linux/system/module/PowersaveIntel.nix index 6c62065..50c57f0 100644 --- a/.config/linux/system/module/PowersaveIntel.nix +++ b/.config/linux/system/module/PowersaveIntel.nix @@ -1,9 +1,7 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { systemd.services.powersave = { - enable = true; description = "Intel disable Boost"; + enable = true; serviceConfig = { Type = "simple"; RemainAfterExit = "yes"; diff --git a/.config/linux/system/module/Print.nix b/.config/linux/system/module/Print.nix index 85c4e76..6c8ab38 100644 --- a/.config/linux/system/module/Print.nix +++ b/.config/linux/system/module/Print.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{ ... }: { services.printing = { enable = true; clientConf = '' diff --git a/.config/linux/system/module/VirtManager.nix b/.config/linux/system/module/VirtManager.nix index 9504c82..aee895a 100644 --- a/.config/linux/system/module/VirtManager.nix +++ b/.config/linux/system/module/VirtManager.nix @@ -1,13 +1,4 @@ -{ pkgs, ... }: - -# File (in the menu bar) -> Add connection -# -# HyperVisor = QEMU/KVM -# Autoconnect = checkmark -# -# Connect - -{ +{ pkgs, ... }: { virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; } diff --git a/.config/linux/system/module/common/Bootloader.nix b/.config/linux/system/module/common/Bootloader.nix index 96381f6..49cd2ce 100644 --- a/.config/linux/system/module/common/Bootloader.nix +++ b/.config/linux/system/module/common/Bootloader.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{ ... }: { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; } diff --git a/.config/linux/system/module/common/Distrobox.nix b/.config/linux/system/module/common/Distrobox.nix index 9bba5a1..092b37d 100644 --- a/.config/linux/system/module/common/Distrobox.nix +++ b/.config/linux/system/module/common/Distrobox.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ distrobox ]; diff --git a/.config/linux/system/module/common/Firewall.nix b/.config/linux/system/module/common/Firewall.nix index 390d07b..9c6bfc8 100644 --- a/.config/linux/system/module/common/Firewall.nix +++ b/.config/linux/system/module/common/Firewall.nix @@ -1,5 +1,3 @@ -{ ... }: - -{ +{ ... }: { networking.firewall.enable = false; } diff --git a/.config/linux/system/module/common/Locale.nix b/.config/linux/system/module/common/Locale.nix index d77b29e..aa51a74 100644 --- a/.config/linux/system/module/common/Locale.nix +++ b/.config/linux/system/module/common/Locale.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{ ... }: { time.timeZone = "Europe/Moscow"; i18n.defaultLocale = "en_US.UTF-8"; i18n.extraLocaleSettings = { diff --git a/.config/linux/system/module/common/Network.nix b/.config/linux/system/module/common/Network.nix index 2db5041..a6a5e28 100644 --- a/.config/linux/system/module/common/Network.nix +++ b/.config/linux/system/module/common/Network.nix @@ -1,5 +1,3 @@ -{ ... }: - -{ +{ ... }: { networking.networkmanager.enable = true; } diff --git a/.config/linux/system/module/common/Package.nix b/.config/linux/system/module/common/Package.nix index 0fbada7..07f7cbd 100644 --- a/.config/linux/system/module/common/Package.nix +++ b/.config/linux/system/module/common/Package.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ android-tools appimage-run diff --git a/.config/linux/system/module/common/Root.nix b/.config/linux/system/module/common/Root.nix index 82337cb..30144b2 100644 --- a/.config/linux/system/module/common/Root.nix +++ b/.config/linux/system/module/common/Root.nix @@ -1,5 +1,3 @@ -{ specialArgs, ... }: - -{ +{ specialArgs, ... }: { users.users.root.hashedPassword = specialArgs.const.hashedPassword; } diff --git a/.config/linux/system/module/common/Sshd.nix b/.config/linux/system/module/common/Sshd.nix index e0b7373..8a52ad9 100644 --- a/.config/linux/system/module/common/Sshd.nix +++ b/.config/linux/system/module/common/Sshd.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{ ... }: { services.openssh = { enable = true; allowSFTP = true; diff --git a/.config/linux/system/module/common/Swap.nix b/.config/linux/system/module/common/Swap.nix index 8eb4a44..24b1318 100644 --- a/.config/linux/system/module/common/Swap.nix +++ b/.config/linux/system/module/common/Swap.nix @@ -1,5 +1,3 @@ -{ ... }: - -{ +{ ... }: { zramSwap.enable = true; } diff --git a/.config/linux/system/module/common/Users.nix b/.config/linux/system/module/common/Users.nix index a9d193f..8973bbe 100644 --- a/.config/linux/system/module/common/Users.nix +++ b/.config/linux/system/module/common/Users.nix @@ -1,5 +1,3 @@ -{ ... }: - -{ +{ ... }: { users.mutableUsers = false; }