diff options
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/alnus/config.nix | 20 | ||||
| -rw-r--r-- | systems/mu/config.nix | 15 | ||||
| -rw-r--r-- | systems/nomic/config.nix | 1 | ||||
| -rw-r--r-- | systems/oai/config.nix | 42 | ||||
| -rw-r--r-- | systems/querel/config.nix | 3 | ||||
| -rw-r--r-- | systems/xu/config.nix | 7 |
6 files changed, 65 insertions, 23 deletions
diff --git a/systems/alnus/config.nix b/systems/alnus/config.nix index f8dd0b8..a3d1e9a 100644 --- a/systems/alnus/config.nix +++ b/systems/alnus/config.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: { imports = [ ../../configs/hw/x220.nix + ../../configs/earlyoom.nix ../../configs/exim-retiolum.nix ../../configs/retiolum.nix ]; @@ -13,11 +14,9 @@ }; environment.systemPackages = [ + pkgs.element-desktop pkgs.firefox pkgs.networkmanagerapplet - (pkgs.pidgin.override { - plugins = [ pkgs.pidgin-otr ]; - }) ]; fileSystems = { @@ -50,26 +49,21 @@ networking.networkmanager.enable = true; - services.earlyoom.enable = true; - services.earlyoom.freeMemThreshold = 5; - systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [ - "--prefer '^(Web Content|Privileged Cont)$'" # firefox tabs - ]; + services.libinput.enable = false; services.xserver = { enable = true; - layout = "de"; - xkbOptions = "eurosign:e"; + xkb.layout = "de"; + xkb.options = "eurosign:e"; - libinput.enable = false; synaptics = { enable = true; twoFingerScroll = true; }; }; services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "dv"; + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "dv"; system.stateVersion = "22.05"; diff --git a/systems/mu/config.nix b/systems/mu/config.nix index 4c5e19e..f9debe4 100644 --- a/systems/mu/config.nix +++ b/systems/mu/config.nix @@ -3,6 +3,7 @@ ../../configs/br.nix ../../configs/exim-retiolum.nix ../../configs/hw/x220.nix + ../../configs/initrd/sshd.nix ../../configs/retiolum.nix ]; @@ -37,8 +38,6 @@ nixpkgs.config.allowUnfree = true; hardware.opengl.driSupport32Bit = true; - hardware.pulseaudio.enable = true; - hardware.enableRedistributableFirmware = true; boot.loader.efi.canTouchEfiVariables = true; @@ -97,12 +96,14 @@ pkgs.xorg.fontschumachermisc ]; + services.pulseaudio.enable = true; + services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.xkbOptions = "eurosign:e"; + services.xserver.xkb.layout = "de"; + services.xserver.xkb.options = "eurosign:e"; # TODO this is host specific - services.xserver.libinput.enable = false; + services.libinput.enable = false; services.xserver.synaptics = { enable = true; twoFingerScroll = true; @@ -110,8 +111,8 @@ services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "vv"; + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "vv"; system.stateVersion = "23.05"; diff --git a/systems/nomic/config.nix b/systems/nomic/config.nix index e8a5f9c..f8e5a38 100644 --- a/systems/nomic/config.nix +++ b/systems/nomic/config.nix @@ -53,7 +53,6 @@ esac '') gnupg - tmux ]; networking.wireless.enable = true; diff --git a/systems/oai/config.nix b/systems/oai/config.nix new file mode 100644 index 0000000..b802c7e --- /dev/null +++ b/systems/oai/config.nix @@ -0,0 +1,42 @@ +{ modulesPath, pkgs, ... }: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "oai"; + + boot.kernelParams = [ + "console=ttyS0" + "console=tty1" + "nvme.shutdown_timeout=10" + "libiscsi.debug_libiscsi_eh=1" + "net.ifnames=0" + ]; + + boot.initrd.kernelModules = [ + "nvme" + ]; + + networking.useDHCP = false; + networking.interfaces.eth0.useDHCP = true; + + environment.systemPackages = [ + pkgs.vim + ]; + + fileSystems."/" = { + device = "/dev/disk/by-label/root"; + fsType = "ext4"; + }; + fileSystems."/boot" = { + device = "/dev/disk/by-label/boot"; + fsType = "vfat"; + }; + + services.openssh.enable = true; + + system.stateVersion = "23.05"; +} diff --git a/systems/querel/config.nix b/systems/querel/config.nix index 08ad71c..dff928e 100644 --- a/systems/querel/config.nix +++ b/systems/querel/config.nix @@ -49,7 +49,6 @@ }; hardware.enableRedistributableFirmware = true; - hardware.pulseaudio.enable = true; i18n.defaultLocale = "de_DE.UTF-8"; @@ -57,6 +56,8 @@ programs.ssh.startAgent = false; + services.pulseaudio.enable = true; + services.xserver.enable = true; services.xserver.layout = "de"; services.xserver.xkbOptions = "eurosign:e"; diff --git a/systems/xu/config.nix b/systems/xu/config.nix index 761a018..abf433c 100644 --- a/systems/xu/config.nix +++ b/systems/xu/config.nix @@ -4,6 +4,7 @@ imports = [ ../../configs/autotether.nix ../../configs/hw/x220.nix + ../../configs/earlyoom.nix ../../configs/exim-retiolum.nix ../../configs/gitconfig.nix ../../configs/gitrepos.nix @@ -46,7 +47,6 @@ q qrencode texlive.combined.scheme-full - tmux #ack #apache-httpd @@ -141,8 +141,13 @@ gptfdisk ]; + networking.usePredictableInterfaceNames = false; + networking.wireless.enable = true; + networking.interfaces.eth0.useDHCP = true; + networking.interfaces.eth0.wakeOnLan.enable = true; + #services.bitlbee.enable = true; #services.tor.client.enable = true; #services.tor.enable = true; |