diff --git a/flake.lock b/flake.lock index c770eb4..da67392 100644 --- a/flake.lock +++ b/flake.lock @@ -124,11 +124,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1720709248, - "narHash": "sha256-ThoGJ7wEcoKjE9rWVoAqplbfzPK8FCbsrqt9WjGS96w=", + "lastModified": 1720713418, + "narHash": "sha256-6Sdzq2JhHW28GLXcCBConJSxz24bKQXWL7Z3JTOlU0A=", "owner": "nix-community", "repo": "dream2nix", - "rev": "a3751775d93d70845cdf55c00f28f0074bee7d9c", + "rev": "0859b0dfdfe39e6e6479c8991f81336c13471255", "type": "github" }, "original": { @@ -818,11 +818,11 @@ ] }, "locked": { - "lastModified": 1720646128, - "narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c085b984ff2808bf322f375b10fea5a415a9c43d", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -872,11 +872,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1720697958, - "narHash": "sha256-eMvynmI9MQmNPwpiVEXVMhPiC14P53HwSE1EUpEMIa4=", + "lastModified": 1720733512, + "narHash": "sha256-vq9CLDvqSSvH4L7YhDa0ihTOrAry4jntKiuoNb5n98M=", "ref": "refs/heads/main", - "rev": "31478c810a79403fbb670ef7c4ef1d0d48271c80", - "revCount": 15947, + "rev": "4b109ec1a8fc4550150f56f0f46f2f41d844bda8", + "revCount": 15950, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -1001,11 +1001,11 @@ ] }, "locked": { - "lastModified": 1720599442, - "narHash": "sha256-jdm+sKVbBXoyrxcHbVaV0htlpq2iFR+eJw3Xe/DPcDo=", + "lastModified": 1720845312, + "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "cf297a8d248db6a455b60133f6c0029c04ebe50e", + "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", "type": "github" }, "original": { @@ -1060,11 +1060,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1720515935, - "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -1245,11 +1245,11 @@ }, "nixpkgsStable": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -1820,11 +1820,11 @@ ] }, "locked": { - "lastModified": 1720645794, - "narHash": "sha256-vAeYp+WH7i/DlBM5xNt9QeWiOiqzzf5abO8DYGkbUxg=", + "lastModified": 1720818892, + "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "750dfb555b5abdab4d3266b3f9a05dec6d205c04", + "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", "type": "github" }, "original": { diff --git a/hosts/janeway/default.nix b/hosts/janeway/default.nix index ecc1e54..ecaee5a 100644 --- a/hosts/janeway/default.nix +++ b/hosts/janeway/default.nix @@ -57,17 +57,18 @@ in { fi ''; - environment.packages = [ + environment.packages = let + inherit (fleetFlake.inputs.ccrEmacs.packages.aarch64-linux) ccrEmacs; + in [ pkgs.bottom pkgs.helix pkgs.stress pkgs.openssh pkgs.git pkgs.btop - fleetFlake.inputs.ccrEmacs.packages.aarch64-linux.ccrEmacs + ccrEmacs (pkgs.writeScriptBin "sshd-start" '' #!${pkgs.runtimeShell} - echo "Starting sshd in non-daemonized way on port ${toString port}" ${pkgs.openssh}/bin/sshd -f "${sshdDirectory}/sshd_config" -D '') diff --git a/modules/syncthing/default.nix b/modules/syncthing/default.nix index 240e3a7..0acb3dc 100644 --- a/modules/syncthing/default.nix +++ b/modules/syncthing/default.nix @@ -29,7 +29,7 @@ "tcp://kirk.fleet" ]; }; - onplus8t = { + oneplus8t = { id = "76BJ2ZE-FPFDWUZ-3UZIENZ-TS6YBGG-EZSF6UE-GLHRBQ2-KTHTRMI-3JWNRAT"; addresses = [ "tcp://oneplus8t.fleet" @@ -45,7 +45,7 @@ kirk = "/home/${config.ccr.username}/org"; } .${config.networking.hostName}; - devices = ["picard" "sisko" "kirk" "onplus6t"]; + devices = ["picard" "sisko" "kirk" "oneplus8t"]; }; sync = { path =