diff --git a/common/tooling/default.nix b/common/tooling/default.nix index 060815f..05dcf8e 100644 --- a/common/tooling/default.nix +++ b/common/tooling/default.nix @@ -104,7 +104,7 @@ in # virtualisation.docker.enable = true; - services.dbus.implementation = "broker"; + # services.dbus.implementation = "broker"; grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [ vim-scala diff --git a/configuration.nix b/configuration.nix index 8920658..fd6d1a7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,7 +10,6 @@ # Bootloader. boot = { loader.efi.canTouchEfiVariables = true; - kernelPackages = pkgs.linuxPackages_zen; }; services.logrotate.checkConfig = false; # fixme: actually needed? diff --git a/fake_flake.nix b/fake_flake.nix index aa3a82b..3504694 100644 --- a/fake_flake.nix +++ b/fake_flake.nix @@ -43,7 +43,7 @@ let { # tlpui url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305278.patch"; - hash = "sha256-8RvPI8Id+Ttgv07IMBTAxkSc+K00WhiWgdgrCcULd7o="; + hash = "sha256-vmzj7gF8jwHdqxN+dQiJ4MRxKpHvBTzbrUvFgt1DK8I="; } ]; in @@ -62,10 +62,10 @@ in nixpkgs.hostPlatform = system; - system.nixos = { - distroId = "lixos"; - distroName = "LixOS"; - }; +# system.nixos = { +# distroId = "lixos"; +# distroName = "LixOS"; +# }; environment.sessionVariables = with config.system.nixos; { distro = "${distroName} ${version} (${codeName}) ${system}"; diff --git a/specific/grimm-nixos-laptop/configuration.nix b/specific/grimm-nixos-laptop/configuration.nix index af19def..4743863 100644 --- a/specific/grimm-nixos-laptop/configuration.nix +++ b/specific/grimm-nixos-laptop/configuration.nix @@ -9,6 +9,10 @@ age.identityPaths = [ "/home/grimmauld/.ssh/id_ed25519" ]; + boot = { + kernelPackages = pkgs.linuxPackages_zen; + }; + grimmShared = { tooling = { pass = true; diff --git a/specific/grimmauld-nixos-server/configuration.nix b/specific/grimmauld-nixos-server/configuration.nix index 321499d..19e2380 100644 --- a/specific/grimmauld-nixos-server/configuration.nix +++ b/specific/grimmauld-nixos-server/configuration.nix @@ -11,6 +11,10 @@ in { imports = [ ./hardware-configuration.nix ]; + boot = { + kernelPackages = pkgs.linuxPackages_latest; + }; + networking.firewall.allowedTCPPorts = [ 80 443 @@ -19,6 +23,7 @@ in networking.domain = "grimmauld.de"; services.openssh.enable = true; system.stateVersion = "23.11"; + # networking.networkmanager.enable = lib.mkForce false; services.nginx = { # package = pkgs.nginxStable.override { openssl = pkgs.libressl; };