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

switch to 21.11

Browse source
This commit is contained in:
Cyryl Płotnicki 2021-12-04 09:20:11 +00:00
parent 5a168147b6
commit 92f1230a7e
3 changed files with 80 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1637793790,
"narHash": "sha256-oPXavjxETEWGXq8g7kQHyRLKUmLX2yPtGn+t3V0mrTY=",
"lastModified": 1638319138,
"narHash": "sha256-ve33f4nTKQluyvm5URQwL019x0Fnrg8urqzvymNeD+s=",
"owner": "ryantm",
"repo": "agenix",
"rev": "f85eea0e29fa9a8924571d0e398215e175f80d55",
"rev": "52ea2f8c3231cc2b5302fa28c63588aacb77ea29",
"type": "github"
},
"original": {
@ -37,11 +37,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
@ -69,20 +69,20 @@
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs-nixos-unstable"
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1637915295,
"narHash": "sha256-jWW2Q83O4O/TV3PDsZkEo0bhKzlLBhJ5CGqQFMM05lE=",
"lastModified": 1638553958,
"narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a28cf79a78040b4e6d8d50a39760a296d5e95dd6",
"rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"ref": "release-21.11",
"repo": "home-manager",
"type": "github"
}
@ -110,11 +110,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1637831601,
"narHash": "sha256-axRY9AehHGXfU52RK3oqDNXd9F92Tm65vEBQir3tRLI=",
"lastModified": 1638440530,
"narHash": "sha256-kmoNW+RmSka988iWvSrkiAxO8g6D76O0gW2cIIhL6U8=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "aad66afc1cac4a654223f6ba326899c731e57441",
"rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a",
"type": "github"
},
"original": {
@ -139,11 +139,11 @@
},
"nixpkgs-nixos-unstable": {
"locked": {
"lastModified": 1637841632,
"narHash": "sha256-QYqiKHdda0EOnLGQCHE+GluD/Lq2EJj4hVTooPM55Ic=",
"lastModified": 1638376152,
"narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "73369f8d0864854d1acfa7f1e6217f7d6b6e3fa1",
"rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
"type": "github"
},
"original": {
@ -155,16 +155,16 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1637798660,
"narHash": "sha256-MrPmoGeiOjlT17j3ZQx6iab07YVnomRiBFLcOCiCYnk=",
"lastModified": 1638371214,
"narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "91e6a9a6568f751bb10222a937507e7e151a035e",
"rev": "a640d8394f34714578f3e6335fc767d0755d78f9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.05",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
@ -187,11 +187,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1636228094,
"narHash": "sha256-CpOcIwHAn3yS0PeVmUICFrJ+gde2PiZp3XsnDP3LE9w=",
"lastModified": 1638097282,
"narHash": "sha256-EXCzj9b8X/lqDPJapxZThIOKL5ASbpsJZ+8L1LnY1ig=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2606cb0fc24e65f489b7d9fdcbf219756e45db35",
"rev": "78cb77b29d37a9663e05b61abb4fa09465da4b70",
"type": "github"
},
"original": {
@ -203,11 +203,11 @@
},
"nur": {
"locked": {
"lastModified": 1637918940,
"narHash": "sha256-H8/aILJwxRRIXNSu8/7mQn7C0QYGtOtjnfGJm1zTVeo=",
"lastModified": 1638605839,
"narHash": "sha256-f/REgJDMli9MLdvUSU4doYPnKyC8LrAPcj35fwdM5s8=",
"owner": "nix-community",
"repo": "NUR",
"rev": "9d5e21ac99f25994ce11807a8fe02ce608262c40",
"rev": "3d7aba159607fb9de8f148e86afbaf585bcfa07e",
"type": "github"
},
"original": {
@ -235,11 +235,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1637735079,
"narHash": "sha256-VC6FEfYHkNMrCd9+0nATtUQAtkWOrkH4gzwGHNG4TTQ=",
"lastModified": 1638188662,
"narHash": "sha256-heLEbhH3W3GrtYDwacghCiO3g94QkJLW0LhErMWbT2g=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "871408582627f43d0ecc5e4595dcf20cfe2ee227",
"rev": "0e0dcc74bae23c7ef7fb6251c43c277b827e8c34",
"type": "github"
},
"original": {

96
flake.nix
View file

@ -2,56 +2,56 @@
description = "NixOS configuration with flakes";
outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron, sops } @ inputs:
let
mkServer = pkgs: system: hostname:
pkgs.lib.nixosSystem {
system = system;
modules = [
(./. + "/nixos/boxes/${hostname}")
agenix.nixosModules.age
sops.nixosModules.sops
];
specialArgs = { inherit inputs; };
};
mkWorkstation = pkgs: system: hostname:
pkgs.lib.nixosSystem {
system = system;
modules = [
(./. + "/nixos/boxes/${hostname}")
(import ./nixos/email-accounts.nix)
sops.nixosModules.sops
let
mkServer = pkgs: system: hostname:
pkgs.lib.nixosSystem {
system = system;
modules = [
(./. + "/nixos/boxes/${hostname}")
agenix.nixosModules.age
sops.nixosModules.sops
];
specialArgs = { inherit inputs; };
};
mkWorkstation = pkgs: system: hostname:
pkgs.lib.nixosSystem {
system = system;
modules = [
(./. + "/nixos/boxes/${hostname}")
(import ./nixos/email-accounts.nix)
sops.nixosModules.sops
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.cyryl = {
imports = [ ./nixos/home-manager ];
_module.args.inputs = inputs;
};
}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.cyryl = {
imports = [ ./nixos/home-manager ];
_module.args.inputs = inputs;
};
}
];
specialArgs = { inherit inputs; };
};
in
];
specialArgs = { inherit inputs; };
};
in
{
nixosConfigurations = {
bootstrap = nixpkgs-stable.lib.nixosSystem {
system = "x86_64-linux";
modules = [
(./. + "/nixos/boxes/bootstrap")
];
specialArgs = { inherit inputs; };
{
nixosConfigurations = {
bootstrap = nixpkgs-stable.lib.nixosSystem {
system = "x86_64-linux";
modules = [
(./. + "/nixos/boxes/bootstrap")
];
specialArgs = { inherit inputs; };
};
foureighty = mkWorkstation nixpkgs-stable "x86_64-linux" "foureighty";
skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv";
thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
bolty = mkServer nixpkgs-stable "x86_64-linux" "bolty";
vultr1 = mkServer nixpkgs-stable "x86_64-linux" "vultr1";
};
foureighty = mkWorkstation nixpkgs-nixos-unstable "x86_64-linux" "foureighty";
skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv";
thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
bolty = mkServer nixpkgs-nixos-unstable "x86_64-linux" "bolty";
vultr1 = mkServer nixpkgs-stable "x86_64-linux" "vultr1";
};
};
inputs = {
nixpkgs-nixos-unstable = {
type = "github";
@ -64,7 +64,7 @@
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-21.05";
ref = "nixos-21.11";
};
nixos-hardware = {
@ -78,9 +78,9 @@
type = "github";
owner = "nix-community";
repo = "home-manager";
ref = "master";
ref = "release-21.11";
inputs = {
nixpkgs.follows = "nixpkgs-nixos-unstable";
nixpkgs.follows = "nixpkgs-stable";
};
};

4
nixos/backups.nix
View file

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
let
extraArgs = [ "--exclude='.cache'" "--exclude='.rustup'" "--exclude='.cargo'" "--exclude='.local/share'" "--exclude='keybase'" ];
extraArgs = [ "--exclude='.cache'" "--exclude='.rustup'" "--exclude='.cargo'" ];
in
{
@ -19,7 +19,7 @@ in
repository = "b2:cyplo-restic-${config.networking.hostName}:/";
timerConfig = { OnCalendar = "hourly"; };
extraBackupArgs = extraArgs;
s3CredentialsFile = "/etc/nixos/secrets/b2-env";
environmentFile = "/etc/nixos/secrets/b2-env";
};
};
}