commit 883d31628b091a2da7ecec6a47e5e4505ce0bd9c · aylac.top/nixcfg-own-knot

+10

hosts/morgana/default.nix

···

       32
       32
        
               snapshots = true;

     

       33
       33
        
             };

     

       34
       34
        
             tmpOnTmpfs.enable = true;

     

       35
       35
       +
       

     

       36
       36
       +
             hibernation = {

     

       37
       37
       +
               enable = true;

     

       38
       38
       +
               swap = {

     

       39
       39
       +
                 size = 24576;

     

       40
       40
       +
                 location = "/data/.swapfile";

     

       41
       41
       +
                 keyFile = "/.swapkey";

     

       42
       42
       +
                 blkDev = "/dev/disk/by-uuid/e88969b5-98a0-4d46-a059-8e07ebf2689e";

     

       43
       43
       +
               };

     

       44
       44
       +
             };

     

       35
       45
        
           };

     

       36
       46
        
           desktop.gnome.enable = true;

     

       37
       47
        
           services = {

+2 -2

modules/hardware/profiles/base/default.nix

···

       23
       23
        
             fstrim.enable = true;

     

       24
       24
        
       

     

       25
       25
        
             logind.settings.Login = {

     

       26
       26
       -
               HandlePowerKey = "suspend";

     

       27
       27
       -
               HandlePowerKeyLongPress = "poweroff";

     

       26
       26
       +
               HandlePowerKey = lib.mkDefault "suspend";

     

       27
       27
       +
               HandlePowerKeyLongPress = lib.mkDefault "poweroff";

     

       28
       28
        
             };

     

       29
       29
        
       

     

       30
       30
        
             xserver.xkb = {

modules/nixos/profiles/default.nix

···

       4
       4
        
           ./backups

     

       5
       5
        
           ./base

     

       6
       6
        
           ./btrfs

     

       7
       7
       +
           ./hibernation

     

       7
       8
        
           ./workstation

     

       8
       9
        
           ./server

     

       9
       10
        
           ./autoUpgrade

+53

modules/nixos/profiles/hibernation/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }: {

     

       6
       6
       +
         options.myNixOS.profiles.hibernation = {

     

       7
       7
       +
           enable = lib.mkEnableOption "enable hibernation";

     

       8
       8
       +
           swap = {

     

       9
       9
       +
             size = lib.mkOption {

     

       10
       10
       +
               default = 0;

     

       11
       11
       +
               description = "Swap size in megabytes.";

     

       12
       12
       +
               type = lib.types.int;

     

       13
       13
       +
             };

     

       14
       14
       +
       

     

       15
       15
       +
             location = lib.mkOption {

     

       16
       16
       +
               default = "/.swap";

     

       17
       17
       +
               description = "Swap file location.";

     

       18
       18
       +
               type = lib.types.path;

     

       19
       19
       +
             };

     

       20
       20
       +
       

     

       21
       21
       +
             keyFile = lib.mkOption {

     

       22
       22
       +
               default = "/.swapkey";

     

       23
       23
       +
               description = "Location of the encryption key.";

     

       24
       24
       +
               type = lib.types.path;

     

       25
       25
       +
             };

     

       26
       26
       +
       

     

       27
       27
       +
             blkDev = lib.mkOption {

     

       28
       28
       +
               default = "/dev/sda1";

     

       29
       29
       +
               description = "Block device for swap file.";

     

       30
       30
       +
               type = lib.types.path;

     

       31
       31
       +
             };

     

       32
       32
       +
           };

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         config = lib.mkIf (config.myNixOS.profiles.hibernation.enable && config.myNixOS.profiles.hibernation.swap.size > 0) {

     

       36
       36
       +
           myNixOS.profiles.swap = {

     

       37
       37
       +
             enable = true;

     

       38
       38
       +
             random = false;

     

       39
       39
       +
             inherit (config.myNixOS.profiles.hibernation.swap) size location keyFile blkDev;

     

       40
       40
       +
           };

     

       41
       41
       +
       

     

       42
       42
       +
           services.logind.settings.Login = {

     

       43
       43
       +
             HandleLidSwitch = "suspend-then-hibernate";

     

       44
       44
       +
             HandlePowerKey = "suspend-then-hibernate";

     

       45
       45
       +
           };

     

       46
       46
       +
       

     

       47
       47
       +
           systemd.sleep.extraConfig = ''

     

       48
       48
       +
             HibernateDelaySec=15m

     

       49
       49
       +
             AllowSuspendThenHibernate=yes

     

       50
       50
       +
             HibernateOnACPower=no

     

       51
       51
       +
           '';

     

       52
       52
       +
         };

     

       53
       53
       +
       }

+24 -1

modules/nixos/profiles/swap/default.nix

···

       17
       17
        
             description = "Swap file location.";

     

       18
       18
        
             type = lib.types.path;

     

       19
       19
        
           };

     

       20
       20
       +
       

     

       21
       21
       +
           random = lib.mkOption {

     

       22
       22
       +
             default = true;

     

       23
       23
       +
             description = "Enable random encryption for swap file.";

     

       24
       24
       +
             type = lib.types.bool;

     

       25
       25
       +
           };

     

       26
       26
       +
       

     

       27
       27
       +
           keyFile = lib.mkOption {

     

       28
       28
       +
             default = "/.swapkey";

     

       29
       29
       +
             description = "Location of the encryption key.";

     

       30
       30
       +
             type = lib.types.path;

     

       31
       31
       +
           };

     

       32
       32
       +
       

     

       33
       33
       +
           blkDev = lib.mkOption {

     

       34
       34
       +
             default = "/dev/sda1";

     

       35
       35
       +
             description = "Block device for swap file.";

     

       36
       36
       +
             type = lib.types.path;

     

       37
       37
       +
           };

     

       20
       38
        
         };

     

       21
       39
        
       

     

       22
       40
        
         config = lib.mkIf config.myNixOS.profiles.swap.enable {

     
···

       24
       42
        
             {

     

       25
       43
        
               device = config.myNixOS.profiles.swap.location;

     

       26
       44
        
               priority = 0;

     

       27
       27
       -
               randomEncryption.enable = true;

     

       45
       45
       +
               randomEncryption.enable = config.myNixOS.profiles.swap.random;

     

       46
       46
       +
               encrypted = lib.mkIf (!config.myNixOS.profiles.swap.random) {

     

       47
       47
       +
                 label = "swapfile";

     

       48
       48
       +
                 enable = true;

     

       49
       49
       +
                 inherit (config.myNixOS.profiles.swap) keyFile blkDev;

     

       50
       50
       +
               };

     

       28
       51
        
               inherit (config.myNixOS.profiles.swap) size;

     

       29
       52
        
             }

     

       30
       53
        
           ];