From 27abf106d6cd284cf1f01821561ad75347231182 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 6 Nov 2024 03:13:33 +0100 Subject: [PATCH] 235 current 2024-11-06 03:13:27 24.05.20241026.cd3e883 6.11.5 * --- flake.nix | 5 +-- hosts/crocoite/hardware-configuration.nix | 2 +- hosts/factorio/hardware-configuration.nix | 37 ++++++++++++----------- modules/sec_auth/login-manager.nix | 14 ++++----- modules/software/software.nix | 1 + 5 files changed, 32 insertions(+), 27 deletions(-) diff --git a/flake.nix b/flake.nix index 05175e9..2ab5d79 100644 --- a/flake.nix +++ b/flake.nix @@ -74,8 +74,9 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' - nixosConfigurations = host_helper "crocoite" # // (host_helper example); - // host_helper "factorio"; + nixosConfigurations = + host_helper "crocoite" # // (host_helper example); + // host_helper "factorio"; ## Standalone home-manager configuration entrypoint ## Available through 'home-manager --flake .#your-username@your-hostname' diff --git a/hosts/crocoite/hardware-configuration.nix b/hosts/crocoite/hardware-configuration.nix index 3ff12fe..273c87e 100644 --- a/hosts/crocoite/hardware-configuration.nix +++ b/hosts/crocoite/hardware-configuration.nix @@ -12,7 +12,7 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; diff --git a/hosts/factorio/hardware-configuration.nix b/hosts/factorio/hardware-configuration.nix index 23d07ad..daf8eca 100644 --- a/hosts/factorio/hardware-configuration.nix +++ b/hosts/factorio/hardware-configuration.nix @@ -1,26 +1,30 @@ # 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 + "/profiles/qemu-guest.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/a6c22dab-a82a-4109-a8d0-b7ed99d56bc7"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/a6c22dab-a82a-4109-a8d0-b7ed99d56bc7"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/ca4eedce-6e52-4593-a188-a48e54074d14"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/ca4eedce-6e52-4593-a188-a48e54074d14";} + ]; # 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 @@ -31,4 +35,3 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } - diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix index 3964f7e..7c6801a 100644 --- a/modules/sec_auth/login-manager.nix +++ b/modules/sec_auth/login-manager.nix @@ -6,13 +6,13 @@ vt = 7; settings = { default_session = { - command = ''${pkgs.greetd.tuigreet}/bin/tuigreet \ - --time \ - --time-format '%Y-%m-%dT%H:%M:%S %A' \ - --remember \ - --user-menu \ - --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ - --cmd Hyprland''; + command = '' ${pkgs.greetd.tuigreet}/bin/tuigreet \ + --time \ + --time-format '%Y-%m-%dT%H:%M:%S %A' \ + --remember \ + --user-menu \ + --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ + --cmd Hyprland''; # removed elements from theme: container user = "greeter"; }; diff --git a/modules/software/software.nix b/modules/software/software.nix index 69784fa..585c5c5 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -63,6 +63,7 @@ keepassxc #minecraft element-desktop + rustdesk-flutter ]; fonts.packages = with pkgs; [