commit a1310761492245bd72c16dc93e5f8ccabf01a593 · soopy.moe/gensokyo

+2 -1

.sops.nix

···

       30
       30
        
                   # admin

     

       31
       31
        
                   age.soopyc_pxl7ag

     

       32
       32
        
                   age.soopyc_mbp14

     

       33
       33
       -
                 ] ++ identities;

     

       33
       33
       +
                 ]

     

       34
       34
       +
                 ++ identities;

     

       34
       35
        
               }

     

       35
       36
        
             ];

     

       36
       37
        
           };

+6 -7

global/programs/nix/config.nix

···

       47
       47
        
             dates = "weekly";

     

       48
       48
        
           };

     

       49
       49
        
       

     

       50
       50
       -
           nix.registry =

     

       51
       51
       -
             {

     

       52
       52
       -
               n.flake = inputs.nixpkgs;

     

       53
       53
       -
             }

     

       54
       54
       -
             // (builtins.mapAttrs (_: flake: { inherit flake; }) (

     

       55
       55
       -
               lib.filterAttrs (n: _: n != "nixpkgs") inputs

     

       56
       56
       -
             ));

     

       50
       50
       +
           nix.registry = {

     

       51
       51
       +
             n.flake = inputs.nixpkgs;

     

       52
       52
       +
           }

     

       53
       53
       +
           // (builtins.mapAttrs (_: flake: { inherit flake; }) (

     

       54
       54
       +
             lib.filterAttrs (n: _: n != "nixpkgs") inputs

     

       55
       55
       +
           ));

     

       57
       56
        
       

     

       58
       57
        
           # nix-index[-database]

     

       59
       58
        
           programs.nix-index.enable = true;

+2 -1

global/utils.nix

···

       113
       113
        
               builtins.addErrorContext "while generating sops template ${file}" {

     

       114
       114
        
                 sops.templates.${file} = {

     

       115
       115
        
                   inherit content;

     

       116
       116
       -
                 } // (builtins.removeAttrs config [ "content" ]);

     

       116
       116
       +
                 }

     

       117
       117
       +
                 // (builtins.removeAttrs config [ "content" ]);

     

       117
       118
        
                 # // (lib.optionalAttrs (builtins.hasAttr "owner" config) {inherit (config) owner;})

     

       118
       119
        
                 # // (lib.optionalAttrs (builtins.hasAttr "group" config) {inherit (config) group;});

     

       119
       120
        
               };

+4 -2

systems/ryo/services/thefunny.nix

···

       44
       44
        
               RuntimeDirectory = "funny";

     

       45
       45
        
               Restart = "on-failure";

     

       46
       46
        
               RestartSec = "1";

     

       47
       47
       -
             } // serviceHardening;

     

       47
       47
       +
             }

     

       48
       48
       +
             // serviceHardening;

     

       48
       49
        
             path = with pkgs; [

     

       49
       50
        
               cage

     

       50
       51
        
               feh

     
···

       70
       71
        
               ExecStart = "${lib.getExe pkgs.wayvnc} -d 0.0.0.0";

     

       71
       72
        
               Restart = "on-failure";

     

       72
       73
        
               RestartSec = "1";

     

       73
       73
       -
             } // serviceHardening;

     

       74
       74
       +
             }

     

       75
       75
       +
             // serviceHardening;

     

       74
       76
        
             environment = {

     

       75
       77
        
               WAYLAND_DISPLAY = "wayland-0";

     

       76
       78
        
               XDG_RUNTIME_DIR = "%t/funny";