Merged Survival Conflict

systems/x86_64-linux/HyperC/default.nix

@@ -10,6 +10,8 @@
       ./hardware.nix
     ];
 
+  # Configure Nix
+  nix.package = pkgs.lix;
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nixpkgs.config.permittedInsecurePackages = [
                 "electron-27.3.11"
@@ -19,6 +21,7 @@
     "veracrypt"
     "steam"
     "steam-original"
+    "steam-unwrapped"
   ];
 
 #  services.tlp.enable = true;
@@ -130,11 +133,10 @@
       fastfetch
       btop
       testdisk
-      neofetch
       xournalpp
       xournal
       rnote
-      mypaint
+      #mypaint
       firefox
       vim
       filelight
@@ -165,7 +167,7 @@
       signal-desktop
       kicad
       protonvpn-gui
-      kotatogram-desktop
+      telegram-desktop
       vlc
       filezilla
       inkscape

systems/x86_64-linux/HyperC/hardware.nix

@@ -31,7 +31,7 @@ in {
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
-  swapDevices = [ ];
+  swapDevices = [ { device = "/swapfile"; size = 8 * 1024; } ];
 
   # 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