1
0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00

Compare commits

..

No commits in common. "1034e3fe251df2129fec4a20d747482a25937482" and "34a025d25f8c578d8511cc5a1671bdefc92f96f1" have entirely different histories.

3 changed files with 27 additions and 40 deletions

12
flake.lock generated
View File

@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679649158, "lastModified": 1679540305,
"narHash": "sha256-RWsxTBWQwdoCihH0NOZjIFbv56Pe4whXt4zxSAfTlPo=", "narHash": "sha256-W+9askXWmuEl2eKPvMG61ZpuygAWW0Unw7bbpja2Rsw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "f03b172233e1bf1fb2ffbc543b86aae00fbad444", "rev": "e0bec9f768c938411adbc3861ae712cf38bf5a0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1679598117, "lastModified": 1679224149,
"narHash": "sha256-Vs1f/7imI77OkMOQhO3xgx4jalN2Gx3D3C2wmnlpWJM=", "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "648021dcb2b65498eed3ea3a7339cdfc3bea4d82", "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -5,7 +5,11 @@
nixos-hardware, nixos-hardware,
... ...
}: { }: {
imports = [../../common/users.nix ./hardware-configuration.nix ./software.nix]; imports = [
../../common/users.nix
./hardware-configuration.nix
./software.nix
];
elss = { elss = {
# base system # base system
@ -21,7 +25,6 @@
enable = true; enable = true;
sway.enable = true; sway.enable = true;
i3.enable = false; i3.enable = false;
plasma.enable = false;
# set dpi if used in mobile applications # set dpi if used in mobile applications
# dpi = 180; # dpi = 180;
}; };
@ -33,10 +36,13 @@
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;
@ -47,14 +53,22 @@
admins = ["ellmau"]; admins = ["ellmau"];
users = []; users = [];
meta = {ellmau.git = {signDefault = true;};}; meta = {
ellmau.git = {
signDefault = true;
};
};
}; };
}; };
boot = { boot = {
extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; extraModulePackages = [
config.boot.kernelPackages.v4l2loopback
];
kernelModules = ["v4l2loopback"]; kernelModules = [
"v4l2loopback"
];
plymouth.enable = true; plymouth.enable = true;
}; };

View File

@ -1,27 +0,0 @@
{
config,
pkgs,
lib,
...
}:
with lib; {
options.elss.graphical.plasma.enable = mkEnableOption "Use plasma";
config = let
cfg = config.elss.graphical.plasma;
in
mkIf cfg.enable {
services.xserver = {
enable = true;
displayManager = {
sddm.enable = true;
defaultSession = "plasmawayland";
};
desktopManager.plasma5.enable = true;
};
environment.systemPackages = with pkgs; [
firefox
thunderbird
];
};
}