commit 3e124402d4efc88dec56d6f582905267840bcda2 · aylac.top/nixcfg-own-knot

+180 -4

flake.lock

···

       351
       351
        
               "type": "github"

     

       352
       352
        
             }

     

       353
       353
        
           },

     

       354
       354
       +
           "flake-utils": {

     

       355
       355
       +
             "inputs": {

     

       356
       356
       +
               "systems": "systems_2"

     

       357
       357
       +
             },

     

       358
       358
       +
             "locked": {

     

       359
       359
       +
               "lastModified": 1694529238,

     

       360
       360
       +
               "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",

     

       361
       361
       +
               "owner": "numtide",

     

       362
       362
       +
               "repo": "flake-utils",

     

       363
       363
       +
               "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",

     

       364
       364
       +
               "type": "github"

     

       365
       365
       +
             },

     

       366
       366
       +
             "original": {

     

       367
       367
       +
               "owner": "numtide",

     

       368
       368
       +
               "repo": "flake-utils",

     

       369
       369
       +
               "type": "github"

     

       370
       370
       +
             }

     

       371
       371
       +
           },

     

       354
       372
        
           "fontix": {

     

       355
       373
        
             "inputs": {

     

       356
       374
        
               "actions-nix": "actions-nix_2",

     
···

       535
       553
        
               "type": "github"

     

       536
       554
        
             }

     

       537
       555
        
           },

     

       556
       556
       +
           "gomod2nix": {

     

       557
       557
       +
             "inputs": {

     

       558
       558
       +
               "flake-utils": "flake-utils",

     

       559
       559
       +
               "nixpkgs": [

     

       560
       560
       +
                 "tangled-core",

     

       561
       561
       +
                 "nixpkgs"

     

       562
       562
       +
               ]

     

       563
       563
       +
             },

     

       564
       564
       +
             "locked": {

     

       565
       565
       +
               "lastModified": 1754078208,

     

       566
       566
       +
               "narHash": "sha256-YVoIFDCDpYuU3riaDEJ3xiGdPOtsx4sR5eTzHTytPV8=",

     

       567
       567
       +
               "owner": "nix-community",

     

       568
       568
       +
               "repo": "gomod2nix",

     

       569
       569
       +
               "rev": "7f963246a71626c7fc70b431a315c4388a0c95cf",

     

       570
       570
       +
               "type": "github"

     

       571
       571
       +
             },

     

       572
       572
       +
             "original": {

     

       573
       573
       +
               "owner": "nix-community",

     

       574
       574
       +
               "repo": "gomod2nix",

     

       575
       575
       +
               "type": "github"

     

       576
       576
       +
             }

     

       577
       577
       +
           },

     

       538
       578
        
           "home-manager": {

     

       539
       579
        
             "inputs": {

     

       540
       580
        
               "nixpkgs": [

     
···

       599
       639
        
               "type": "github"

     

       600
       640
        
             }

     

       601
       641
        
           },

     

       642
       642
       +
           "htmx-src": {

     

       643
       643
       +
             "flake": false,

     

       644
       644
       +
             "locked": {

     

       645
       645
       +
               "narHash": "sha256-nm6avZuEBg67SSyyZUhjpXVNstHHgUxrtBHqJgowU08=",

     

       646
       646
       +
               "type": "file",

     

       647
       647
       +
               "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js"

     

       648
       648
       +
             },

     

       649
       649
       +
             "original": {

     

       650
       650
       +
               "type": "file",

     

       651
       651
       +
               "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js"

     

       652
       652
       +
             }

     

       653
       653
       +
           },

     

       654
       654
       +
           "htmx-ws-src": {

     

       655
       655
       +
             "flake": false,

     

       656
       656
       +
             "locked": {

     

       657
       657
       +
               "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=",

     

       658
       658
       +
               "type": "file",

     

       659
       659
       +
               "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2"

     

       660
       660
       +
             },

     

       661
       661
       +
             "original": {

     

       662
       662
       +
               "type": "file",

     

       663
       663
       +
               "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2"

     

       664
       664
       +
             }

     

       665
       665
       +
           },

     

       666
       666
       +
           "ibm-plex-mono-src": {

     

       667
       667
       +
             "flake": false,

     

       668
       668
       +
             "locked": {

     

       669
       669
       +
               "lastModified": 1731402384,

     

       670
       670
       +
               "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=",

     

       671
       671
       +
               "type": "tarball",

     

       672
       672
       +
               "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"

     

       673
       673
       +
             },

     

       674
       674
       +
             "original": {

     

       675
       675
       +
               "type": "tarball",

     

       676
       676
       +
               "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"

     

       677
       677
       +
             }

     

       678
       678
       +
           },

     

       679
       679
       +
           "indigo": {

     

       680
       680
       +
             "flake": false,

     

       681
       681
       +
             "locked": {

     

       682
       682
       +
               "lastModified": 1753693716,

     

       683
       683
       +
               "narHash": "sha256-DMIKnCJRODQXEHUxA+7mLzRALmnZhkkbHlFT2rCQYrE=",

     

       684
       684
       +
               "owner": "oppiliappan",

     

       685
       685
       +
               "repo": "indigo",

     

       686
       686
       +
               "rev": "5f170569da9360f57add450a278d73538092d8ca",

     

       687
       687
       +
               "type": "github"

     

       688
       688
       +
             },

     

       689
       689
       +
             "original": {

     

       690
       690
       +
               "owner": "oppiliappan",

     

       691
       691
       +
               "repo": "indigo",

     

       692
       692
       +
               "type": "github"

     

       693
       693
       +
             }

     

       694
       694
       +
           },

     

       695
       695
       +
           "inter-fonts-src": {

     

       696
       696
       +
             "flake": false,

     

       697
       697
       +
             "locked": {

     

       698
       698
       +
               "lastModified": 1731687360,

     

       699
       699
       +
               "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=",

     

       700
       700
       +
               "type": "tarball",

     

       701
       701
       +
               "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"

     

       702
       702
       +
             },

     

       703
       703
       +
             "original": {

     

       704
       704
       +
               "type": "tarball",

     

       705
       705
       +
               "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"

     

       706
       706
       +
             }

     

       707
       707
       +
           },

     

       602
       708
        
           "lanzaboote": {

     

       603
       709
        
             "inputs": {

     

       604
       710
        
               "crane": "crane",

     
···

       623
       729
        
               "ref": "v0.4.2",

     

       624
       730
        
               "repo": "lanzaboote",

     

       625
       731
        
               "type": "github"

     

       732
       732
       +
             }

     

       733
       733
       +
           },

     

       734
       734
       +
           "lucide-src": {

     

       735
       735
       +
             "flake": false,

     

       736
       736
       +
             "locked": {

     

       737
       737
       +
               "lastModified": 1754044466,

     

       738
       738
       +
               "narHash": "sha256-+exBR2OToB1iv7ZQI2S4B0lXA/QRvC9n6U99UxGpJGs=",

     

       739
       739
       +
               "type": "tarball",

     

       740
       740
       +
               "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip"

     

       741
       741
       +
             },

     

       742
       742
       +
             "original": {

     

       743
       743
       +
               "type": "tarball",

     

       744
       744
       +
               "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip"

     

       626
       745
        
             }

     

       627
       746
        
           },

     

       628
       747
        
           "nix-darwin": {

     
···

       818
       937
        
               "nixpkgs": "nixpkgs_2",

     

       819
       938
        
               "nixpkgs-unstable": "nixpkgs-unstable",

     

       820
       939
        
               "nur": "nur",

     

       821
       821
       -
               "secrets": "secrets"

     

       940
       940
       +
               "secrets": "secrets",

     

       941
       941
       +
               "tangled-core": "tangled-core"

     

       822
       942
        
             }

     

       823
       943
        
           },

     

       824
       944
        
           "rust-overlay": {

     
···

       845
       965
        
           "secrets": {

     

       846
       966
        
             "flake": false,

     

       847
       967
        
             "locked": {

     

       848
       848
       -
               "lastModified": 1755310472,

     

       849
       849
       -
               "narHash": "sha256-5+pJ8MaRuL4zl/HDtTkzZeoEDjeUC7UXa25gwGu2850=",

     

       968
       968
       +
               "lastModified": 1755335838,

     

       969
       969
       +
               "narHash": "sha256-KaUVYpZKZlgh/MnH5hyedBo7hFJgCJkOz5VSNfITsNw=",

     

       850
       970
        
               "owner": "ayla6",

     

       851
       971
        
               "repo": "secrets",

     

       852
       852
       -
               "rev": "2758e4878df0dfb6fc8ad5aefc21f95881e2e7e0",

     

       972
       972
       +
               "rev": "70c60e8345db2f9a35b33309ef1bc7177330bb00",

     

       853
       973
        
               "type": "github"

     

       854
       974
        
             },

     

       855
       975
        
             "original": {

     
···

       858
       978
        
               "type": "github"

     

       859
       979
        
             }

     

       860
       980
        
           },

     

       981
       981
       +
           "sqlite-lib-src": {

     

       982
       982
       +
             "flake": false,

     

       983
       983
       +
             "locked": {

     

       984
       984
       +
               "lastModified": 1706631843,

     

       985
       985
       +
               "narHash": "sha256-bJoMjirsBjm2Qk9KPiy3yV3+8b/POlYe76/FQbciHro=",

     

       986
       986
       +
               "type": "tarball",

     

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

     

       988
       988
       +
             },

     

       989
       989
       +
             "original": {

     

       990
       990
       +
               "type": "tarball",

     

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

     

       992
       992
       +
             }

     

       993
       993
       +
           },

     

       861
       994
        
           "systems": {

     

       862
       995
        
             "locked": {

     

       863
       996
        
               "lastModified": 1681028828,

     
···

       871
       1004
        
               "owner": "nix-systems",

     

       872
       1005
        
               "repo": "default",

     

       873
       1006
        
               "type": "github"

     

       1007
       1007
       +
             }

     

       1008
       1008
       +
           },

     

       1009
       1009
       +
           "systems_2": {

     

       1010
       1010
       +
             "locked": {

     

       1011
       1011
       +
               "lastModified": 1681028828,

     

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

     

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

     

       1014
       1014
       +
               "repo": "default",

     

       1015
       1015
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       1016
       1016
       +
               "type": "github"

     

       1017
       1017
       +
             },

     

       1018
       1018
       +
             "original": {

     

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

     

       1020
       1020
       +
               "repo": "default",

     

       1021
       1021
       +
               "type": "github"

     

       1022
       1022
       +
             }

     

       1023
       1023
       +
           },

     

       1024
       1024
       +
           "tangled-core": {

     

       1025
       1025
       +
             "inputs": {

     

       1026
       1026
       +
               "gomod2nix": "gomod2nix",

     

       1027
       1027
       +
               "htmx-src": "htmx-src",

     

       1028
       1028
       +
               "htmx-ws-src": "htmx-ws-src",

     

       1029
       1029
       +
               "ibm-plex-mono-src": "ibm-plex-mono-src",

     

       1030
       1030
       +
               "indigo": "indigo",

     

       1031
       1031
       +
               "inter-fonts-src": "inter-fonts-src",

     

       1032
       1032
       +
               "lucide-src": "lucide-src",

     

       1033
       1033
       +
               "nixpkgs": [

     

       1034
       1034
       +
                 "nixpkgs"

     

       1035
       1035
       +
               ],

     

       1036
       1036
       +
               "sqlite-lib-src": "sqlite-lib-src"

     

       1037
       1037
       +
             },

     

       1038
       1038
       +
             "locked": {

     

       1039
       1039
       +
               "lastModified": 1755330292,

     

       1040
       1040
       +
               "narHash": "sha256-Dh3t2ugmuJxtxxCEg8MlxekUWZwjKiH0wHBLgfT5lbA=",

     

       1041
       1041
       +
               "ref": "refs/heads/master",

     

       1042
       1042
       +
               "rev": "ea1263475985aade8f1f1ecd59d8e8cbc3f6d9b3",

     

       1043
       1043
       +
               "revCount": 1152,

     

       1044
       1044
       +
               "type": "git",

     

       1045
       1045
       +
               "url": "https://tangled.sh/@tangled.sh/core"

     

       1046
       1046
       +
             },

     

       1047
       1047
       +
             "original": {

     

       1048
       1048
       +
               "type": "git",

     

       1049
       1049
       +
               "url": "https://tangled.sh/@tangled.sh/core"

     

       874
       1050
        
             }

     

       875
       1051
        
           },

     

       876
       1052
        
           "treefmt-nix": {

flake.nix

···

       59
       59
        
             url = "github:ayla6/secrets";

     

       60
       60
        
             flake = false;

     

       61
       61
        
           };

     

       62
       62
       +
       

     

       63
       63
       +
           tangled-core = {

     

       64
       64
       +
             url = "git+https://tangled.sh/@tangled.sh/core";

     

       65
       65
       +
             inputs.nixpkgs.follows = "nixpkgs";

     

       66
       66
       +
           };

     

       62
       67
        
         };

     

       63
       68
        
       

     

       64
       69
        
         nixConfig = {

hosts/nanpi/secrets.nix

···

       9
       9
        
           syncthingKey.file = "${self.inputs.secrets}/ayla/syncthing/nanpi/key.age";

     

       10
       10
        
           resticPassword.file = "${self.inputs.secrets}/restic-passwd.age";

     

       11
       11
        
           vaultwarden.file = "${self.inputs.secrets}/vaultwarden.age";

     

       12
       12
       +
           tangled-knot.file = "${self.inputs.secrets}/tangled-knot.age";

     

       12
       13
        
         };

     

       13
       14
        
       }

