steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into router0-dmz0-update-and-vlan

Browse source
This commit is contained in:
steveej 2023-12-26 16:22:29 +01:00
commit 2aacd144b1
8 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nix/devShells.nix
View file

@ -68,6 +68,14 @@ pkgs.stdenv.mkDerivation {
hedgedoc-cli hedgedoc-cli
xwayland xwayland
(pkgs.writeShellScriptBin "rflk" ''
exec nix run nixpkgs#$@
'')
(pkgs.writeShellScriptBin "r11" ''
exec env NIXOS_OZONE_WL="" WAYLAND_DISPLAY="" $@
'')
]); ]);
# Set Environment Variables # Set Environment Variables

2
nix/os/devices/elias-e525/boot.nix
View file

@ -1,4 +1,4 @@
{lib, ...}: { {lib, ...}: {
boot.loader.grub.efiInstallAsRemovable = lib.mkForce true; boot.loader.grub.efiSupport = lib.mkForce false;
boot.loader.efi.canTouchEfiVariables = lib.mkForce false; boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
} }

1
nix/os/devices/elias-e525/configuration.nix
View file

@ -9,5 +9,6 @@
./hw.nix ./hw.nix
./pkg.nix ./pkg.nix
./user.nix ./user.nix
./boot.nix
]; ];
} }

2
nix/os/devices/elias-e525/default.nix
View file

@ -16,7 +16,7 @@ in {
}; };
${nodeName} = { ${nodeName} = {
deployment.targetHost = "192.168.15.198"; deployment.targetHost = "elias-e525.lan";
deployment.replaceUnknownProfiles = false; deployment.replaceUnknownProfiles = false;
# deployment.allowLocalDeployment = true; # deployment.allowLocalDeployment = true;

16
nix/os/devices/elias-e525/flake.lock generated
View file

@ -7,32 +7,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687871164, "lastModified": 1703113038,
"narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1688868408, "lastModified": 1703068421,
"narHash": "sha256-RR9N5XTAxSBhK8MCvLq9uxfdkd7etC//seVXldy0k48=", "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "510d721ce097150ae3b80f84b04b13b039186571", "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
nix/os/devices/elias-e525/flake.nix
View file

@ -1,8 +1,8 @@
{ {
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
inputs.home-manager = { inputs.home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

30
nix/os/devices/steveej-t14/flake.lock generated
View file

@ -39,11 +39,11 @@
}, },
"nixpkgs-2305": { "nixpkgs-2305": {
"locked": { "locked": {
"lastModified": 1702350026, "lastModified": 1702759837,
"narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", "narHash": "sha256-u3XeJVRe/Q975nwFE+6ALEwypMKJEELMJKDAhSKyq3M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9463103069725474698139ab10f17a9d125da859", "rev": "b2566f4f897ac6224e094b167d9488d03e157f28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
}, },
"nixpkgs-2311": { "nixpkgs-2311": {
"locked": { "locked": {
"lastModified": 1702645756, "lastModified": 1702921762,
"narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", "rev": "d02ffbbe834b5599fc5f134e644e49397eb07188",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1702830598, "lastModified": 1703068121,
"narHash": "sha256-NiGUGof87PAmaH8BLzC/mIhYmjd190NEA3uk2tNTBms=", "narHash": "sha256-E6QeGdAIvIehAZNQkmjAVazgG0jBRWBoabqGPO88t18=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c9bdee2a9629344cb5d7d9aa48fda1ef34deec18", "rev": "2c19d7b41cd739198271be54a1df4f78da7b9809",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1702312524, "lastModified": 1702830618,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c", "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +103,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1702723167, "lastModified": 1702987609,
"narHash": "sha256-cIxAF4Do+B7mQxzRDo/8B9QO0i2ap3i/i6Ujk8kx+Ws=", "narHash": "sha256-m2hErow1pxz2KcpCH0LGykgf/LVy9tOkXnNOnssDBmw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7d6929828a2d28eda9d37254ff6be3b6819506ca", "rev": "fa5e0f2ed065dd00cfa0347c1421b67da6a5a10e",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
nix/os/snippets/nix-settings.nix
View file

@ -1,4 +1,6 @@
{ {
nodeFlake,
pkgs, pkgs,
lib, lib,
... ...
@ -26,10 +28,5 @@
"nixos-test" "nixos-test"
]; ];
nix.registry = { nix.registry.nixpkgs.flake = nodeFlake.inputs.nixpkgs;
nixpkgs.to = {
type = "path";
path = pkgs.path;
};
};
} }