commit 47eb04eee0e43a248771ddf904dcbe2b38bc5ab8 · ptr.pet/ark

+37 -19

flake.lock

···

       138
       138
        
               ]

     

       139
       139
        
             },

     

       140
       140
        
             "locked": {

     

       141
       141
       -
               "lastModified": 1680688749,

     

       142
       142
       -
               "narHash": "sha256-j+jnjBbWMCbjxwIA0oh7Qwwg5e009kGWBqrCj9hQ9nY=",

     

       141
       141
       +
               "lastModified": 1688999735,

     

       142
       142
       +
               "narHash": "sha256-pJNcfOVM9TBDblSRIviXmuLLm+w/gtjhxWfLYPK0beI=",

     

       143
       143
        
               "owner": "famedly",

     

       144
       144
        
               "repo": "conduit",

     

       145
       145
       -
               "rev": "1b9e63f4269988a957a2e376355b2dacd2295c08",

     

       145
       145
       +
               "rev": "ad06d475debc9657d36414bebb5a28f1ba3efcc7",

     

       146
       146
        
               "type": "gitlab"

     

       147
       147
        
             },

     

       148
       148
        
             "original": {

     
···

       181
       181
        
               "rust-overlay": "rust-overlay_2"

     

       182
       182
        
             },

     

       183
       183
        
             "locked": {

     

       184
       184
       -
               "lastModified": 1680584903,

     

       185
       185
       -
               "narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=",

     

       184
       184
       +
               "lastModified": 1686621798,

     

       185
       185
       +
               "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=",

     

       186
       186
        
               "owner": "ipetkov",

     

       187
       187
        
               "repo": "crane",

     

       188
       188
       -
               "rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5",

     

       188
       188
       +
               "rev": "75f7d715f8088f741be9981405f6444e2d49efdd",

     

       189
       189
        
               "type": "github"

     

       190
       190
        
             },

     

       191
       191
        
             "original": {

     
···

       545
       545
        
               "rust-analyzer-src": "rust-analyzer-src"

     

       546
       546
        
             },

     

       547
       547
        
             "locked": {

     

       548
       548
       -
               "lastModified": 1680607374,

     

       549
       549
       -
               "narHash": "sha256-U5iiPqbAanr+sQCCZ7zxYhwCXdcDpish8Uy4ELZeXM0=",

     

       548
       548
       +
               "lastModified": 1687004852,

     

       549
       549
       +
               "narHash": "sha256-wRSUs+v8xtIJaFlWO5NLFQjkq5+eYhxHHXnZKsZ9DpQ=",

     

       550
       550
        
               "owner": "nix-community",

     

       551
       551
        
               "repo": "fenix",

     

       552
       552
       -
               "rev": "e70d498e97017daa59363eafa054619d4fa160c3",

     

       552
       552
       +
               "rev": "df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791",

     

       553
       553
        
               "type": "github"

     

       554
       554
        
             },

     

       555
       555
        
             "original": {

     
···

       639
       639
        
             }

     

       640
       640
        
           },

     

       641
       641
        
           "flake-utils": {

     

       642
       642
       +
             "inputs": {

     

       643
       643
       +
               "systems": "systems"

     

       644
       644
       +
             },

     

       642
       645
        
             "locked": {

     

       643
       643
       -
               "lastModified": 1678901627,

     

       644
       644
       -
               "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",

     

       646
       646
       +
               "lastModified": 1685518550,

     

       647
       647
       +
               "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",

     

       645
       648
        
               "owner": "numtide",

     

       646
       649
        
               "repo": "flake-utils",

     

       647
       647
       -
               "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",

     

       650
       650
       +
               "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",

     

       648
       651
        
               "type": "github"

     

       649
       652
        
             },

     

       650
       653
        
             "original": {

     
···

       837
       840
        
                 "nixpkgs"

     

       838
       841
        
               ],

     

       839
       842
        
               "parts": "parts_6",

     

       840
       840
       -
               "systems": "systems"

     

       843
       843
       +
               "systems": "systems_2"

     

       841
       844
        
             },

     

       842
       845
        
             "locked": {

     

       843
       846
        
               "lastModified": 1683646918,

     
···

       1341
       1344
        
           "rust-analyzer-src": {

     

       1342
       1345
        
             "flake": false,

     

       1343
       1346
        
             "locked": {

     

       1344
       1344
       -
               "lastModified": 1680435407,

     

       1345
       1345
       -
               "narHash": "sha256-IPBtZCOh3BdrR+V77cL7r6WQnclWcZ/85BDYnmq/GnQ=",

     

       1347
       1347
       +
               "lastModified": 1686936697,

     

       1348
       1348
       +
               "narHash": "sha256-mCoPr1nNWKpsoGMBFaK/sswkLloRCZuoWi2a+OKs3vk=",

     

       1346
       1349
        
               "owner": "rust-lang",

     

       1347
       1350
        
               "repo": "rust-analyzer",

     

       1348
       1348
       -
               "rev": "236576227a299fd19ba836b1834ab50c948af994",

     

       1351
       1351
       +
               "rev": "a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6",

     

       1349
       1352
        
               "type": "github"

     

       1350
       1353
        
             },

     

       1351
       1354
        
             "original": {

     
···

       1385
       1388
        
               ]

     

       1386
       1389
        
             },

     

       1387
       1390
        
             "locked": {

     

       1388
       1388
       -
               "lastModified": 1680488274,

     

       1389
       1389
       -
               "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",

     

       1391
       1391
       +
               "lastModified": 1685759304,

     

       1392
       1392
       +
               "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=",

     

       1390
       1393
        
               "owner": "oxalica",

     

       1391
       1394
        
               "repo": "rust-overlay",

     

       1392
       1392
       -
               "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",

     

       1395
       1395
       +
               "rev": "c535b4f3327910c96dcf21851bbdd074d0760290",

     

       1393
       1396
        
               "type": "github"

     

       1394
       1397
        
             },

     

       1395
       1398
        
             "original": {

     
···

       1488
       1491
        
             }

     

       1489
       1492
        
           },

     

       1490
       1493
        
           "systems": {

     

       1494
       1494
       +
             "locked": {

     

       1495
       1495
       +
               "lastModified": 1681028828,

     

       1496
       1496
       +
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       1497
       1497
       +
               "owner": "nix-systems",

     

       1498
       1498
       +
               "repo": "default",

     

       1499
       1499
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       1500
       1500
       +
               "type": "github"

     

       1501
       1501
       +
             },

     

       1502
       1502
       +
             "original": {

     

       1503
       1503
       +
               "owner": "nix-systems",

     

       1504
       1504
       +
               "repo": "default",

     

       1505
       1505
       +
               "type": "github"

     

       1506
       1506
       +
             }

     

       1507
       1507
       +
           },

     

       1508
       1508
       +
           "systems_2": {

     

       1491
       1509
        
             "locked": {

     

       1492
       1510
        
               "lastModified": 1680978846,

     

       1493
       1511
        
               "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",

+6

hosts/tkaronto/modules/waydroid.nix

···

       1
       1
       +
       {config, ...}: {

     

       2
       2
       +
         virtualisation.waydroid.enable = true;

     

       3
       3
       +
         environment.persistence."${config.system.persistDir}" = {

     

       4
       4
       +
           directories = ["/var/lib/waydroid"];

     

       5
       5
       +
         };

     

       6
       6
       +
       }

+5 -1

hosts/wolumonde/modules/conduit.nix

···

       6
       6
        
       }: let

     

       7
       7
        
         _wellKnownFileClient = pkgs.writeText "client" (

     

       8
       8
        
           builtins.toJSON

     

       9
       9
       -
           {"m.homeserver"."base_url" = "https://matrix.gaze.systems";}

     

       9
       9
       +
           {

     

       10
       10
       +
             "m.homeserver"."base_url" = "https://matrix.gaze.systems";

     

       11
       11
       +
             "org.matrix.msc3575.proxy"."url" = "https://matrix.gaze.systems";

     

       12
       12
       +
           }

     

       10
       13
        
         );

     

       11
       14
        
         _wellKnownFileServer =

     

       12
       15
        
           pkgs.writeText "server"

     
···

       28
       31
        
             trusted_servers = ["matrix.org" "nixos.dev" "conduit.rs"];

     

       29
       32
        
             address = "::1";

     

       30
       33
        
             port = 6167;

     

       34
       34
       +
             database_backend = "rocksdb";

     

       31
       35
        
           };

     

       32
       36
        
         };

     

       33
       37