+15 -1

hosts/nanpi/services.nix

···

       1
       1
        
       {config, ...}: let

     

       2
       2
       -
         dataDirectory = "/home/Data";

     

       2
       2
       +
         dataDirectory = "/var/lib";

     

       3
       3
        
       in {

     

       4
       4
        
         services = {

     

       5
       5
        
           pds = {

     
···

       22
       22
        
                 ingress = {

     

       23
       23
        
                   "${config.mySnippets.aylac-top.networkMap.pds.vHost}" = "http://${config.mySnippets.aylac-top.networkMap.pds.hostName}:${toString config.mySnippets.aylac-top.networkMap.pds.port}";

     

       24
       24
        
                   "${config.mySnippets.aylac-top.networkMap.vaultwarden.vHost}" = "http://${config.mySnippets.aylac-top.networkMap.vaultwarden.hostName}:${toString config.mySnippets.aylac-top.networkMap.vaultwarden.port}";

     

       25
       25
       +
                   "${config.mySnippets.aylac-top.networkMap.tangled-knot.vHost}" = "http://${config.mySnippets.aylac-top.networkMap.tangled-knot.hostName}:${toString config.mySnippets.aylac-top.networkMap.tangled-knot.port}";

     

       25
       26
        
                 };

     

       26
       27
        
               };

     

       27
       28
        
             };

     
···

       76
       77
        
             enable = true;

     

       77
       78
        
             openFirewall = true;

     

       78
       79
        
             dataDir = "${dataDirectory}/jellyfin";

     

       80
       80
       +
           };

     

       81
       81
       +
       

     

       82
       82
       +
           # because of the lack of forwarding the ssh because of the tunnel, repo origins have to be added like this

     

       83
       83
       +
           # git@nanpi:did\:plc\:3c6vkaq7xf5kz3va3muptjh5/nixcfg

     

       84
       84
       +
           # as opposed to git@knot.aylac.top:aylac.top/nixcfg

     

       85
       85
       +
           tangled-knot = {

     

       86
       86
       +
             enable = true;

     

       87
       87
       +
             openFirewall = false;

     

       88
       88
       +
             server = {

     

       89
       89
       +
               hostname = config.mySnippets.aylac-top.networkMap.tangled-knot.vHost;

     

       90
       90
       +
               listenAddr = "0.0.0.0:${toString config.mySnippets.aylac-top.networkMap.tangled-knot.port}";

     

       91
       91
       +
               secretFile = config.age.secrets.tangled-knot.path;

     

       92
       92
       +
             };

     

       79
       93
        
           };

     

       80
       94
        
         };

     

       81
       95
        
       }

