commit 9f1c3ab386fb21788e96fab196132661045c7e9c · ptr.pet/ark

+28 -8

_sources/generated.json

···

       228
       228
        
           },

     

       229
       229
        
           "nixpkgs-xr": {

     

       230
       230
        
               "cargoLocks": null,

     

       231
       231
       -
               "date": "2025-11-06",

     

       231
       231
       +
               "date": "2025-11-16",

     

       232
       232
        
               "extract": null,

     

       233
       233
        
               "name": "nixpkgs-xr",

     

       234
       234
        
               "passthru": null,

     
···

       240
       240
        
                   "name": null,

     

       241
       241
        
                   "owner": "nix-community",

     

       242
       242
        
                   "repo": "nixpkgs-xr",

     

       243
       243
       -
                   "rev": "08cdeeabf5fcb0e44d2be5540e6dfa52f70f0401",

     

       244
       244
       -
                   "sha256": "sha256-/SzIdw3HiKb9C66MyiQFuuX5ExVASm0M3abav9ypZPo=",

     

       243
       243
       +
                   "rev": "d80a797b330a98df365cd25fd8350afbe5a5da83",

     

       244
       244
       +
                   "sha256": "sha256-L7hobkC7G7rxNatvxgz5RbMQaIVwObj7l1Pz3utx4Pk=",

     

       245
       245
        
                   "sparseCheckout": [],

     

       246
       246
        
                   "type": "github"

     

       247
       247
        
               },

     

       248
       248
       -
               "version": "08cdeeabf5fcb0e44d2be5540e6dfa52f70f0401"

     

       248
       248
       +
               "version": "d80a797b330a98df365cd25fd8350afbe5a5da83"

     

       249
       249
        
           },

     

       250
       250
        
           "nsid-tracker": {

     

       251
       251
        
               "cargoLocks": null,

     
···

       310
       310
        
           },

     

       311
       311
        
           "tangled": {

     

       312
       312
        
               "cargoLocks": null,

     

       313
       313
       -
               "date": "2025-11-05",

     

       313
       313
       +
               "date": "2025-11-20",

     

       314
       314
        
               "extract": null,

     

       315
       315
        
               "name": "tangled",

     

       316
       316
        
               "passthru": null,

     
···

       320
       320
        
                   "fetchSubmodules": false,

     

       321
       321
        
                   "leaveDotGit": false,

     

       322
       322
        
                   "name": null,

     

       323
       323
       -
                   "rev": "dd1bcee8c99bf799130645f32c94d1693f812f0d",

     

       324
       324
       -
                   "sha256": "sha256-1PGiDLrx1hNGNoUCnmc1Np2t48r7nIxxiTO8JHvaTws=",

     

       323
       323
       +
                   "rev": "12ef7f8f63ee4a14a552ebed603802c79e4d72f8",

     

       324
       324
       +
                   "sha256": "sha256-t8UQ85/bPXrbFs3V/paFtQvv4lSrr2lszrdcgspuAaA=",

     

       325
       325
        
                   "sparseCheckout": [],

     

       326
       326
        
                   "type": "git",

     

       327
       327
        
                   "url": "https://tangled.org/@tangled.org/core"

     

       328
       328
        
               },

     

       329
       329
       -
               "version": "dd1bcee8c99bf799130645f32c94d1693f812f0d"

     

       329
       329
       +
               "version": "12ef7f8f63ee4a14a552ebed603802c79e4d72f8"

     

       330
       330
        
           },

     

       331
       331
        
           "tangled-sqlite-lib": {

     

       332
       332
        
               "cargoLocks": null,

     
···

       341
       341
        
                   "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip"

     

       342
       342
        
               },

     

       343
       343
        
               "version": "3450100"

     

       344
       344
       +
           },

     

       345
       345
       +
           "trill": {

     

       346
       346
       +
               "cargoLocks": null,

     

       347
       347
       +
               "date": "2025-11-25",

     

       348
       348
       +
               "extract": null,

     

       349
       349
       +
               "name": "trill",

     

       350
       350
       +
               "passthru": null,

     

       351
       351
       +
               "pinned": false,

     

       352
       352
       +
               "src": {

     

       353
       353
       +
                   "deepClone": false,

     

       354
       354
       +
                   "fetchSubmodules": false,

     

       355
       355
       +
                   "leaveDotGit": false,

     

       356
       356
       +
                   "name": null,

     

       357
       357
       +
                   "rev": "c9604685156e009cebd0ddc3b31672455f635387",

     

       358
       358
       +
                   "sha256": "sha256-so9EHN0GQ7rFSmnLnpRap2RqRcklhe3C1HdyAKeR6No=",

     

       359
       359
       +
                   "sparseCheckout": [],

     

       360
       360
       +
                   "type": "git",

     

       361
       361
       +
                   "url": "https://tangled.org/@ptr.pet/trill"

     

       362
       362
       +
               },

     

       363
       363
       +
               "version": "c9604685156e009cebd0ddc3b31672455f635387"

     

       344
       364
        
           },

     

       345
       365
        
           "zen-browser": {

     

       346
       366
        
               "cargoLocks": null,

+22 -8

_sources/generated.nix

···

       143
       143
        
         };

     

       144
       144
        
         nixpkgs-xr = {

     

       145
       145
        
           pname = "nixpkgs-xr";

     

       146
       146
       -
           version = "08cdeeabf5fcb0e44d2be5540e6dfa52f70f0401";

     

       146
       146
       +
           version = "d80a797b330a98df365cd25fd8350afbe5a5da83";

     

       147
       147
        
           src = fetchFromGitHub {

     

       148
       148
        
             owner = "nix-community";

     

       149
       149
        
             repo = "nixpkgs-xr";

     

       150
       150
       -
             rev = "08cdeeabf5fcb0e44d2be5540e6dfa52f70f0401";

     

       150
       150
       +
             rev = "d80a797b330a98df365cd25fd8350afbe5a5da83";

     

       151
       151
        
             fetchSubmodules = false;

     

       152
       152
       -
             sha256 = "sha256-/SzIdw3HiKb9C66MyiQFuuX5ExVASm0M3abav9ypZPo=";

     

       152
       152
       +
             sha256 = "sha256-L7hobkC7G7rxNatvxgz5RbMQaIVwObj7l1Pz3utx4Pk=";

     

       153
       153
        
           };

     

       154
       154
       -
           date = "2025-11-06";

     

       154
       154
       +
           date = "2025-11-16";

     

       155
       155
        
         };

     

       156
       156
        
         nsid-tracker = {

     

       157
       157
        
           pname = "nsid-tracker";

     
···

       195
       195
        
         };

     

       196
       196
        
         tangled = {

     

       197
       197
        
           pname = "tangled";

     

       198
       198
       -
           version = "dd1bcee8c99bf799130645f32c94d1693f812f0d";

     

       198
       198
       +
           version = "12ef7f8f63ee4a14a552ebed603802c79e4d72f8";

     

       199
       199
        
           src = fetchgit {

     

       200
       200
        
             url = "https://tangled.org/@tangled.org/core";

     

       201
       201
       -
             rev = "dd1bcee8c99bf799130645f32c94d1693f812f0d";

     

       201
       201
       +
             rev = "12ef7f8f63ee4a14a552ebed603802c79e4d72f8";

     

       202
       202
        
             fetchSubmodules = false;

     

       203
       203
        
             deepClone = false;

     

       204
       204
        
             leaveDotGit = false;

     

       205
       205
        
             sparseCheckout = [ ];

     

       206
       206
       -
             sha256 = "sha256-1PGiDLrx1hNGNoUCnmc1Np2t48r7nIxxiTO8JHvaTws=";

     

       206
       206
       +
             sha256 = "sha256-t8UQ85/bPXrbFs3V/paFtQvv4lSrr2lszrdcgspuAaA=";

     

       207
       207
        
           };

     

       208
       208
       -
           date = "2025-11-05";

     

       208
       208
       +
           date = "2025-11-20";

     

       209
       209
        
         };

     

       210
       210
        
         tangled-sqlite-lib = {

     

       211
       211
        
           pname = "tangled-sqlite-lib";

     
···

       214
       214
        
             url = "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip";

     

       215
       215
        
             sha256 = "sha256-bJoMjirsBjm2Qk9KPiy3yV3+8b/POlYe76/FQbciHro=";

     

       216
       216
        
           };

     

       217
       217
       +
         };

     

       218
       218
       +
         trill = {

     

       219
       219
       +
           pname = "trill";

     

       220
       220
       +
           version = "c9604685156e009cebd0ddc3b31672455f635387";

     

       221
       221
       +
           src = fetchgit {

     

       222
       222
       +
             url = "https://tangled.org/@ptr.pet/trill";

     

       223
       223
       +
             rev = "c9604685156e009cebd0ddc3b31672455f635387";

     

       224
       224
       +
             fetchSubmodules = false;

     

       225
       225
       +
             deepClone = false;

     

       226
       226
       +
             leaveDotGit = false;

     

       227
       227
       +
             sparseCheckout = [ ];

     

       228
       228
       +
             sha256 = "sha256-so9EHN0GQ7rFSmnLnpRap2RqRcklhe3C1HdyAKeR6No=";

     

       229
       229
       +
           };

     

       230
       230
       +
           date = "2025-11-25";

     

       217
       231
        
         };

     

       218
       232
        
         zen-browser = {

     

       219
       233
        
           pname = "zen-browser";

+1

dns/dnsconfig.js

···

       101
       101
        
           A("@", WOLUMONDE_IP, CF_PROXY_OFF),

     

       102
       102
        
           A("test", WOLUMONDE_IP, CF_PROXY_OFF),

     

       103
       103
        
           A("nucleus", DZWONEK_IP, CF_PROXY_OFF),

     

       104
       104
       +
           A("trill", DZWONEK_IP, CF_PROXY_OFF),

     

       104
       105
        
           // atproto

     

       105
       106
        
           TXT("_atproto", "did=did:plc:dfl62fgb7wtjj3fcbb72naae"),

     

       106
       107
        
           A("nil", WOLUMONDE_IP, CF_PROXY_OFF),

+1

hosts/chernobog/modules/bluetooth.nix

···

       1
       1
        
       {pkgs, ...}: {

     

       2
       2
        
         hardware.bluetooth.enable = true;

     

       3
       3
       +
         hardware.steam-hardware.enable = true;

     

       3
       4
        
       

     

       4
       5
        
         environment.systemPackages = [pkgs.bluetuith];

     

       5
       6
        
       }

+24

hosts/dzwonek/modules/trill.nix

···

       1
       1
       +
       {pkgs, inputs, ...}:

     

       2
       2
       +
       let

     

       3
       3
       +
         rootDomain = "vpn.gaze.systems";

     

       4
       4
       +
         domain = "trill.ptr.pet";

     

       5
       5
       +
         pkg = pkgs.callPackage "${inputs.trill}/nix" rec {

     

       6
       6
       +
           memos-modules = pkgs.callPackage "${inputs.trill}/nix/modules.nix" {};

     

       7
       7
       +
           VITE_CLIENT_URI = "https://${domain}";

     

       8
       8
       +
           VITE_OAUTH_CLIENT_ID = "${VITE_CLIENT_URI}/oauth-client-metadata.json";

     

       9
       9
       +
           VITE_OAUTH_REDIRECT_URL = "${VITE_CLIENT_URI}/";

     

       10
       10
       +
         };

     

       11
       11
       +
       in

     

       12
       12
       +
       {

     

       13
       13
       +
         security.acme.certs.${rootDomain}.extraDomainNames = [domain];

     

       14
       14
       +
         services.nginx.virtualHosts.${domain} = {

     

       15
       15
       +
           useACMEHost = rootDomain;

     

       16
       16
       +
           forceSSL = true;

     

       17
       17
       +
           quic = true;

     

       18
       18
       +
           kTLS = true;

     

       19
       19
       +
           locations."/" = {

     

       20
       20
       +
             root = pkg;

     

       21
       21
       +
             tryFiles = "$uri $uri/ /index.html";

     

       22
       22
       +
           };

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+2 -2

hosts/wolumonde/modules/tangled.nix/knot.nix

···

       5
       5
        
         ...

     

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
       -
         knotCfg = config.services.tangled-knot;

     

       8
       8
       +
         knotCfg = config.services.tangled.knot;

     

       9
       9
        
       in

     

       10
       10
        
       {

     

       11
       11
        
         imports = [

     

       12
       12
        
           "${inputs.tangled}/nix/modules/knot.nix"

     

       13
       13
        
         ];

     

       14
       14
        
       

     

       15
       15
       -
         services.tangled-knot = {

     

       15
       15
       +
         services.tangled.knot = {

     

       16
       16
        
           enable = true;

     

       17
       17
        
           package = terra.tangled-knot;

     

       18
       18
        
           gitUser = "git";

+2 -2

hosts/wolumonde/modules/tangled.nix/spindle.nix

···

       6
       6
        
         ...

     

       7
       7
        
       }:

     

       8
       8
        
       let

     

       9
       9
       -
         spindleCfg = config.services.tangled-spindle;

     

       9
       9
       +
         spindleCfg = config.services.tangled.spindle;

     

       10
       10
        
       in

     

       11
       11
        
       {

     

       12
       12
        
         imports = [

     

       13
       13
        
           "${inputs.tangled}/nix/modules/spindle.nix"

     

       14
       14
        
         ];

     

       15
       15
        
       

     

       16
       16
       -
         services.tangled-spindle = {

     

       16
       16
       +
         services.tangled.spindle = {

     

       17
       17
        
           enable = true;

     

       18
       18
        
           package = terra.tangled-spindle;

     

       19
       19
        
           server = {

+4

nvfetcher.toml

···

       44
       44
        
       src.git = "https://tangled.org/@ptr.pet/nucleus"

     

       45
       45
        
       fetch.git = "https://tangled.org/@ptr.pet/nucleus"

     

       46
       46
        
       

     

       47
       47
       +
       [trill]

     

       48
       48
       +
       src.git = "https://tangled.org/@ptr.pet/trill"

     

       49
       49
       +
       fetch.git = "https://tangled.org/@ptr.pet/trill"

     

       50
       50
       +
       

     

       47
       51
        
       ## TANGLED ##

     

       48
       52
        
       

     

       49
       53
        
       [tangled]

+3 -1

pkgs-set/overlays/nixpkgs-xr.nix

···

       1
       1
       -
       {inputs, ...}: final: prev: ((import inputs.nixpkgs-xr).overlays.default final prev) // { wivrn = prev.wivrn; }

     

       1
       1
       +
       {inputs, ...}: final: prev:

     

       2
       2
       +
       ((import inputs.nixpkgs-xr).overlays.default final prev)

     

       3
       3
       +
       # // { wivrn = prev.wivrn; }

+49

pkgs-set/pkgs/helium.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       pkgs.appimageTools.wrapType2 rec {

     

       7
       7
       +
         pname = "helium";

     

       8
       8
       +
         version = "0.6.4.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = let

     

       11
       11
       +
           platformMap = {

     

       12
       12
       +
             "x86_64-linux" = "x86_64";

     

       13
       13
       +
             "aarch64-linux" = "arm64";

     

       14
       14
       +
           };

     

       15
       15
       +
       

     

       16
       16
       +
           platform = platformMap.${pkgs.system};

     

       17
       17
       +
       

     

       18
       18
       +
           hashes = {

     

       19
       19
       +
             "x86_64-linux" = "sha256-DlEFuFwx2Qjr9eb6uiSYzM/F3r2hdtkMW5drJyJt/YE=";

     

       20
       20
       +
             "aarch64-linux" = "sha256-B63tvOtSRlMRJozvzC7lqG2LM0ZgLIq2G/AHABl+Qqg=";

     

       21
       21
       +
           };

     

       22
       22
       +
       

     

       23
       23
       +
           hash = hashes.${pkgs.system};

     

       24
       24
       +
         in

     

       25
       25
       +
           pkgs.fetchurl {

     

       26
       26
       +
             url = "https://github.com/imputnet/helium-linux/releases/download/${version}/helium-${version}-${platform}.AppImage";

     

       27
       27
       +
             inherit hash;

     

       28
       28
       +
           };

     

       29
       29
       +
       

     

       30
       30
       +
         extraInstallCommands = let

     

       31
       31
       +
           contents = pkgs.appimageTools.extractType2 {inherit pname version src;};

     

       32
       32
       +
         in ''

     

       33
       33
       +
           mkdir -p "$out/share/applications"

     

       34
       34
       +
           mkdir -p "$out/share/lib/helium"

     

       35
       35
       +
           cp -r ${contents}/opt/helium/locales "$out/share/lib/helium"

     

       36
       36
       +
           cp -r ${contents}/usr/share/* "$out/share"

     

       37
       37
       +
           cp "${contents}/${pname}.desktop" "$out/share/applications/"

     

       38
       38
       +
           substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=AppRun' 'Exec=${meta.mainProgram}'

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         meta = {

     

       42
       42
       +
           description = "Private, fast, and honest web browser based on Chromium";

     

       43
       43
       +
           homepage = "https://github.com/imputnet/helium-chromium";

     

       44
       44
       +
           changelog = "https://github.com/imputnet/helium-linux/releases/tag/${version}";

     

       45
       45
       +
           platforms = ["x86_64-linux" "aarch64-linux"];

     

       46
       46
       +
           license = lib.licenses.gpl3;

     

       47
       47
       +
           mainProgram = "helium";

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+13 -2

users/mayer/default.nix

···

       3
       3
        
         lib,

     

       4
       4
        
         tlib,

     

       5
       5
        
         config,

     

       6
       6
       +
         terra,

     

       6
       7
        
         ...

     

       7
       8
        
       }@globalAttrs:

     

       8
       9
        
       let

     
···

       22
       23
        
             "adbusers"

     

       23
       24
        
             "dialout"

     

       24
       25
        
             "video"

     

       26
       26
       +
             "input"

     

       25
       27
        
           ];

     

       26
       28
        
           shell = pkgs.nushell;

     

       27
       29
        
           hashedPassword = "$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/";

     
···

       61
       63
        
           }

     

       62
       64
        
         ];

     

       63
       65
        
       

     

       66
       66
       +
         xdg.portal = {

     

       67
       67
       +
           enable = true;

     

       68
       68
       +
           wlr.enable = true;

     

       69
       69
       +
           xdgOpenUsePortal = true;

     

       70
       70
       +
         };

     

       71
       71
       +
       

     

       72
       72
       +
         services.joycond.enable = true;

     

       73
       73
       +
       

     

       64
       74
        
         home-manager.users.mayer =

     

       65
       75
        
           {

     

       66
       76
        
             pkgs,

     
···

       101
       111
        
       

     

       102
       112
        
             home = {

     

       103
       113
        
               homeDirectory = nixosConfig.users.users.mayer.home;

     

       104
       104
       -
               packages = with pkgs; [

     

       114
       114
       +
               packages = (with pkgs; [

     

       105
       115
        
                 # Font stuff

     

       106
       116
        
                 noto-fonts-cjk-sans

     

       107
       117
        
                 font-awesome

     
···

       118
       128
        
                 gearlever

     

       119
       129
        
                 signal-desktop

     

       120
       130
        
                 bs-manager

     

       121
       121
       -
               ];

     

       131
       131
       +
                 cemu

     

       132
       132
       +
               ]) ++ [terra.helium];

     

       122
       133
        
             };

     

       123
       134
        
       

     

       124
       135
        
             fonts.fontconfig.enable = l.mkForce true;

+7 -3

users/modules/niri/config.kdl

···

       60
       60
        
           }

     

       61
       61
        
       

     

       62
       62
        
           warp-mouse-to-focus

     

       63
       63
       -
           focus-follows-mouse

     

       63
       63
       +
           focus-follows-mouse max-scroll-amount="0%"

     

       64
       64
        
       

     

       65
       65
        
           mod-key "Super"

     

       66
       66
        
           mod-key-nested "Alt"

     
···

       113
       113
        
           struts { }

     

       114
       114
        
       }

     

       115
       115
        
       

     

       116
       116
       -
       spawn-at-startup "swaybg" "-c" "000000"

     

       116
       116
       +
       spawn-at-startup "swaybg" "-i" "%%wallpaper%%"

     

       117
       117
        
       

     

       118
       118
        
       hotkey-overlay {

     

       119
       119
        
           // skip-at-startup

     
···

       140
       140
        
           // - host Firefox (app-id is "firefox")

     

       141
       141
        
           // - Flatpak Firefox (app-id is "org.mozilla.firefox")

     

       142
       142
        
           match app-id=r#"firefox$"# title="^Picture-in-Picture$"

     

       143
       143
       -
           match app-id=r#"^tofi"#

     

       144
       143
        
       

     

       145
       144
        
           open-floating true

     

       146
       145
        
       }

     
···

       151
       150
        
           // match namespace="^notifications$"

     

       152
       151
        
       

     

       153
       152
        
           block-out-from "screen-capture"

     

       153
       153
       +
       }

     

       154
       154
       +
       

     

       155
       155
       +
       window-rule {

     

       156
       156
       +
           match app-id="steam" title=r#"^notificationtoasts_\d+_desktop$"#

     

       157
       157
       +
           default-floating-position x=10 y=10 relative-to="bottom-right"

     

       154
       158
        
       }

     

       155
       159
        
       

     

       156
       160
        
       window-rule {

+13 -1

users/modules/niri/default.nix

···

       6
       6
        
         tlib,

     

       7
       7
        
         ...

     

       8
       8
        
       }:

     

       9
       9
       +
       let

     

       10
       10
       +
         l = lib;

     

       11
       11
       +
       in

     

       9
       12
        
       {

     

       10
       13
        
         imports = [

     

       11
       14
        
           ../wayland

     
···

       15
       18
        
         ];

     

       16
       19
        
       

     

       17
       20
        
         home.packages = with pkgs; [niri xwayland-satellite brightnessctl swaybg];

     

       18
       18
       -
         xdg.configFile."niri/config.kdl".source = ./config.kdl;

     

       21
       21
       +
         xdg.configFile."niri/config.kdl".text =

     

       22
       22
       +
           let

     

       23
       23
       +
             replace = {

     

       24
       24
       +
               wallpaper = toString ../../mayer/wallpaper.png;

     

       25
       25
       +
             };

     

       26
       26
       +
           in

     

       27
       27
       +
           l.replaceStrings

     

       28
       28
       +
           (l.map (n: "%%${n}%%") (l.attrNames replace))

     

       29
       29
       +
           (l.attrValues replace)

     

       30
       30
       +
           (l.fileContents ./config.kdl);

     

       19
       31
        
       }