Add various small tweaks

- utilized specialArgs
- mount /home/tristand/nix at /etc/nixos
- added work /etc/hosts
- use ids instead of paths for disk mounting
- and more

flake.nix

@@ -160,12 +160,11 @@
       };
       nixosConfigurations = {
         nixos-pulse = nixpkgs.lib.nixosSystem {
+          specialArgs = args;
           modules =
             [
               ./systems/nixos-pulse
               {
-                _module = { inherit args; };
-
                 nix.registry.nixpkgs.flake = nixpkgs;
                 nixpkgs.pkgs = pkgs;
 

home-mods/desktop/default.nix

@@ -21,10 +21,12 @@ in
       cavalier
       freetube
       filelight
+      element-desktop
       inkscape
       jellyfin-media-player
       kate
       libsForQt5.kdeconnect-kde
+      libsForQt5.plasma-vault
       neofetch
       nextcloud-client
       onlyoffice-bin

home-mods/dev/default.nix

@@ -4,10 +4,6 @@
 , inputs
 , ...
 }: {
-  # imports = [
-  #  ../shell
-  #];
-
   xdg.enable = true;
 
   programs.alacritty = {
@@ -43,7 +39,7 @@
       cmake
       curl
       direnv
-      emacs-unstable-pgtk
+      config.services.emacs.package
       fd
       gnutls
       gnumake

home-mods/shell/default.nix

@@ -124,6 +124,7 @@ in
 
     packages = with pkgs.unstable-pkgs; [
       btop
+      config.services.emacs.package
       imagemagick
       rust-motd
       zellij

os-mods/common/default.nix

@@ -52,6 +52,12 @@
     vim # fallback ed
   ];
 
+  fileSystems."/etc/nixos" = {
+    device = "/home/tristand/nix";
+    fsType = "none";
+    options = [ "bind" ];
+  };
+
   programs = {
     nix-ld.dev.enable = true;
     command-not-found.enable = false;

os-mods/virt/default.nix

@@ -37,17 +37,4 @@
   services.udev.extraRules = ''
     SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664", GROUP="wheel"
   '';
-
-  # virtualisation.libvirtd.allowedBridges = [
-  #   "virbr0"
-  #   "testbr0"
-  # ];
-
-  # networking.bridges = {
-  #   testbr0 = {
-  #     interfaces = [
-  #       "enp5s0f4u1u1c2"
-  #     ];
-  #   };
-  # };
 }

systems/nixos-pulse/default.nix

@@ -50,6 +50,16 @@
 
   networking = {
     hostName = "nixos-pulse";
+    extraHosts = ''
+      192.168.0.75    monitor.oekonzept.de
+      192.168.0.151   rosa.oekonzept.de
+      192.168.0.171   karl.oekonzept.de
+      192.168.0.206   vewadb.oekonzept.de
+      192.168.0.191   vewadb2.oekonzept.de
+      192.168.0.190   vpn.oekonzept.de
+      192.168.0.180   vewasmb.oekonzept.de
+      192.168.0.91    puppet.oekonzept.de
+    '';
     useDHCP = lib.mkDefault true;
     interfaces = {
       enp5s0f4u1u1c2 = {

systems/nixos-pulse/disko.nix

@@ -3,7 +3,7 @@
     disk = {
       cryptroot_0 = {
         type = "disk";
-        device = "/dev/disk/by-path/pci-0000:02:00.0-nvme-1";
+        device = "/dev/disk/by-id/nvme-eui.0000000623072487caf25b0310000017";
         content = {
           type = "gpt";
           partitions = {
@@ -43,7 +43,7 @@
       };
       cryptroot_1 = {
         type = "disk";
-        device = "/dev/disk/by-path/pci-0000:04:00.0-nvme-1";
+        device = "/dev/disk/by-id/nvme-eui.0000000623072487caf25b031000000d";
         content = {
           type = "gpt";
           partitions = {

users/default.nix

@@ -9,7 +9,7 @@
     isNormalUser = true;
     description = "Testa Test";
     extraGroups = [ "audio" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ];
-    shell = pkgs.fish;
+    shell = pkgs.unstable-os.fish;
     home = "/home/tester";
     hashedPassword = "$6$YJT50/Za3FSFQuNT$0orD1URwoURoRKO9sIAsUiIHxOtEOjmPXn5Mp7vAmIYlgVmI629qS7YPUInmztEtEorRpkSMbV3.fCy9NQhKX.";
   };
@@ -17,7 +17,7 @@
     isNormalUser = true;
     description = "Tristan Druyen";
     extraGroups = [ "audio" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ];
-    shell = pkgs.fish;
+    shell = pkgs.unstable-os.fish;
     home = "/home/tristand";
     hashedPassword = "$6$Wj.XY8JgH5EWuog4$HnbtPJXDEqKXFrzkPVEjih3PytcpBCrkfL7TAwkXd0IFced7kGMlZNliNsAqQ3XqfyUzAYiiKTIqoPVJEk.s..";
   };

users/tester.nix

@@ -14,7 +14,7 @@
     ../home-mods/virt
   ];
 
-  home = {
+  config.home = {
     username = "tester";
     stateVersion = "23.05";
   };

users/tristand.nix

@@ -14,11 +14,9 @@
     ../home-mods/virt
   ];
 
-  config = {
+  config.home = {
-    home = {
+    username = "tristand";
-      username = "tristand";
 
-      stateVersion = "23.05";
+    stateVersion = "23.05";
-    };
   };
 }