commit be8ce02b2deeb5183230432d3a994390c0349b60 · aylac.top/nixcfg-own-knot

+6 -6

flake.lock

···

       355
       355
        
               ]

     

       356
       356
        
             },

     

       357
       357
        
             "locked": {

     

       358
       358
       -
               "lastModified": 1755121891,

     

       359
       359
       -
               "narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=",

     

       358
       358
       +
               "lastModified": 1755229570,

     

       359
       359
       +
               "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=",

     

       360
       360
        
               "owner": "nix-community",

     

       361
       361
        
               "repo": "home-manager",

     

       362
       362
       -
               "rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426",

     

       362
       362
       +
               "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3",

     

       363
       363
        
               "type": "github"

     

       364
       364
        
             },

     

       365
       365
        
             "original": {

     
···

       578
       578
        
           "secrets": {

     

       579
       579
        
             "flake": false,

     

       580
       580
        
             "locked": {

     

       581
       581
       -
               "lastModified": 1755224537,

     

       582
       582
       -
               "narHash": "sha256-u6wcGJzFvneLk1O/CGtJb8gNYDYiRzl1Ig9DgdO6kUk=",

     

       581
       581
       +
               "lastModified": 1755232543,

     

       582
       582
       +
               "narHash": "sha256-yPznFCGxCUmrwoImFqJJTujHvxPkv7c6ghZ7Bb0bRHo=",

     

       583
       583
        
               "owner": "ayla6",

     

       584
       584
        
               "repo": "secrets",

     

       585
       585
       -
               "rev": "a80c405683389816580d0b9595c27d12b1d7cfff",

     

       585
       585
       +
               "rev": "51f893aea0469b4a55a20580382426c967803415",

     

       586
       586
        
               "type": "github"

     

       587
       587
        
             },

     

       588
       588
        
             "original": {

+5 -17

hosts/jezebel/default.nix

···

       23
       23
        
             base.enable = true;

     

       24
       24
        
             btrfs.enable = true;

     

       25
       25
        
             server.enable = true;

     

       26
       26
       +
             vps.enable = true;

     

       26
       27
        
             autoUpgrade = {

     

       27
       28
        
               enable = true;

     

       28
       29
        
               operation = "switch";

     

       30
       30
       +
             };

     

       31
       31
       +
             swap = {

     

       32
       32
       +
               enable = true;

     

       33
       33
       +
               size = 2048;

     

       29
       34
        
             };

     

       30
       35
        
           };

     

       31
       36
        
           services = {

     
···

       35
       40
        
               enableCaddy = true;

     

       36
       41
        
             };

     

       37
       42
        
           };

     

       38
       38
       -
         };

     

       39
       39
       -
       

     

       40
       40
       -
         services = {

     

       41
       41
       -
           qemuGuest.enable = true;

     

       42
       42
       -
           spice-vdagentd.enable = true;

     

       43
       43
       -
         };

     

       44
       44
       -
       

     

       45
       45
       -
         boot = {

     

       46
       46
       -
           loader.grub = {

     

       47
       47
       -
             enable = true;

     

       48
       48
       -
           };

     

       49
       49
       -
           initrd = {

     

       50
       50
       -
             availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];

     

       51
       51
       -
             kernelModules = [];

     

       52
       52
       -
           };

     

       53
       53
       -
           kernelModules = [""];

     

       54
       54
       -
           extraModulePackages = [];

     

       55
       43
        
         };

     

       56
       44
        
       }

-7

modules/disko/btrfs-vps/default.nix

