prepare for nixLjs

This commit is contained in:
Kyattsukuro 2026-06-04 11:44:50 +02:00
parent 8dafa33ff6
commit 8534c83d43
4 changed files with 32 additions and 54 deletions

View File

@ -58,6 +58,26 @@
}; };
modules = [ modules = [
./nixLap/configuration.nix ./nixLap/configuration.nix
./nixLap/hardware-configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup";
home-manager.users.someone = import ./nixLap/homemanager/someone.nix;
home-manager.extraSpecialArgs = {inherit inputs;};
}
];
};
nixosConfigurations.nixLjs = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
pkgs-unstable = import pkgs-unstable { inherit system; };
inputs = inputs;
};
modules = [
./nixLap/configuration.nix
./nixLjs/hardware-configuration.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;

View File

@ -10,7 +10,6 @@ in
{ {
imports = imports =
[ [
./hardware-configuration.nix
../shared-conf.nix ../shared-conf.nix
]; ];
@ -46,11 +45,7 @@ in
virtualisation = { virtualisation = {
podman = { podman = {
enable = true; enable = true;
# Create a `docker` alias for podman, to use it as a drop-in replacement
dockerCompat = true; dockerCompat = true;
# Required for containers under podman-compose to be able to talk to each other.
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enabled = true;
}; };
}; };
@ -62,28 +57,9 @@ in
# https://wiki.nixos.org/wiki/KDE#Unlock_KDE_Wallet_with_LUKS_password # https://wiki.nixos.org/wiki/KDE#Unlock_KDE_Wallet_with_LUKS_password
# Enabeling this akes reaching graphical target slow # Enabeling this akes reaching graphical target slow
boot.initrd.systemd.enable = false; boot.initrd.systemd.enable = false;
# We use empty password
# systemd.services.plasmalogin.serviceConfig.KeyringMode = "inherit";
# security.pam.services.plasmalogin-autologin.rules.auth = {
# systemd_loadkey = {
# order = 0;
# control = "optional";
# modulePath = "${pkgs.systemd}/lib/security/pam_systemd_loadkey.so";
# };
# plasmalogin = {
# order = 1;
# control = "include";
# modulePath = "plasmalogin";
# };
#};
services.displayManager = { services.displayManager = {
# Is now handeld by user settings
# autoLogin = {
# enable = true;
# user = "someone";
# };
plasma-login-manager = { plasma-login-manager = {
enable = true; enable = true;
}; };
@ -109,18 +85,8 @@ in
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
}; };
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.groups.wireshark = {}; users.groups.wireshark = {};
users.users.someone = { users.users.someone = {
isNormalUser = true; isNormalUser = true;
@ -131,12 +97,8 @@ in
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
# Allow unfree packages
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# KDE # KDE
kdePackages.bluedevil kdePackages.bluedevil
@ -149,12 +111,7 @@ in
# Utils # Utils
imagemagick imagemagick
] ++ optionalPkgs; ] ++ optionalPkgs;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions system.stateVersion = "25.05";
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.05"; # Did you read the comment?
} }

View File

@ -73,15 +73,6 @@ in
users.groups.gpio = {}; users.groups.gpio = {};
users.groups.wireshark = {}; users.groups.wireshark = {};
users.users.someone = {
uid = 1000;
isNormalUser = true;
description = "someone";
extraGroups = [ "wheel" "docker" "libvirtd" "gpio" "wireshark" "adbusers" ];
packages = with pkgs; [];
shell = pkgs.zsh;
};
users.users.another = { users.users.another = {
isNormalUser = true; isNormalUser = true;
description = "another"; description = "another";

View File

@ -57,6 +57,16 @@
SuspendState = "mem"; SuspendState = "mem";
}; };
users.users.someone = {
uid = 1000;
isNormalUser = true;
description = "someone";
extraGroups = [ "wheel" "docker" "libvirtd" "gpio" "wireshark" "adbusers" ];
packages = with pkgs; [];
shell = pkgs.zsh;
};
programs.wireshark = { programs.wireshark = {
enable = true; enable = true;
usbmon.enable = true; # Allow USB monitoring usbmon.enable = true; # Allow USB monitoring