diff --git a/.config/linux/system/flake.nix b/.config/linux/system/flake.nix index f489fe7..08bb2ff 100644 --- a/.config/linux/system/flake.nix +++ b/.config/linux/system/flake.nix @@ -112,6 +112,8 @@ system = "x86_64-linux"; modules = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + { networking.networkmanager.enable = nixpkgs.lib.mkForce false; } + ({ pkgs, ... }: { boot.kernelPackages = nixpkgs.lib.mkForce pkgs.linuxPackages; }) ./module/Gnome.nix ]; }; diff --git a/.config/linux/system/host/live/Configuration.nix b/.config/linux/system/host/live/Configuration.nix index 91cbd9e..6b39407 100644 --- a/.config/linux/system/host/live/Configuration.nix +++ b/.config/linux/system/host/live/Configuration.nix @@ -1,6 +1,3 @@ -{ config, pkgs, ... }: - -{ - imports = [ - ]; +{ config, pkgs, ... }: { + imports = [ ]; } diff --git a/.config/linux/system/host/live/HardwareConfiguration.nix b/.config/linux/system/host/live/HardwareConfiguration.nix index 04618ac..4b2c5c4 100644 --- a/.config/linux/system/host/live/HardwareConfiguration.nix +++ b/.config/linux/system/host/live/HardwareConfiguration.nix @@ -1,4 +1,2 @@ -{ ... }: - -{ +{ ... }: { } diff --git a/.config/linux/system/module/Flatpak.nix b/.config/linux/system/module/Flatpak.nix index 6b82127..3ccca67 100644 --- a/.config/linux/system/module/Flatpak.nix +++ b/.config/linux/system/module/Flatpak.nix @@ -1,5 +1,19 @@ -{ ... }: - -{ +{ ... }: let + list = "~/.config/linux/Flatpak.txt"; +in { + # Enable Flatpaks. services.flatpak.enable = true; + + # Bootstrap apps on boot. + systemd.services.flatpakinstall = { + description = "Install Flatpak apps."; + wantedBy = [ "graphical-session-pre.target" ]; + wants = [ "dotfiles.service" ]; + after = [ "dotfiles.service" ]; + serviceConfig.Type = "oneshot"; + script = '' + ${pkgs.flatpak}/bin/flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + for app in $(cat ${list} | cut -f2) + ''; + }; } diff --git a/.config/linux/system/module/common/Kernel.nix b/.config/linux/system/module/common/Kernel.nix index 72e419c..f8b242f 100644 --- a/.config/linux/system/module/common/Kernel.nix +++ b/.config/linux/system/module/common/Kernel.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: - -{ +{ pkgs, ... }: { # Use latest kernel. boot.kernelPackages = pkgs.linuxPackages_latest;