nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:a04ccd47b298f21269a136c1d8da692c844dc94b
Branches Tags
nix:trunk
..
compare: nix:9b1c35bd33b5d1771589bb48a677bf756e5757fb
Branches Tags
nix:trunk

3 Commits
a04ccd47b2 ... 9b1c35bd33

Author SHA1 Message Date
Nathan McCarty 9b1c35bd33
Make the stateVersion a mkDefault 
This will allow me to have new machines on a newer state version
 2023-06-01 09:26:09 -04:00
Nathan McCarty 4d42161fd2
Switch matrix back to postgres 14 2023-06-01 09:26:09 -04:00
Nathan McCarty d4124fedba
Update flake/packages 2023-06-01 09:26:09 -04:00
4 changed files with 23 additions and 21 deletions
Show Stats Expand all files Collapse all files

32
flake.lock
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684774948, "lastModified": 1685559570,
"narHash": "sha256-hJTaw4dYzcB+lsasKejnafq0CxPsVetn9RLXrcL+4jE=", "narHash": "sha256-MNIQvLRoq92isMLR/ordKNCl+aXNiuwBM4QyqmS8d00=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "b8c286c82c6b47826a6c0377e7017052ad91353c", "rev": "4338bc869e9874d54a4c89539af72f16666b2abe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,11 +77,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1685518550,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685189510, "lastModified": 1685599623,
"narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=", "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd", "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -220,11 +220,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1685440817, "lastModified": 1685613616,
"narHash": "sha256-Acryuxa+sxVYaNfC99xFuI2EO0jChcs2rdTJ1RtT7KI=", "narHash": "sha256-4ekaShKSrEXBws5ZiLNV/Y5tBBDydz+0kBbs2jYeylw=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "5c755ffb77e7eb1cf59d4723f413ed685d64bb44", "rev": "abc506dc5d0592eccad1f639ff56a12f73ffac26",
"revCount": 39, "revCount": 40,
"type": "git", "type": "git",
"url": "https://git.stranger.systems/nix/java" "url": "https://git.stranger.systems/nix/java"
}, },
@ -421,11 +421,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1685356226, "lastModified": 1685533922,
"narHash": "sha256-f2clSOdqi0SvY1WSgbnl2YgCZmoCXOxeUjYeXp8p2zI=", "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0f7f5ca1cdec8dea85bb4fa60378258171d019ad", "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
machines/matrix/configuration.nix
View File

@ -45,7 +45,9 @@
passwordFile = config.sops.secrets."borg-password".path; passwordFile = config.sops.secrets."borg-password".path;
sshKey = config.sops.secrets."borg-ssh-key".path; sshKey = config.sops.secrets."borg-ssh-key".path;
}; };
postgresql.backup = true; # postgresql.backup = true;
# Disabled for now due to lack of space :(, waiting for pendulum to get fixed so I can migrate over to it
postgresql.backup = false;
}; };
config = { config = {
setupGrub = false; setupGrub = false;
@ -80,7 +82,7 @@
}; };
# Set postgresql version # Set postgresql version
services.postgresql.package = pkgs.postgresql_15; # services.postgresql.package = pkgs.postgresql_15;
# Setup home manager # Setup home manager
home-manager.users.nathan = import ./home.nix; home-manager.users.nathan = import ./home.nix;

2
modules/linux/default.nix
View File

@ -223,7 +223,7 @@ in {
# Work around for discord jank ugh # Work around for discord jank ugh
nixpkgs.config.permittedInsecurePackages = [ "electron-13.6.9" ]; nixpkgs.config.permittedInsecurePackages = [ "electron-13.6.9" ];
# Set system state version # Set system state version
system.stateVersion = "22.05"; system.stateVersion = lib.mkDefault "22.05";
nix = { nix = {
# Enable flakes # Enable flakes

4
sources/layman.json
View File

@ -1,4 +1,4 @@
{ {
"rev": "c827811d71461d9190c3f5d0d00d339d74ff3407", "rev": "67d8f95f4693d3a1ffa2e7d4dccba4e066dc56a0",
"hash": "sha256-Z8gliSEZgFtOtCZf51J79SqMTHOEd2zwtv0tFiXWn8k=" "hash": "sha256-SuedE7AUmZha50zwD0iuBMrQsYoLiJFPbkV4BgnKnCc="
} }