modules/flake/nixos.nix

···

       35
       35
        
                     inputs.disko.nixosModules.disko

     

       36
       36
        
                     inputs.home-manager.nixosModules.home-manager

     

       37
       37
        
                     inputs.lanzaboote.nixosModules.lanzaboote

     

       38
       38
       +
                     inputs.tangled-core.nixosModules.knot

     

       38
       39
        
                     modules.hardware

     

       39
       40
        
                     modules.nixos

     

       40
       41
        
                     modules.snippets

+6 -1

modules/home/programs/chromium/default.nix

···

       42
       42
        
             package =

     

       43
       43
        
               if pkgs.stdenv.isDarwin

     

       44
       44
        
               then (pkgs.runCommand "chromium-0.0.0" {} "mkdir $out")

     

       45
       45
       -
               else pkgs.ungoogled-chromium;

     

       45
       45
       +
               else pkgs.chromium;

     

       46
       46
       +
       

     

       47
       47
       +
             commandLineArgs = lib.mkIf pkgs.stdenv.isLinux [

     

       48
       48
       +
               "--enable-features=TouchpadOverscrollHistoryNavigation"

     

       49
       49
       +
               "--gtk-version=4"

     

       50
       50
       +
             ];

     

       46
       51
        
           };

     

       47
       52
        
         };

     

       48
       53
        
       }

