diff --git a/eggs/dconfNixMain/user b/eggs/dconfNixMain/user
index 22e1c4b1..cd0ca043 100644
Binary files a/eggs/dconfNixMain/user and b/eggs/dconfNixMain/user differ
diff --git a/eggs/misc/ssh.config b/eggs/misc/ssh.config
index 847a3711..6f7d7341 100644
--- a/eggs/misc/ssh.config
+++ b/eggs/misc/ssh.config
@@ -1,4 +1,4 @@
-Host 78.46.239.229 168.119.171.217 78.47.196.196 5.75.139.112 mail.bak-it.de web.bak-it.de cloud.linksjugend-solid.de forum.linksjugend-solid.de backuppc.bak-it.de login.bak-it.de login.linksjugend-solid.de stuff.bak-it.de
+Host 167.233.38.143 78.46.239.229 168.119.171.217 78.47.196.196 5.75.139.112 mail.bak-it.de web.bak-it.de cloud.linksjugend-solid.de forum.linksjugend-solid.de backuppc.bak-it.de login.bak-it.de login.linksjugend-solid.de stuff.bak-it.de
User root
IdentityFile ~/.ssh/solidProd
diff --git a/eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml b/eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml
index a455f313..5fd91461 100644
--- a/eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml
+++ b/eggs/thunar/xfce/xfconf/xfce-perchannel-xml/thunar.xml
@@ -6,7 +6,7 @@
-
+
@@ -34,6 +34,7 @@
+
diff --git a/root-conf/nixos/flake.nix b/root-conf/nixos/flake.nix
index f5583e42..378b9967 100644
--- a/root-conf/nixos/flake.nix
+++ b/root-conf/nixos/flake.nix
@@ -58,6 +58,26 @@
};
modules = [
./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.useGlobalPkgs = true;
home-manager.useUserPackages = true;
diff --git a/root-conf/nixos/nixLap/configuration.nix b/root-conf/nixos/nixLap/configuration.nix
index 960dd42c..800b9e78 100644
--- a/root-conf/nixos/nixLap/configuration.nix
+++ b/root-conf/nixos/nixLap/configuration.nix
@@ -10,7 +10,6 @@ in
{
imports =
[
- ./hardware-configuration.nix
../shared-conf.nix
];
@@ -46,11 +45,7 @@ in
virtualisation = {
podman = {
enable = true;
-
- # Create a `docker` alias for podman, to use it as a drop-in replacement
dockerCompat = true;
-
- # Required for containers under podman-compose to be able to talk to each other.
defaultNetwork.settings.dns_enabled = true;
};
};
@@ -62,28 +57,9 @@ in
# https://wiki.nixos.org/wiki/KDE#Unlock_KDE_Wallet_with_LUKS_password
# Enabeling this akes reaching graphical target slow
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 = {
- # Is now handeld by user settings
- # autoLogin = {
- # enable = true;
- # user = "someone";
- # };
plasma-login-manager = {
enable = true;
};
@@ -109,34 +85,11 @@ in
alsa.enable = true;
alsa.support32Bit = 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.users.someone = {
- isNormalUser = true;
- uid = 1000;
- description = "someone";
- extraGroups = [ "networkmanager" "wheel" "libvirtd" "wireshark"];
- packages = with pkgs; [];
- shell = pkgs.zsh;
- };
-
-
- # Allow unfree packages
programs.kdeconnect.enable = true;
- # List packages installed in system profile. To search, run:
- # $ nix search wget
environment.systemPackages = with pkgs; [
# KDE
kdePackages.bluedevil
@@ -149,12 +102,7 @@ in
# Utils
imagemagick
] ++ optionalPkgs;
- # This value determines the NixOS release from which the default
- # settings for stateful data, like file locations and database versions
- # 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?
+
+ system.stateVersion = "25.05";
}
diff --git a/root-conf/nixos/nixMain/configuration.nix b/root-conf/nixos/nixMain/configuration.nix
index 7c266719..befbc3ad 100644
--- a/root-conf/nixos/nixMain/configuration.nix
+++ b/root-conf/nixos/nixMain/configuration.nix
@@ -73,15 +73,6 @@ in
users.groups.gpio = {};
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 = {
isNormalUser = true;
description = "another";
diff --git a/root-conf/nixos/shared-conf.nix b/root-conf/nixos/shared-conf.nix
index 380542dd..62680b5a 100644
--- a/root-conf/nixos/shared-conf.nix
+++ b/root-conf/nixos/shared-conf.nix
@@ -57,6 +57,16 @@
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 = {
enable = true;
usbmon.enable = true; # Allow USB monitoring
diff --git a/yolk.rhai b/yolk.rhai
index b90de742..e7a7e641 100644
--- a/yolk.rhai
+++ b/yolk.rhai
@@ -9,5 +9,6 @@ export let data = #{
export let eggs = switch SYSTEM.hostname {
"nixMain" => nixMainBase::base_config,
"nixLap" => nixLapBase::base_config,
+ "nixLjs" => nixLapBase::base_config,
_ => #{}
} + sharedConfig::base