···

       37
       37
        
                       mountpoint = "/boot";

     

       38
       38
        
                     };

     

       39
       39
        
                   };

     

       40
       40
       -
                   swap = {

     

       41
       41
       -
                     size = "4G";

     

       42
       42
       -
                     content = {

     

       43
       43
       -
                       type = "swap";

     

       44
       44
       -
                       resumeDevice = true;

     

       45
       45
       -
                     };

     

       46
       46
       -
                   };

     

       47
       40
        
                   root = {

     

       48
       41
        
                     size = "100%";

     

       49
       42
        
                     content = {

+1 -77

modules/nixos/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         config,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         pkgs,

     

       5
       5
       -
         ...

     

       6
       6
       -
       }: {

     

       1
       1
       +
       {...}: {

     

       7
       2
        
         imports = [

     

       8
       3
        
           ./desktop

     

       9
       4
        
           ./profiles

     
···

       11
       6
        
           ./programs

     

       12
       7
        
           ./services

     

       13
       8
        
         ];

     

       14
       14
       -
       

     

       15
       15
       -
         options.myNixOS.desktop.enable = lib.mkOption {

     

       16
       16
       -
           default =

     

       17
       17
       -
             config.myNixOS.desktop.gnome.enable or config.myNixOS.desktop.hyprland.enable

     

       18
       18
       -
               or config.myNixOS.desktop.kde.enable;

     

       19
       19
       -
           description = "Desktop environment configuration.";

     

       20
       20
       -
           type = lib.types.bool;

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       23
       -
         config = lib.mkIf config.myNixOS.desktop.enable {

     

       24
       24
       -
           boot = {

     

       25
       25
       -
             consoleLogLevel = 0;

     

       26
       26
       -
             initrd.verbose = false;

     

       27
       27
       -
             plymouth.enable = true;

     

       28
       28
       -
           };

     

       29
       29
       -
       

     

       30
       30
       -
           environment.sessionVariables.NIXOS_OZONE_WL = "1";

     

       31
       31
       -
       

     

       32
       32
       -
           home-manager.sharedModules = [

     

       33
       33
       -
             {

     

       34
       34
       -
               config.myHome.desktop.enable = true;

     

       35
       35
       -
             }

     

       36
       36
       -
           ];

     

       37
       37
       -
       

     

       38
       38
       -
           programs.system-config-printer.enable = true;

     

       39
       39
       -
       

     

       40
       40
       -
           services = {

     

       41
       41
       -
             avahi = {

     

       42
       42
       -
               enable = true;

     

       43
       43
       -
               nssmdns4 = true;

     

       44
       44
       -
               openFirewall = true;

     

       45
       45
       -
       

     

       46
       46
       -
               publish = {

     

       47
       47
       -
                 enable = true;

     

       48
       48
       -
                 addresses = true;

     

       49
       49
       -
                 userServices = true;

     

       50
       50
       -
                 workstation = true;

     

       51
       51
       -
               };

     

       52
       52
       -
             };

     

       53
       53
       -
       

     

       54
       54
       -
             gnome.gnome-keyring.enable = true;

     

       55
       55
       -
             gvfs.enable = true; # Mount, trash, etc.

     

       56
       56
       -
             libinput.enable = true;

     

       57
       57
       -
       

     

       58
       58
       -
             pipewire = {

     

       59
       59
       -
               enable = true;

     

       60
       60
       -
       

     

       61
       61
       -
               alsa = {

     

       62
       62
       -
                 enable = true;

     

       63
       63
       -
                 support32Bit = true;

     

       64
       64
       -
               };

     

       65
       65
       -
       

     

       66
       66
       -
               pulse.enable = true;

     

       67
       67
       -
             };

     

       68
       68
       -
       

     

       69
       69
       -
             printing.enable = false;

     

       70
       70
       -
       

     

       71
       71
       -
             pulseaudio = {

     

       72
       72
       -
               support32Bit = true;

     

       73
       73
       -
             };

     

       74
       74
       -
       

     

       75
       75
       -
             system-config-printer.enable = true;

     

       76
       76
       -
       

     

       77
       77
       -
             xserver = {

     

       78
       78
       -
               enable = true;

     

       79
       79
       -
               excludePackages = with pkgs; [xterm];

     

       80
       80
       -
             };

     

       81
       81
       -
           };

     

       82
       82
       -
       

     

       83
       83
       -
           system.nixos.tags = ["desktop"];

     

       84
       84
       -
         };

     

       85
       9
        
       }

+77 -1

modules/nixos/desktop/default.nix

···

       1
       1
       -
       {...}: {

     

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         config,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: {

     

       2
       7
        
         imports = [./gnome];

     

       8
       8
       +
       

     

       9
       9
       +
         options.myNixOS.desktop.enable = lib.mkOption {

     

       10
       10
       +
           default =

     

       11
       11
       +
             config.myNixOS.desktop.gnome.enable or config.myNixOS.desktop.hyprland.enable

     

       12
       12
       +
                 or config.myNixOS.desktop.kde.enable;

     

       13
       13
       +
           description = "Desktop environment configuration.";

     

       14
       14
       +
           type = lib.types.bool;

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         config = lib.mkIf config.myNixOS.desktop.enable {

     

       18
       18
       +
           boot = {

     

       19
       19
       +
             consoleLogLevel = 0;

     

       20
       20
       +
             initrd.verbose = false;

     

       21
       21
       +
             plymouth.enable = true;

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           environment.sessionVariables.NIXOS_OZONE_WL = "1";

     

       25
       25
       +
       

     

       26
       26
       +
           home-manager.sharedModules = [

     

       27
       27
       +
             {

     

       28
       28
       +
               config.myHome.desktop.enable = true;

     

       29
       29
       +
             }

     

       30
       30
       +
           ];

     

       31
       31
       +
       

     

       32
       32
       +
           programs.system-config-printer.enable = true;

     

       33
       33
       +
       

     

       34
       34
       +
           services = {

     

       35
       35
       +
             avahi = {

     

       36
       36
       +
               enable = true;

     

       37
       37
       +
               nssmdns4 = true;

     

       38
       38
       +
               openFirewall = true;

     

       39
       39
       +
       

     

       40
       40
       +
               publish = {

     

       41
       41
       +
                 enable = true;

     

       42
       42
       +
                 addresses = true;

     

       43
       43
       +
                 userServices = true;

     

       44
       44
       +
                 workstation = true;

     

       45
       45
       +
               };

     

       46
       46
       +
             };

     

       47
       47
       +
       

     

       48
       48
       +
             gnome.gnome-keyring.enable = true;

     

       49
       49
       +
             gvfs.enable = true; # Mount, trash, etc.

     

       50
       50
       +
             libinput.enable = true;

     

       51
       51
       +
       

     

       52
       52
       +
             pipewire = {

     

       53
       53
       +
               enable = true;

     

       54
       54
       +
       

     

       55
       55
       +
               alsa = {

     

       56
       56
       +
                 enable = true;

     

       57
       57
       +
                 support32Bit = true;

     

       58
       58
       +
               };

     

       59
       59
       +
       

     

       60
       60
       +
               pulse.enable = true;

     

       61
       61
       +
             };

     

       62
       62
       +
       

     

       63
       63
       +
             printing.enable = false;

     

       64
       64
       +
       

     

       65
       65
       +
             pulseaudio = {

     

       66
       66
       +
               support32Bit = true;

     

       67
       67
       +
             };

     

       68
       68
       +
       

     

       69
       69
       +
             system-config-printer.enable = true;

     

       70
       70
       +
       

     

       71
       71
       +
             xserver = {

     

       72
       72
       +
               enable = true;

     

       73
       73
       +
               excludePackages = with pkgs; [xterm];

     

       74
       74
       +
             };

     

       75
       75
       +
           };

     

       76
       76
       +
       

     

       77
       77
       +
           system.nixos.tags = ["desktop"];

     

       78
       78
       +
         };

     

       3
       79
        
       }

modules/nixos/profiles/default.nix

···

       8
       8
        
           ./autoUpgrade

     

       9
       9
        
           ./tmpOnTmpfs

     

       10
       10
        
           ./swap

     

       11
       11
       +
           ./vps

     

       11
       12
        
         ];

     

       12
       13
        
       }

+25

modules/nixos/profiles/vps/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }: {

     

       6
       6
       +
         options.myNixOS.profiles.vps.enable = lib.mkEnableOption "boot settings for vpses!";

     

       7
       7
       +
         config = lib.mkIf config.myNixOS.profiles.vps.enable {

     

       8
       8
       +
           services = {

     

       9
       9
       +
             qemuGuest.enable = true;

     

       10
       10
       +
             spice-vdagentd.enable = true;

     

       11
       11
       +
           };

     

       12
       12
       +
       

     

       13
       13
       +
           boot = {

     

       14
       14
       +
             loader.grub = {

     

       15
       15
       +
               enable = true;

     

       16
       16
       +
             };

     

       17
       17
       +
             initrd = {

     

       18
       18
       +
               availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];

     

       19
       19
       +
               kernelModules = [];

     

       20
       20
       +
             };

     

       21
       21
       +
             kernelModules = [""];

     

       22
       22
       +
             extraModulePackages = [];

     

       23
       23
       +
           };

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2 -2

modules/snippets/restic/default.nix

···

       28
       28
        
               rcloneConfigFile = config.age.secrets.rclone.path;

     

       29
       29
        
       

     

       30
       30
        
               timerConfig = {

     

       31
       31
       -
                 OnCalendar = "daily";

     

       31
       31
       +
                 OnCalendar = "*-*-* 00,12:00:00";

     

       32
       32
        
                 Persistent = true;

     

       33
       33
       -
                 RandomizedDelaySec = "3h";

     

       33
       33
       +
                 RandomizedDelaySec = "1200";

     

       34
       34
        
               };

     

       35
       35
        
             };

     

       36
       36
        
           };