moved fish to core

configuration.nix

@@ -1,18 +1,10 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }: {
-
-let
-  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
-  # python packages to include with python3
-  python-packages = import ./python-packages.nix;
-in
-{
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    (import "${home-manager}/nixos")
     ./nix-settings.nix
     ./boot.nix
-    ./users/servostar/user.nix
+    ./users
     ./.luks-swap.nix
     ./fonts.nix
     ./extra
@@ -30,12 +22,7 @@ in
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.11"; # Did you read the comment?
 
-  hardware.bluetooth.enable = true;
     hardware.opengl.enable = true;
-  # for rotation sensors
-  hardware.sensor.iio.enable = true;
-  # screen and keybord backlight
-  hardware.acpilight.enable = true;
 
   networking.firewall.checkReversePath = false;
   networking.hostName = "servostar-nixos-flex"; # Define your hostname.
@@ -66,58 +53,16 @@ in
     LC_TIME = "de_DE.UTF-8";
   };
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
   services.rpcbind.enable = true; # needed for NFS
 
-  # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-  # set wayland as default session
-  services.xserver.displayManager.defaultSession = "plasmawayland";
-
   programs.partition-manager.enable = true;
-  programs.fish.enable = true;
 
   # use bash shell for other users
   environment.shells = with pkgs; [ bash ];
 
-  programs.dconf.enable = true;
-  programs.xwayland.enable = true;
-
-  # exclude packages from plasma5
-  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
-    elisa
-    oxygen
-    khelpcenter
-    kcolorpicker
-  ];
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "de";
-    xkbVariant = "";
-  };
-
   # Configure console keymap
   console.keyMap = "de";
 
-  ################################################
-  # __     ___      _               _ _           _   _
-  # \ \   / (_)_ __| |_ _   _  __ _| (_)___  __ _| |_(_) ___  _ __
-  #  \ \ / /| | '__| __| | | |/ _` | | / __|/ _` | __| |/ _ \| '_ \ 
-  #   \ V / | | |  | |_| |_| | (_| | | \__ \ (_| | |_| | (_) | | | |
-  #    \_/  |_|_|   \__|\__,_|\__,_|_|_|___/\__,_|\__|_|\___/|_| |_|
-  #
-  # This sections enbales host virtualisation for:
-  #  - KVM
-  #  - Waydroid (android based on LineageOS)
-  #  - Docker
-  ################################################
-
-  # android container
-  virtualisation.waydroid.enable = true;
-
   ################################################
   #  ____  _                     _
   # |  _ \(_)_ __   _____      _(_)_ __ ___