+10

modules/nixos/profiles/backups/default.nix

···

       218
       218
        
                 repository = mkRepoA "passwords";

     

       219
       219
        
               }

     

       220
       220
        
             );

     

       221
       221
       +
       

     

       222
       222
       +
             tangled-knot = lib.mkIf config.services.tangled-knot.enable (

     

       223
       223
       +
               config.mySnippets.restic

     

       224
       224
       +
               // {

     

       225
       225
       +
                 backupCleanupCommand = start "knot";

     

       226
       226
       +
                 backupPrepareCommand = stop "knot";

     

       227
       227
       +
                 paths = [config.services.tangled-knot.stateDir];

     

       228
       228
       +
                 repository = mkRepoA "tangled-knot";

     

       229
       229
       +
               }

     

       230
       230
       +
             );

     

       221
       231
        
           };

     

       222
       232
        
         };

     

       223
       233
        
       }

modules/snippets/aylac-top/default.nix

···

       15
       15
        
               port = 8222;

     

       16
       16
        
               vHost = "vault.aylac.top";

     

       17
       17
        
             };

     

       18
       18
       +
       

     

       19
       19
       +
             tangled-knot = {

     

       20
       20
       +
               hostName = "nanpi";

     

       21
       21
       +
               port = 5555;

     

       22
       22
       +
               vHost = "knot.aylac.top";

     

       23
       23
       +
             };

     

       18
       24
        
           };

     

       19
       25
        
         };

     

       20
       26
        
       }