+1

hosts/wolumonde/modules/secrets.nix

···

       7
       7
        
           group = "systemd-network";

     

       8
       8
        
         };

     

       9
       9
        
         age.secrets.musikquadConfig.file = ../../../secrets/musikquadConfig.age;

     

       10
       10
       +
         age.secrets.tmodloaderServerPass.file = ../../../secrets/tmodloaderServerPass.age;

     

       10
       11
        
       }

+71

hosts/wolumonde/modules/terraria.disabled

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }: let

     

       6
       6
       +
         mods = [

     

       7
       7
       +
           "2817496179"

     

       8
       8
       +
           "2669644269"

     

       9
       9
       +
           "2824688072"

     

       10
       10
       +
           "2826111637"

     

       11
       11
       +
           "2824688804"

     

       12
       12
       +
           "2793782057"

     

       13
       13
       +
           "2570931073"

     

       14
       14
       +
           "2776422822"

     

       15
       15
       +
           "2913232891"

     

       16
       16
       +
           "2797072909"

     

       17
       17
       +
           "2565639705"

     

       18
       18
       +
           "2760520795"

     

       19
       19
       +
           "2619954303"

     

       20
       20
       +
           "2899871898"

     

       21
       21
       +
           "2790924965"

     

       22
       22
       +
           "2785100219"

     

       23
       23
       +
           "2563862309"

     

       24
       24
       +
           "2909886416"

     

       25
       25
       +
           "2563851005"

     

       26
       26
       +
           "2827446882"

     

       27
       27
       +
           "2618946390"

     

       28
       28
       +
           "2597324266"

     

       29
       29
       +
           "2599842771"

     

       30
       30
       +
           "2563309347"

     

       31
       31
       +
           #"2893332653" mod of redemption

     

       32
       32
       +
           "2835407664"

     

       33
       33
       +
           "2562997415"

     

       34
       34
       +
           "2634682993"

     

       35
       35
       +
           "2563098343"

     

       36
       36
       +
           "2815540735"

     

       37
       37
       +
           "2831752947"

     

       38
       38
       +
           "2580273153"

     

       39
       39
       +
           "2565540604"

     

       40
       40
       +
           "2816694149"

     

       41
       41
       +
           "2802867430"

     

       42
       42
       +
           "2797518634"

     

       43
       43
       +
           "2562915378"

     

       44
       44
       +
         ];

     

       45
       45
       +
         modsToUse = lib.concatStringsSep "," mods;

     

       46
       46
       +
       in {

     

       47
       47
       +
         virtualisation.oci-containers.containers = {

     

       48
       48
       +
           tmodloader = {

     

       49
       49
       +
             image = "jacobsmile/tmodloader1.4:v2022.09.47.49";

     

       50
       50
       +
             environment = {

     

       51
       51
       +
               TMOD_MAXPLAYERS = "6";

     

       52
       52
       +
               TMOD_WORLDNAME = "cbt";

     

       53
       53
       +
               TMOD_WORLDSEED = "cockandballtorture";

     

       54
       54
       +
               TMOD_MOTD = "You should kill yourself, NOW!";

     

       55
       55
       +
               TMOD_WORLDSIZE = "2";

     

       56
       56
       +
               TMOD_AUTODOWNLOAD = modsToUse;

     

       57
       57
       +
               TMOD_ENABLEDMODS = modsToUse;

     

       58
       58
       +
             };

     

       59
       59
       +
             environmentFiles = [config.age.secrets.tmodloaderServerPass.path];

     

       60
       60
       +
             ports = ["7777:7777"];

     

       61
       61
       +
             volumes = [

     

       62
       62
       +
               "/var/lib/terraria/worlds:/home/terraria/.local/share/Terraria/tModLoader/Worlds"

     

       63
       63
       +
             ];

     

       64
       64
       +
           };

     

       65
       65
       +
         };

     

       66
       66
       +
       

     

       67
       67
       +
         networking.firewall = {

     

       68
       68
       +
           allowedTCPPorts = [7777];

     

       69
       69
       +
           allowedUDPPorts = [7777];

     

       70
       70
       +
         };

     

       71
       71
       +
       }