@@ -150,17 +95,6 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = (with pkgs; [
-    (python3.withPackages(python-packages))
-
-    fishPlugins.done    # notifications for background process finished
-    fishPlugins.fzf-fish
-    fishPlugins.forgit
-    fzf
-    fishPlugins.grc
-    grc
-    fishPlugins.tide    # asynchronous prompt for fish shell
-    fishPlugins.autopair
-
     distrobox
 
     go

core/default.nix

@@ -3,8 +3,11 @@ let
     settings = import ./../settings.nix;
 in
 {
-    imports = lib.optionals settings.printing.enable [ ./printing.nix ]
+    imports = [ ./fonts.nix ]
+        ++ lib.optionals settings.fish [ ./fish.nix ]
+        ++ lib.optionals settings.printing.enable [ ./printing.nix ]
         ++ lib.optionals settings.xdg.enable [ ./xdg.nix ]
         ++ lib.optionals settings.java [ ./java.nix ]
-        ++ lib.optionals settings.dotnet [ ./dotnet.nix ];
+        ++ lib.optionals settings.dotnet [ ./dotnet.nix ]
+        ++ lib.optionals settings.plasma5.enable [ ./plasma5.nix ];
 }

core/fish.nix

@@ -0,0 +1,18 @@
+{ pkgs, lib, config, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    programs.fish.enable = true;
+
+    environment.systemPackages = (with pkgs; [
+        fishPlugins.done    # notifications for background process finished
+        fishPlugins.fzf-fish
+        fishPlugins.forgit
+        fzf
+        fishPlugins.grc
+        grc
+        fishPlugins.tide    # asynchronous prompt for fish shell
+        fishPlugins.autopair
+    ]);
+}

core/plasma5.nix

@@ -0,0 +1,26 @@
+{ pkgs, lib, config, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    # Enable the X11 windowing system.
+    services.xserver.enable = true;
+
+    # Configure keymap in X11
+    services.xserver = {
+        layout = "de";
+        xkbVariant = "";
+    };
+
+    # Enable the KDE Plasma Desktop Environment.
+    services.xserver.displayManager.sddm.enable = true;
+    services.xserver.desktopManager.plasma5.enable = true;
+    # set wayland as default session
+    services.xserver.displayManager.defaultSession = "plasmawayland";
+
+    # exclude packages from plasma5
+    environment.plasma5.excludePackages = settings.plasma5.excludePackages;
+
+    programs.dconf.enable = settings.plasma5.dconf;
+    programs.xwayland.enable = settings.plasma5.xwayland;
+}

dev/default.nix

@@ -8,5 +8,7 @@ in
     ++ lib.optionals settings.virtualisation.qemu.enable [ ./qemu.nix ]
     ++ lib.optionals settings.dev.platformio [ ./platformio.nix ]
     ++ lib.optionals settings.dev.latex [ ./latex.nix ]
-    ++ lib.optionals settings.dev.dotnet [ ./dotnet.nix ];
+    ++ lib.optionals settings.dev.dotnet [ ./dotnet.nix ]
+    ++ lib.optionals settings.dev.python3.enable [ ./python3.nix ]
+    ++ lib.optionals settings.virtualisation.waydroid [ ./waydroid.nix ];
 }

dev/python3.nix

@@ -0,0 +1,9 @@
+{ pkgs, config, lib, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    environment.systemPackages = with pkgs; [
+        (python3.withPackages(settings.dev.python3.packages))
+    ];
+}

dev/waydroid.nix

@@ -0,0 +1,4 @@
+{ pkgs, config, ... }: {
+    # android container
+    virtualisation.waydroid.enable = true;
+}

hardware/common.nix

@@ -0,0 +1,12 @@
+{ pkgs, lib, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    hardware.bluetooth.enable = settings.hardware.bluetooth;
+
+    # for rotation sensors
+    hardware.sensor.iio.enable = settings.hardware.iio;
+    # screen and keybord backlight
+    hardware.acpilight.enable = settings.hardware.acpilight;
+}

hardware/default.nix

@@ -4,8 +4,8 @@ let
 in
 {
     # Optionally import modules for specific hardware
-    imports = 
+    imports = [ ./common.nix ]
-        lib.optionals settings.hardware.amdgpu [ ./amdgpu.nix ]
+        ++ lib.optionals settings.hardware.amdgpu [ ./amdgpu.nix ]
         ++ lib.optionals settings.hardware.intelgpu [ ./intelgpu.nix ]
         ++ lib.optionals settings.hardware.nvidiagpu [ ./nvidiagpu.nix ];
 }

python-packages.nix

@@ -1,14 +0,0 @@
-ps: with ps;
-[
-  pandas
-  requests
-  pygments
-  tkinter
-  numpy
-  setuptools
-  youtube-dl
-  pip
-  setuptools
-  ipykernel
-  scipy
-]

settings.nix

@@ -5,6 +5,10 @@ with import <nixpkgs> {}; {
         intelgpu = false;
         nvidiagpu = false;
 
+        bluetooth = true;
+        acpilight = false;
+        iio = true;
+
         # support for yubikey and additional software
         yubikey = {
             enable = true;
@@ -14,6 +18,20 @@ with import <nixpkgs> {}; {
         };
     };
 
+    fish = true;
+
+    plasma5 = {
+        enable = true;
+        dconf = true;
+        xwayland = true;
+        excludePackages = with pkgs.libsForQt5; [
+            elisa
+            oxygen
+            khelpcenter
+            kcolorpicker
+        ];
+    };
+
     virtualisation = {
         docker-rootless = {
             enable = true;
@@ -23,11 +41,27 @@ with import <nixpkgs> {}; {
             enable = true;
             virt-manager = true;
         };
+        waydroid = false;
     };
     dev = {
         platformio = true;
         latex = true;
         dotnet = false;
+        python3 = {
+            enable = true;
+            packages = ps: with ps; [
+                pandas
+                requests
+                pygments
+                tkinter
+                numpy
+                setuptools
+                youtube-dl
+                pip
+                ipykernel
+                scipy
+            ];
+        };
 
         lsp = {
             enable = true;

users/default.nix

@@ -0,0 +1,9 @@
+let
+    home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
+in
+{
+    imports = [
+        (import "${home-manager}/nixos")
+        ./servostar/user.nix
+    ];
+}