ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-21 09:49:39 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: ellmau:e0618827276fd394514e7acd9152d35a49ec1c66
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake
..
compare: ellmau:d8b0c486a1effc74180a566f7102c053933a65bc
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake

No commits in common. "e0618827276fd394514e7acd9152d35a49ec1c66" and "d8b0c486a1effc74180a566f7102c053933a65bc" have entirely different histories.
e061882727 ... d8b0c486a1

5 changed files with 41 additions and 66 deletions
Show Stats Expand all files Collapse all files

36
flake.lock generated
View File

@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684896957, "lastModified": 1684293023,
"narHash": "sha256-N5naB0P7jD/xwmLAEkf+nhVwqnvbuHX1M4xLuufL40k=", "narHash": "sha256-scsN8CvQ8ObD09verWq6e8u4FUMYrZh0uhYl2F1OOC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e0c0b3f09829e333326a10a051a0836b27b1e08d", "rev": "016a781cc93d3c7f7005b6ba12f667e9861056e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1684899633, "lastModified": 1684169666,
"narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", "narHash": "sha256-N5jrykeSxLVgvm3Dd3hZ38/XwM/jU+dltqlXgrGlYxk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", "rev": "71ce85372a614d418d5e303dd5702a79d1545c04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,11 +292,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1684632198, "lastModified": 1684025543,
"narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=", "narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247", "rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1684754342, "lastModified": 1684215771,
"narHash": "sha256-plGnjnbnPLoZCTdQX21oT7xliQhFtgcWlkuDHgtEb1o=", "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7084250df3d7f9735087d3234407f3c1fc2400e3", "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1684661732, "lastModified": 1684171562,
"narHash": "sha256-2/Xo/UmUUoMXc0T5tzoUsYjMLLMjEfzRWDAQB0WwtW0=", "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b0671cbf1e5c443f7fbfd4941ee0f8a151435114", "rev": "55af203d468a6f5032a519cba4f41acf5a74b638",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +384,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1684637723, "lastModified": 1684032930,
"narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=", "narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9", "rev": "a376127bb5277cd2c337a9458744f370aaf2e08d",
"type": "github" "type": "github"
}, },
"original": { "original": {

30
machines/nucturne/default.nix
View File

@ -1,11 +1,6 @@
{ { config, pkgs, inputs, nixos-hardware, ... }: {
config, imports =
pkgs, [ ../../common/users.nix ./hardware-configuration.nix ./software.nix ];
inputs,
nixos-hardware,
...
}: {
imports = [../../common/users.nix ./hardware-configuration.nix ./software.nix];
elss = { elss = {
# base system # base system
@ -34,10 +29,10 @@
openvpn.enable = true; openvpn.enable = true;
# nm-networks # nm-networks
networking.nmConnections = []; networking.nmConnections = [ ];
# enable sops # enable sops
sops = {enable = true;}; sops = { enable = true; };
# enable wireguard # enable wireguard
wireguard.enable = true; wireguard.enable = true;
@ -45,22 +40,17 @@
# user setup # user setup
users = { users = {
enable = true; enable = true;
admins = ["ellmau"]; admins = [ "ellmau" ];
users = []; users = [ ];
meta = { meta = { ellmau.git = { signDefault = true; }; };
ellmau = {
git = {signDefault = true;};
extraGroups = ["networkmanager"];
};
};
}; };
}; };
boot = { boot = {
extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
kernelModules = ["v4l2loopback"]; kernelModules = [ "v4l2loopback" ];
plymouth.enable = true; plymouth.enable = true;
}; };

31
machines/stel-xps/default.nix
View File

@ -1,10 +1,4 @@
{ { config, pkgs, inputs, nixos-hardware, ... }: {
config,
pkgs,
inputs,
nixos-hardware,
...
}: {
imports = [ imports = [
../../common/users.nix ../../common/users.nix
./printer.nix ./printer.nix
@ -40,10 +34,10 @@
openvpn.enable = true; openvpn.enable = true;
# nm-networks # nm-networks
networking.nmConnections = ["tartaros" "eduroam"]; networking.nmConnections = [ "tartaros" "eduroam" ];
# enable sops # enable sops
sops = {enable = true;}; sops = { enable = true; };
# enable wireguard # enable wireguard
wireguard.enable = true; wireguard.enable = true;
@ -51,26 +45,23 @@
# user setup # user setup
users = { users = {
enable = true; enable = true;
admins = ["ellmau"]; admins = [ "ellmau" ];
users = []; users = [ ];
meta = { meta = {
ellmau = { ellmau.git = {
git = { key = "0x4998BEEE";
key = "0x4998BEEE"; gpgsm = true;
gpgsm = true; signDefault = true;
signDefault = true;
};
extraGroups = ["networkmanager"];
}; };
}; };
}; };
}; };
boot = { boot = {
extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
kernelModules = ["v4l2loopback"]; kernelModules = [ "v4l2loopback" ];
plymouth.enable = true; plymouth.enable = true;
}; };

2
modules/communication.nix
View File

@ -18,7 +18,7 @@ with lib; {
signal-desktop signal-desktop
skypeforlinux skypeforlinux
#remove teams as MS has removed the linux packages from their servers #remove teams as MS has removed the linux packages from their servers
teams #teams
zoom-us zoom-us
]; ];
}; };

8
modules/users.nix
View File

@ -45,12 +45,6 @@ with lib; {
type = types.str; type = types.str;
description = "Email address of the user"; description = "Email address of the user";
}; };
extraGroups = mkOption {
type = types.listOf types.str;
description = "additional groups to add";
default = [];
};
git = mkOption { git = mkOption {
type = types.submodule { type = types.submodule {
options = { options = {
@ -98,7 +92,7 @@ with lib; {
inherit (meta) description; inherit (meta) description;
isNormalUser = true; isNormalUser = true;
home = "/home/${login}"; home = "/home/${login}";
extraGroups = meta.extraGroups; extraGroups = [];
openssh.authorizedKeys.keys = meta.publicKeys; openssh.authorizedKeys.keys = meta.publicKeys;
}; };