merge

4 files changed, 3 insertions, 33 deletions

diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix
index f766e0a..bd0f364 100644
--- a/hosts/laptop/cfg.nix
+++ b/hosts/laptop/cfg.nix
@@ -41,15 +41,6 @@
       supportedFilesystems = ["ntfs"];
       kernelModules = ["kvm-intel"];
       kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-      kernelParams = [
-        "console=ttyS0"
-        "init_on_free=1"
-        "page_poison=1"
-        "page_alloc.shuffle=1"
-        "slab_nomerge"
-        "vsyscall=none"
-      ];
-      cleanTmpDir = true;
       loader = {
         systemd-boot = {
           enable = true;
@@ -111,7 +102,9 @@
       }
     ];
 
-    home-manager.users.tzlil.home.packages = [pkgs.schildichat-desktop pkgs.qutebrowser pkgs.keepassxc];
+    home-manager.users.tzlil = {
+      home.packages = [pkgs.schildichat-desktop pkgs.qutebrowser pkgs.keepassxc];
+    };
 
     nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
     powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/hosts/pc/cfg.nix b/hosts/pc/cfg.nix
index 38fb8c6..ee3b716 100644
--- a/hosts/pc/cfg.nix
+++ b/hosts/pc/cfg.nix
@@ -33,15 +33,6 @@
       };
       kernelModules = ["kvm-amd"];
       kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-      kernelParams = [
-        "console=ttyS0"
-        "init_on_free=1"
-        "page_poison=1"
-        "page_alloc.shuffle=1"
-        "slab_nomerge"
-        "vsyscall=none"
-      ];
-      cleanTmpDir = true;
       loader = {
         systemd-boot = {
           enable = true;
diff --git a/hosts/vm/cfg.nix b/hosts/vm/cfg.nix
index 79f00c4..99ed8b9 100644
--- a/hosts/vm/cfg.nix
+++ b/hosts/vm/cfg.nix
@@ -42,13 +42,7 @@
       kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
       kernelParams = [
         "console=ttyS0"
-        "init_on_free=1"
-        "page_poison=1"
-        "page_alloc.shuffle=1"
-        "slab_nomerge"
-        "vsyscall=none"
       ];
-      cleanTmpDir = true;
       loader = {
         systemd-boot = {
           enable = true;
diff --git a/hosts/vps/cfg.nix b/hosts/vps/cfg.nix
index f780229..2ec6cd4 100644
--- a/hosts/vps/cfg.nix
+++ b/hosts/vps/cfg.nix
@@ -29,14 +29,6 @@
 
     boot = {
       kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-      kernelParams = [
-        "init_on_free=1"
-        "page_poison=1"
-        "page_alloc.shuffle=1"
-        "slab_nomerge"
-        "vsyscall=none"
-      ];
-      cleanTmpDir = true;
       loader.grub.device = "/dev/vda";
       initrd = {
         availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];