+1

secrets/secrets.nix

···

       8
       8
        
         "musikquadConfig.age".publicKeys = [yusdacra wolumonde];

     

       9
       9
        
         "nixGithubAccessToken.age".publicKeys = [yusdacra];

     

       10
       10
        
         "nixBuildKey.age".publicKeys = [yusdacra];

     

       11
       11
       +
         "tmodloaderServerPass.age".publicKeys = [yusdacra wolumonde];

     

       11
       12
        
       }

+19

secrets/tmodloaderServerPass.age

···

       1
       1
       +
       age-encryption.org/v1

     

       2
       2
       +
       -> ssh-rsa Abmvag

     

       3
       3
       +
       0F4C6sVSL7x9LUPXO1REpj8tnlnEbQWUaebc79Tc0nj8YJ4c4mrR3IVYq8UiObUV

     

       4
       4
       +
       xUMDjO0+XgHd4udJjmThD2UtBVYApmhYEc9Zv7199CHZARrXIgaFfNQvCnNC1E02

     

       5
       5
       +
       FKUGSh42eQuXcQIGpmj5fU9HVoAfp6VKHvp1CFYRn3J03u9yB589ROIH4ySdWSQP

     

       6
       6
       +
       cetenbKXKaZCYO8ipERumxyb76sninZjWc6BGj8HNF2ePEtXVcFOc5C/DrYX8xrs

     

       7
       7
       +
       0wzCtzj2bUZhtYFT5OAiaDBOi1dbC+eyER1uK6qC4ZFNMAuhVLeU6774QxQ5dL7G

     

       8
       8
       +
       g3FTNkyZdS9KZWl+4yntX0yFfXQbRGJErSRWW2g4w43EPniIgrMcqK5N1X+pycBD

     

       9
       9
       +
       gt1qofz07YGwXUPJfurWkuFpHcsO2/0SXsOSpuxYyzuu/tIdmjGMmiEilQUtQC++

     

       10
       10
       +
       yXdIXQzIyB9jWTwoXUMPMfsLtjwcok8l/dH+/9VWjgQZ+4wycHPDemhawnI33CDg

     

       11
       11
       +
       04zAJEimqoavHY2BD9K88qJSJViKBfSvMPSittblBlMNjvOQ0uedGwB98axXe9mh

     

       12
       12
       +
       LXa4rHnF48uL10HI0byYivamJNyfFug5G9WpH2fSjn1n90o1lp8ZPWKDVR/kj6+9

     

       13
       13
       +
       01zzFthLXqBQ6s5AyVtOP9yLWU06d2lhhBr+g5+J5WU

     

       14
       14
       +
       -> ssh-ed25519 KjIL7g sFHELT2wiMJBp/8HrwSbJPMWthkbpU72Kizvkikc60A

     

       15
       15
       +
       l6kk0fyz1mX8E5y37srUgW3zaZVtKdXyBoD55EgQaaY

     

       16
       16
       +
       -> N/}--grease Y

     

       17
       17
       +
       iItOxVW8A6Mv+7+7bPiMfkxX80VizsYC

     

       18
       18
       +
       --- hfAvTCpVuTOQnTkLljMOpbH9g6gYN+V9FruGBG99YdM

     

       19
       19
       +
       ��35�W��@����lg���GƏ�����T-N���[{���qE�!L"��/�~

+5 -4

users/patriot/default.nix

···

       206
       206
        
             command-not-found.enable =

     

       207
       207
        
               nixosConfig.programs.command-not-found.enable;

     

       208
       208
        
             git = {

     

       209
       209
       -
               signing = {

     

       210
       210
       -
                 key = "E1C119F91F4CAE53E8445CAFBB57FCE7E35984F6";

     

       211
       211
       -
                 signByDefault = true;

     

       212
       212
       -
               };

     

       213
       209
        
               userName = name;

     

       214
       210
        
               userEmail = email;

     

       211
       211
       +
               extraConfig = {

     

       212
       212
       +
                 gpg.format = "ssh";

     

       213
       213
       +
                 commit.gpgsign = true;

     

       214
       214
       +
                 user.signingkey = builtins.readFile ../../secrets/yusdacra.key.pub;

     

       215
       215
       +
               };

     

       215
       216
        
             };

     

       216
       217
        
           };

     

       217
       218
        
           services = {

users/patriot/wallpaper.png

This is a binary file and will not be displayed.