diff --git a/.envrc b/.envrc index 8dd14d0..3550a30 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1 @@ use flake -export SOPS_AGE_KEY=$(sudo ssh-to-age -i /etc/ssh/ssh_host_ed25519_key -private-key) diff --git a/flake.lock b/flake.lock index 1175e6e..8d9fac4 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763748595, - "narHash": "sha256-7vfuJK0cmLOlYCSbq7AL/dJhoz9UaYRrw55OISGWA4I=", + "lastModified": 1763829850, + "narHash": "sha256-7dmfU7kGjyBwp1V01/1jH0uzcCs8s/rDcvy/eFJiCio=", "owner": "cachix", "repo": "devenv", - "rev": "575f7c532a6940f0fe55dfb7e527312dcdab8831", + "rev": "cdb6a64787ab77d7ec37c68d19de483a76f08173", "type": "github" }, "original": { @@ -551,11 +551,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763430944, - "narHash": "sha256-tL2I302ZrTeo13D99vg4v/VajVCSHdOx5RncpMcjqa0=", + "lastModified": 1763839772, + "narHash": "sha256-R692DLhMzPmqyo1IDAanJoc4LDOQSZkbkh0nNt7dXPY=", "owner": "helix-editor", "repo": "helix", - "rev": "68c7e8757f0183adeb01ba1fbbabd1cee2885b70", + "rev": "095227ef2f0308b097f981facc745fae77949c81", "type": "github" }, "original": { @@ -571,11 +571,11 @@ ] }, "locked": { - "lastModified": 1763748372, - "narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=", + "lastModified": 1763845215, + "narHash": "sha256-8W4YByiS3zxwcdDR2sABm1nUCSOEXJwdY/XddRTVjWM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1", + "rev": "9a5042a88caea9b729a1d3bc981069159de4fc49", "type": "github" }, "original": { @@ -613,11 +613,11 @@ ] }, "locked": { - "lastModified": 1763692256, - "narHash": "sha256-4C5pavV7Ht4NlXKoqNNu8lCtHwS3SYfnkjHmGbA4TSg=", + "lastModified": 1763782027, + "narHash": "sha256-jgs0ctD7OuY5UwCoBk1TNwVYJS9vNJBqb0uC5u4HjLo=", "owner": "outfoxxed", "repo": "hy3", - "rev": "0a41a2ab5f0d5562c4ffae9cef4648c450a248a1", + "rev": "1d74cd99a29d5e4fdd5913863499cdfc2e264069", "type": "github" }, "original": { @@ -731,11 +731,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1763750925, - "narHash": "sha256-Q5IO8VKW2fFHb6Ix6auy6SEMA6NS6pNeuefBai4+PHY=", + "lastModified": 1763819976, + "narHash": "sha256-W/893N/ifviI1PP1BVIwhYhstN8s5UOsi5lvaYupXhA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "abb2f7ee6fc99c31b6fac05568f29c92b59565df", + "rev": "e584a8bade2617899d69ae6f83011d0c1d2a9df7", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ }, "import-tree": { "locked": { - "lastModified": 1763695721, - "narHash": "sha256-tMfN/JkwWJ129cXDW+lK2gUcjklJ+LpTHj9LlneJRXg=", + "lastModified": 1763762820, + "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", "owner": "vic", "repo": "import-tree", - "rev": "ca69d64711265c68cf71f6c029ab9f1a55a767f8", + "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", "type": "github" }, "original": { @@ -1102,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1763546924, - "narHash": "sha256-2w6q2KjMZyvlUIY2FoHo6KprkUdhACWr+uYzrvo+Iq4=", + "lastModified": 1763845791, + "narHash": "sha256-zehmx6JON3CBTdQEKsjG3ehYmHuYbTrsMXFVmGtVuEA=", "owner": "nix-community", "repo": "nh", - "rev": "eb1620ceddf955ac63aab59ae0fdec03631af0fa", + "rev": "b62bd64537c22fa1c441a89c8ddc3c2a72a111a4", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ "rust-overlay": [] }, "locked": { - "lastModified": 1763729389, - "narHash": "sha256-VcToDv3/lw3q3sVIqQsMUhSGKEVdQM4h6rnr/XhPBwM=", + "lastModified": 1763799335, + "narHash": "sha256-b6hgDHjrLgTp4Y8DD5woGChg0R+yH16m0ZWVi9BhjrA=", "owner": "YaLTeR", "repo": "niri", - "rev": "012700dd549a79c501bcab92839e5dcc46c372b5", + "rev": "cfc01b895c0c7cbb9692852488675cc46693bd2a", "type": "github" }, "original": { @@ -1150,11 +1150,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763739228, - "narHash": "sha256-taQ7h8kkyigrdiAHilUXOZiqdT/cCYcpxQentuH+Krc=", + "lastModified": 1763835287, + "narHash": "sha256-8wPX0t4wM6uLVpbRnU8yBqV2e93eXiYPiAJYzS6HLNc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4708ce5f7d7c7aec103e22c87c11a711eeafd1fa", + "rev": "5e06972e46f11274ae3dcb5175c45dc5b9e85410", "type": "github" }, "original": { @@ -1166,11 +1166,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763729389, - "narHash": "sha256-VcToDv3/lw3q3sVIqQsMUhSGKEVdQM4h6rnr/XhPBwM=", + "lastModified": 1763799335, + "narHash": "sha256-b6hgDHjrLgTp4Y8DD5woGChg0R+yH16m0ZWVi9BhjrA=", "owner": "YaLTeR", "repo": "niri", - "rev": "012700dd549a79c501bcab92839e5dcc46c372b5", + "rev": "cfc01b895c0c7cbb9692852488675cc46693bd2a", "type": "github" }, "original": { @@ -1227,11 +1227,11 @@ ] }, "locked": { - "lastModified": 1763690104, - "narHash": "sha256-aLVWjGbOYw1stg1Ub+KAbA6BksQk1d+xBXslE233YVc=", + "lastModified": 1763776301, + "narHash": "sha256-FD8dx7R543AFOnYX2sRwTGA4mcC1gVQ92D1RHzz6Cs4=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "db3650381678dd5d4d7d5b3f6ac1b0c69f9c7d06", + "rev": "c34f0eefe470a12e486ee56d65e5e21a55161028", "type": "github" }, "original": { @@ -1315,11 +1315,11 @@ ] }, "locked": { - "lastModified": 1763810751, - "narHash": "sha256-aQ4C2b6eNdgeSg6fTg6Et3Jl8cgOroed/FWymLgPo1g=", + "lastModified": 1763847701, + "narHash": "sha256-+7A9OetA9aZgMtZfpuelAegZo/j6BpweH+Belcuktug=", "owner": "Daholli", "repo": "nixos-raspberrypi", - "rev": "348148e195d8a35540f4913c47c8030cc69933d6", + "rev": "8c0055072edaa07e1c12f3fccc2f051ac77c22e7", "type": "github" }, "original": { @@ -1414,11 +1414,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1763759767, - "narHash": "sha256-z0LznuopYN/3XGpixZzgPjknFzmIflUZYr9gUgkLBKs=", + "lastModified": 1763854221, + "narHash": "sha256-o/kHFDGhIx+6fUAgLgIO/8IyZmXX/DBYg1WQWKC+CWE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8e087d5ea60a39676587983dc5829a3346f18c37", + "rev": "543e36739d2ec892e02b1e5ba109cd654a4b93f5", "type": "github" }, "original": { @@ -1430,11 +1430,11 @@ }, "nixpkgs-rpi": { "locked": { - "lastModified": 1761934558, - "narHash": "sha256-0gB7tv25nPv+Vkr9YNi6gOEpX5cuDTnaTZlRNHZfgqA=", + "lastModified": 1763801810, + "narHash": "sha256-AL2mavUCX2CUvPd9xpNbTLvyXhXLg9aRLEBDGS4Tp6s=", "owner": "nvmd", "repo": "nixpkgs", - "rev": "791ec2ce5034ba9658e12ee4c33a001a38f5280a", + "rev": "b4f2a21623613f41e1eeefc27c87f990b457ae96", "type": "github" }, "original": { @@ -1462,11 +1462,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -1494,11 +1494,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -1850,11 +1850,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1763663426, - "narHash": "sha256-txr1cH5j+b14jYGvE0BQE/6OgSyHQqGoeeEFlJz7Q8o=", + "lastModified": 1763780714, + "narHash": "sha256-n2T7r5HkxofkT3mIbb2bNkzacBdhP/bVeph/yGNnBek=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "34fd0de7cea96cab0307cf07aa5723b60fd775ef", + "rev": "ef951ed2d976bcd1f57a09f358fdda9fa9425018", "type": "github" }, "original": { @@ -1872,11 +1872,11 @@ ] }, "locked": { - "lastModified": 1763727223, - "narHash": "sha256-xSg60w84Hd57SQqRjjBBHBxUnoMBgNt9mQDDKGBqQZg=", + "lastModified": 1763771627, + "narHash": "sha256-Zte9milzFT7tnsxlNjyj6CeR1OfRpERX8beUObMSAyc=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "c56cf48522ffa05b64b7cfb4d49ac92b160a3aaa", + "rev": "d6cab4065ca2569e9a72a2b26b6e532540a69711", "type": "github" }, "original": { diff --git a/modules/base/fish.nix b/modules/base/fish.nix index d3c52ad..d577ff9 100644 --- a/modules/base/fish.nix +++ b/modules/base/fish.nix @@ -57,6 +57,8 @@ checkHash = "nix hash to-sri --type sha256 $(nix-prefetch-url --unpack $argv)"; deployNixberry = "${lib.getExe osConfig.programs.nh.package} os switch --target-host nixberry -H nixberry"; deployLoptland = "${lib.getExe osConfig.programs.nh.package} os switch --target-host christophhollizeck.dev -H loptland"; + exportMachineSSHkey = "export SOPS_AGE_KEY=$(sudo ssh-to-age -i /etc/ssh/ssh_host_ed25519_key -private-key) +"; checkPR = ''cd /home/cholli/projects/NixOS/nixpkgs && ${lib.getExe pkgs.nixpkgs-review} pr $argv --post-result --systems "x86_64-linux aarch64-linux"''; }; plugins = with pkgs.fishPlugins; [ diff --git a/modules/hosts/loptland/default.nix b/modules/hosts/loptland/default.nix index 985e0e7..a064d80 100644 --- a/modules/hosts/loptland/default.nix +++ b/modules/hosts/loptland/default.nix @@ -96,7 +96,7 @@ in ]; } { - hostName = "100.86.23.74"; + hostName = "100.90.93.35"; sshUser = "remotebuild"; sshKey = "/root/.ssh/remotebuild"; systems = [ "aarch64-linux" ];