cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade state to 23.11

Browse source
This commit is contained in:
Cyryl Płotnicki 2023-12-18 10:28:15 +00:00
parent 04bb4c2ed0
commit aa96eba76b
12 changed files with 53 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
flake.lock
View file

@ -25,26 +25,17 @@
}, },
"crane": { "crane": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": [
"helix",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"
],
"rust-overlay": [
"helix",
"rust-overlay"
] ]
}, },
"locked": { "locked": {
"lastModified": 1688772518, "lastModified": 1701025348,
"narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +72,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700927249, "lastModified": 1702569759,
"narHash": "sha256-iqmIWiEng890/ru7ZBf4nUezFPyRm2fjRTvuwwxqk2o=", "narHash": "sha256-Ze3AdEEsVZBRJ4wn13EZpV1Uubkzi59TkC4j2G9xoFI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22", "rev": "98ab91109716871f50ea8cb0e0ac7cc1e1e14714",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,32 +139,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1701680307,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,24 +158,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakeCompat": { "flakeCompat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -220,18 +177,20 @@
"helix": { "helix": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils_2", "flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs-stable" "nixpkgs-stable"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1701223272, "lastModified": 1702623594,
"narHash": "sha256-LK+xBFZgi1tbhVErtHFHBmF71x84amnxNmmL/cTKjo4=", "narHash": "sha256-O9lN0ohzxq+q0pZrn9KkAaKfLFqoSbwfDFVZRJnn4O8=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "0c81ef73e17a3d45cd6240fd5933ad99b3a60d01", "rev": "33d85606cf36da074d91db498d12233ab4978509",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -248,11 +207,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700814205, "lastModified": 1702195709,
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "aeb2232d7a32530d3448318790534d196bf9427a", "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,11 +248,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1701250978, "lastModified": 1702453208,
"narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=", "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "8772491ed75f150f02552c60694e1beff9f46013", "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +264,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1701368325, "lastModified": 1702630859,
"narHash": "sha256-3OqZyi2EdopJxpxwrySPyCTuCvfBY4oXTLVgQ4B6qDg=", "narHash": "sha256-xaCey4n3O4dvL/IlLdeq1FeH2qK39RTUOE3YLNT9ENQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3", "rev": "bb8b1e6bd7b3904c8887febcb8877ac65e3d53d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +280,11 @@
}, },
"nixpkgs-nixos-unstable": { "nixpkgs-nixos-unstable": {
"locked": { "locked": {
"lastModified": 1701068326, "lastModified": 1702312524,
"narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -337,11 +296,11 @@
}, },
"nixpkgs-rust-analyzer": { "nixpkgs-rust-analyzer": {
"locked": { "locked": {
"lastModified": 1701368325, "lastModified": 1702630859,
"narHash": "sha256-3OqZyi2EdopJxpxwrySPyCTuCvfBY4oXTLVgQ4B6qDg=", "narHash": "sha256-xaCey4n3O4dvL/IlLdeq1FeH2qK39RTUOE3YLNT9ENQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3", "rev": "bb8b1e6bd7b3904c8887febcb8877ac65e3d53d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,11 +312,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1701263465, "lastModified": 1702346276,
"narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=", "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3", "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,11 +328,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1701366548, "lastModified": 1702630847,
"narHash": "sha256-+cItrtt7Tfd9SM9aQ3lCZWahfxVzWpH5bVgRyz5QDnw=", "narHash": "sha256-O35NxVzcWJuiLI71E7fHGCDjgNmPC81NzgBihzxQkfU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d16468a8fc6ea13c030349f293e5958adc0e4a54", "rev": "aafce7906a49aef5bd7552b338cc59df4fa16e5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +392,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690424156, "lastModified": 1701137803,
"narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f335a0213504c7e6481c359dc1009be9cf34432c", "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,11 +440,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701127353, "lastModified": 1702177193,
"narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", "narHash": "sha256-J2409SyXROoUHYXVy9h4Pj0VU8ReLuy/mzBc9iK4DBg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", "rev": "d806e546f96c88cd9f7d91c1c19ebc99ba6277d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -510,21 +469,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"veracrypt": { "veracrypt": {
"locked": { "locked": {
"lastModified": 1696681798, "lastModified": 1696681798,

13
flake.nix
View file

@ -221,54 +221,46 @@
repo = "nixpkgs"; repo = "nixpkgs";
ref = "master"; ref = "master";
}; };
nixpkgs-nixos-unstable = { nixpkgs-nixos-unstable = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "nixos-unstable"; ref = "nixos-unstable";
}; };
nixpkgs-stable = { nixpkgs-stable = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "nixos-23.11"; ref = "nixos-23.11";
}; };
nixpkgs-rust-analyzer = { nixpkgs-rust-analyzer = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "master"; ref = "master";
}; };
endless-sky = { endless-sky = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "2100c4926200b1ebbee032ad22113597195932f2"; ref = "2100c4926200b1ebbee032ad22113597195932f2";
}; };
veracrypt = { veracrypt = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "2bbbf414fed6ab89cd971f5645da692dad6d9420"; ref = "2bbbf414fed6ab89cd971f5645da692dad6d9420";
}; };
nixos-hardware = { nixos-hardware = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixos-hardware"; repo = "nixos-hardware";
ref = "master"; ref = "master";
}; };
darwin = { darwin = {
url = "github:lnl7/nix-darwin/master"; url = "github:lnl7/nix-darwin/master";
inputs.nixpkgs.follows = "nixpkgs-stable"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
home-manager = { home-manager = {
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";
@ -276,21 +268,18 @@
ref = "release-23.11"; ref = "release-23.11";
inputs.nixpkgs.follows = "nixpkgs-stable"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
flake-utils = { flake-utils = {
type = "github"; type = "github";
owner = "numtide"; owner = "numtide";
repo = "flake-utils"; repo = "flake-utils";
ref = "main"; ref = "main";
}; };
nur = { nur = {
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";
repo = "NUR"; repo = "NUR";
ref = "master"; ref = "master";
}; };
nil = { nil = {
type = "github"; type = "github";
owner = "oxalica"; owner = "oxalica";
@ -299,13 +288,13 @@
inputs.nixpkgs.follows = "nixpkgs-nixos-unstable"; inputs.nixpkgs.follows = "nixpkgs-nixos-unstable";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
helix = { helix = {
type = "github"; type = "github";
owner = "helix-editor"; owner = "helix-editor";
repo = "helix"; repo = "helix";
ref = "master"; ref = "master";
inputs.nixpkgs.follows = "nixpkgs-stable"; inputs.nixpkgs.follows = "nixpkgs-stable";
inputs.flake-utils.follows = "flake-utils";
}; };
sops = { sops = {
type = "github"; type = "github";

1
nixos/boxes/bolty/home-assistant.nix
View file

@ -32,7 +32,6 @@ in {
}; };
services.zigbee2mqtt = { services.zigbee2mqtt = {
enable = true; enable = true;
package = inputs.nixpkgs-nixos-unstable.legacyPackages."${system}".zigbee2mqtt;
settings = { settings = {
homeassistant = true; homeassistant = true;
permit_join = true; permit_join = true;

4
nixos/boxes/bolty/mastodon.nix
View file

@ -38,7 +38,7 @@
publicPath = "${path}/public-system/"; publicPath = "${path}/public-system/";
in { in {
imports = [../nginx.nix]; imports = [../nginx.nix];
system.stateVersion = "23.05"; system.stateVersion = "23.11";
networking.firewall.allowedTCPPorts = [internalWebPort]; networking.firewall.allowedTCPPorts = [internalWebPort];
services.nginx = { services.nginx = {
@ -108,7 +108,7 @@ in {
lib, lib,
... ...
}: { }: {
system.stateVersion = "23.05"; system.stateVersion = "23.11";
services.postgresql.port = postgresPort; services.postgresql.port = postgresPort;
users = users =
users users

2
nixos/boxes/homescreen/default.nix
View file

@ -60,7 +60,7 @@
security.allowUserNamespaces = true; security.allowUserNamespaces = true;
time.timeZone = "Europe/London"; time.timeZone = "Europe/London";
system.stateVersion = "23.05"; system.stateVersion = "23.11";
nix = { nix = {
settings.auto-optimise-store = true; settings.auto-optimise-store = true;

2
nixos/boxes/vpsfree1/fossil.nix
View file

@ -44,7 +44,7 @@ in {
user = "fossil"; user = "fossil";
group = "fossil"; group = "fossil";
in { in {
system.stateVersion = "23.05"; system.stateVersion = "23.11";
environment.systemPackages = [pkgs.fossil]; environment.systemPackages = [pkgs.fossil];
users.groups = {"${group}" = {};}; users.groups = {"${group}" = {};};
users.users = { users.users = {

2
nixos/boxes/vpsfree1/foundryvtt.nix
View file

@ -48,7 +48,7 @@ in {
pkgs, pkgs,
... ...
}: { }: {
system.stateVersion = "23.05"; system.stateVersion = "23.11";
systemd.services."foundryvtt" = { systemd.services."foundryvtt" = {
requires = ["network-online.target"]; requires = ["network-online.target"];
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];

2
nixos/boxes/vpsfree1/gitea.nix
View file

@ -88,7 +88,7 @@ in {
lib, lib,
... ...
}: { }: {
system.stateVersion = "23.05"; system.stateVersion = "23.11";
users = users =
users users
// { // {

3
nixos/boxes/vpsfree1/mastodon.nix
View file

@ -38,7 +38,6 @@
publicPath = "${path}/public-system/"; publicPath = "${path}/public-system/";
in { in {
imports = [../nginx.nix]; imports = [../nginx.nix];
system.stateVersion = "23.05";
services.nginx = { services.nginx = {
virtualHosts = { virtualHosts = {
@ -116,7 +115,7 @@ in {
lib, lib,
... ...
}: { }: {
system.stateVersion = "23.05"; system.stateVersion = "23.11";
services.postgresql.port = postgresPort; services.postgresql.port = postgresPort;
users = users =
users users

2
nixos/common.nix
View file

@ -7,7 +7,7 @@
nixpkgs-veracrypt, nixpkgs-veracrypt,
... ...
}: let }: let
stateVersion = "23.05"; stateVersion = "23.11";
username = "cyryl"; username = "cyryl";
in { in {
imports = [ imports = [

2
nixos/home-manager/default.nix
View file

@ -19,7 +19,7 @@ in {
home.username = username; home.username = username;
home.homeDirectory = lib.mkDefault "/home/${username}"; home.homeDirectory = lib.mkDefault "/home/${username}";
home.stateVersion = "23.05"; home.stateVersion = "23.11";
programs.home-manager.enable = true; programs.home-manager.enable = true;
imports = [ imports = [

2
nixos/server-common.nix
View file

@ -15,7 +15,7 @@
enable = true; enable = true;
enableNsncd = true; enableNsncd = true;
}; };
system.stateVersion = "23.05"; system.stateVersion = "23.11";
system.activationScripts.diff = '' system.activationScripts.diff = ''
${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
''; '';