From c3ebc2312b1ededaf8df45514f41ef9606f165af Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Tue, 14 May 2024 07:30:11 -0300 Subject: [PATCH 1/3] Add nextcloud to installed apps --- nixos/configuration.nix | 1 + nixos/kde-desktop.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 5ccd3b3..b941168 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -114,6 +114,7 @@ PermitRootLogin = "no"; # Use keys only. Remove if you want to SSH using password (not recommended) PasswordAuthentication = true; + AllowUsers = [ "traverseda" ]; }; }; diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix index f2ef9ab..ffde716 100644 --- a/nixos/kde-desktop.nix +++ b/nixos/kde-desktop.nix @@ -35,6 +35,7 @@ pkgs.inkscape pkgs.gimp pkgs.krita + pkgs.nextcloud-client ]; programs.firefox = { From 8409aec6883fe5e477c233df68c64e20fdc10e7a Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Tue, 14 May 2024 08:39:54 -0300 Subject: [PATCH 2/3] Better VM autodetection --- flake.nix | 13 +++++++++++++ nixos/configuration.nix | 2 +- nixos/family.nix | 17 +++++++++++++++++ nixos/hardware/gwen.nix | 40 ++++++++++++++++++++++++++++++++++++++++ nixos/kde-desktop.nix | 2 +- nixos/zerotier.nix | 5 +++-- 6 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 nixos/family.nix create mode 100644 nixos/hardware/gwen.nix diff --git a/flake.nix b/flake.nix index 283289c..187e531 100644 --- a/flake.nix +++ b/flake.nix @@ -97,6 +97,19 @@ ./nixos/zerotier.nix ]; }; + gwen = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs; + hostname = "gwen"; + mainUser = "gwen"; + }; + modules = [ + ./nixos/configuration.nix + ./nixos/kde-desktop.nix + ./nixos/family.nix + ./nixos/zerotier.nix + ]; + }; }; # Standalone home-manager configuration entrypoint diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b941168..3a7d9c3 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -1,6 +1,6 @@ # This is your system's configuration file. # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) -{ inputs, outputs, lib, config, pkgs, hostname, specialArgs, ... }: { +{ inputs, outputs, lib, config, pkgs, hostname, specialArgs, options, ... }: { # You can import other NixOS modules here imports = [ # If you want to use modules your own flake exports (from modules/nixos): diff --git a/nixos/family.nix b/nixos/family.nix new file mode 100644 index 0000000..eb3f04c --- /dev/null +++ b/nixos/family.nix @@ -0,0 +1,17 @@ + +{ inputs, outputs, lib, config, pkgs, hostname, specialArgs, ... }: { + + services.displayManager = { + autoLogin.enable = true; + autoLogin.user = "${specialArgs.mainUser}"; + }; + users.users = { + gwen = { + # You can set an initial password for your user. + # If you do, you can skip setting a root password by passing '--no-root-passwd' to nixos-install. + # Be sure to change it (using passwd) after rebooting! + isNormalUser = true; + extraGroups = [ "networkManager" ]; + }; + }; +} diff --git a/nixos/hardware/gwen.nix b/nixos/hardware/gwen.nix new file mode 100644 index 0000000..656b8f7 --- /dev/null +++ b/nixos/hardware/gwen.nix @@ -0,0 +1,40 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/91d9a91c-9c69-4d82-85dc-42598b9ceaec"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BED6-71B3"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/693adc19-c9d6-43a2-8e80-044f93a73af9"; } + ]; + + # 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..useDHCP`. + 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"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix index ffde716..82e3168 100644 --- a/nixos/kde-desktop.nix +++ b/nixos/kde-desktop.nix @@ -13,7 +13,7 @@ services.fwupd.enable = true; boot.plymouth = { - enable = false; + enable = true; themePackages = with pkgs; [ (adi1090x-plymouth-themes.override {selected_themes = [ "rings" ]; }) ]; theme = "rings"; }; diff --git a/nixos/zerotier.nix b/nixos/zerotier.nix index 8bf9a34..3ce8ba8 100644 --- a/nixos/zerotier.nix +++ b/nixos/zerotier.nix @@ -1,3 +1,5 @@ +{ config, pkgs, lib, options, ... }: + let privateZeroTierInterfaces = [ "ztmwri5sbj" ]; # ZT NET INTERFACE in { @@ -17,6 +19,5 @@ in { services.zerotierone.enable = true; #Don't join zerotier if I'm testing in a VM - #if !(options.virtualisation ? qemu) then - services.zerotierone.joinNetworks = [ "e04fa485ed2a4dc4" ]; + services.zerotierone.joinNetworks = lib.optionals (!options.virtualisation ? qemu) [ "e04fa485ed2a4dc4" ]; } From d697dce92bb19b03ea09747d69cd7997fab6a9a4 Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Tue, 14 May 2024 08:54:50 -0300 Subject: [PATCH 3/3] Bigger, better, Virtual machines --- nixos/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3a7d9c3..7a34de4 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -45,6 +45,12 @@ networking.hostName = specialArgs.hostname; # Define your hostname. networking.networkmanager.enable = true; + virtualisation.vmVariant = { + # following configuration is added only when building VM with build-vm + virtualisation.cores = 4; + virtualisation.memorySize = 4096; + }; + # This will add each flake input as a registry # To make nix3 commands consistent with your flake nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);