Compare commits

...

6 commits

Author SHA1 Message Date
c63aec584f update
Some checks failed
use nix / build (push) Failing after 11m30s
2024-07-13 20:55:49 +01:00
ca11767d22 downgrade to allow for merge 2024-07-13 20:53:55 +01:00
7300782f58 add proton bridge 2024-07-13 20:53:55 +01:00
b8633f81ae migrate to lix 2024-07-13 20:53:55 +01:00
77ad4416fd update 2024-07-13 20:53:45 +01:00
67fc26d04d add utm 2024-07-13 20:49:47 +01:00
3 changed files with 94 additions and 30 deletions

View file

@ -72,11 +72,11 @@
]
},
"locked": {
"lastModified": 1719845423,
"narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=",
"lastModified": 1720845312,
"narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ec12b88104d6c117871fad55e931addac4626756",
"rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
"type": "github"
},
"original": {
@ -93,11 +93,11 @@
]
},
"locked": {
"lastModified": 1720056646,
"narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=",
"lastModified": 1720661479,
"narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=",
"owner": "nix-community",
"repo": "disko",
"rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e",
"rev": "786965e1b1ed3fd2018d78399984f461e2a44689",
"type": "github"
},
"original": {
@ -213,6 +213,21 @@
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"helix": {
"inputs": {
"crane": "crane",
@ -225,11 +240,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1719909389,
"narHash": "sha256-d6PZ7WpOV+yb4u4P+8vJ+xmRZbZxiQCpjNnqYoUTBQc=",
"lastModified": 1720893718,
"narHash": "sha256-jJ8+8KkscGit9p+5fQTEm/ky9qvPFjpr4f1peQyL26s=",
"owner": "helix-editor",
"repo": "helix",
"rev": "fc97ecc3e3186b9dfe958869178bdb6b8cd7d8df",
"rev": "e6bf97b8434aa9ecc9e9c6a25411ea6f1148360f",
"type": "github"
},
"original": {
@ -260,6 +275,43 @@
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1720626042,
"narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=",
"rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1720641669,
"narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=",
"rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
}
},
"nil": {
"inputs": {
"flake-utils": [
@ -308,11 +360,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1719895800,
"narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"lastModified": 1720737798,
"narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751",
"type": "github"
},
"original": {
@ -324,11 +376,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1720163337,
"narHash": "sha256-YHI6rvCTjPsaQMLwuUXtOPcWHnplzVAVjeb99dBZC9o=",
"lastModified": 1720900240,
"narHash": "sha256-jpOkzgktrwkpgvVsXT16CohkhzFh3z2ljlu30IQKSb0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0b239e51db821b6164fc007ea98741600bc1f604",
"rev": "70d24a27b7230cd8610046de00b8508b2a443c46",
"type": "github"
},
"original": {
@ -340,11 +392,11 @@
},
"nixpkgs-nixos-unstable": {
"locked": {
"lastModified": 1720031269,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"lastModified": 1720768451,
"narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
"type": "github"
},
"original": {
@ -356,11 +408,11 @@
},
"nixpkgs-rust-analyzer": {
"locked": {
"lastModified": 1720163337,
"narHash": "sha256-YHI6rvCTjPsaQMLwuUXtOPcWHnplzVAVjeb99dBZC9o=",
"lastModified": 1720900240,
"narHash": "sha256-jpOkzgktrwkpgvVsXT16CohkhzFh3z2ljlu30IQKSb0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0b239e51db821b6164fc007ea98741600bc1f604",
"rev": "70d24a27b7230cd8610046de00b8508b2a443c46",
"type": "github"
},
"original": {
@ -372,11 +424,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1719956923,
"narHash": "sha256-nNJHJ9kfPdzYsCOlHOnbiiyKjZUW5sWbwx3cakg3/C4=",
"lastModified": 1720691131,
"narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "706eef542dec88cc0ed25b9075d3037564b2d164",
"rev": "a046c1202e11b62cbede5385ba64908feb7bfac4",
"type": "github"
},
"original": {
@ -388,11 +440,11 @@
},
"nur": {
"locked": {
"lastModified": 1720162013,
"narHash": "sha256-WcprtFdAb1M4mOYyIMBrkw3dQ3mxE5wKZTuvlqxwMio=",
"lastModified": 1720899970,
"narHash": "sha256-aC6WheNDJKFPpq2gWTzxy8c68hhBdy5b1iLUhgbPgW0=",
"owner": "nix-community",
"repo": "NUR",
"rev": "af7f0b9941efb5f8fd0a805fa1d4e9dcd4cd4e8b",
"rev": "567a23db21ba9798f52b9d7e900970525a0c7a85",
"type": "github"
},
"original": {
@ -413,6 +465,7 @@
"flake-utils": "flake-utils_2",
"helix": "helix",
"home-manager": "home-manager",
"lix-module": "lix-module",
"nil": "nil",
"nix-ld": "nix-ld",
"nixos-hardware": "nixos-hardware",
@ -501,11 +554,11 @@
]
},
"locked": {
"lastModified": 1719873517,
"narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
"lastModified": 1720479166,
"narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "a11224af8d824935f363928074b4717ca2e280db",
"rev": "67035a355b1d52d2d238501f8cc1a18706979760",
"type": "github"
},
"original": {

View file

@ -10,6 +10,7 @@
flake-utils,
helix,
home-manager,
lix-module,
nil,
nix-ld,
nixos-hardware,
@ -25,6 +26,7 @@
pkgs.lib.nixosSystem {
inherit system;
modules = [
lix-module.nixosModules.default
(./. + "/nixos/boxes/${hostname}")
(import ./nixos/server-common.nix)
sops.nixosModules.sops
@ -81,6 +83,7 @@
pkgs.lib.nixosSystem {
inherit system;
modules = [
lix-module.nixosModules.default
(./. + "/nixos/boxes/${hostname}")
(import ./nixos/email-accounts.nix)
(import ./nixos/common.nix)
@ -145,6 +148,7 @@
"airy" = darwin.lib.darwinSystem rec {
system = "aarch64-darwin";
modules = [
lix-module.nixosModules.default
(./. + "/nixos/boxes/airy")
{users.users.cyryl.home = "/Users/cyryl";}
home-manager.darwinModules.home-manager
@ -325,6 +329,11 @@
repo = "flake-utils";
ref = "main";
};
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs-stable";
inputs.flake-utils.follows = "flake-utils";
};
nur = {
type = "github";
owner = "nix-community";

View file

@ -46,6 +46,8 @@
"steam"
"tailscale"
"teamviewer"
"protonmail-bridge"
"utm"
"zoom"
];
home-manager.users.cyryl = {...}: {