Dev: clean modules and fix update script (#152)

* dev: try again tpm2 unlock

* wip: clean modules

* wip: fix infrec

* wip: web server on NUC

* fix: clean games module

* fix: split nixos scripts

* wip: update script

* wip: update script

* NUC: use Kmscon

* fix: re-add locale

* fix: move nixos-update to systemPackages

* wip: update script

* wip: use partlabels

* wip: disable plymouth

* wip: fix os error 2

* wip: fix os error 2

* wip: fix os error 2

* wip: fix os error 2

* wip: reinstall secureboot

* wip: format

* wip: format

* wip: rebuild script

* wip: rebuild script

* wip: rebuild script

Author: MadMcCrow

docs/CHANGELOG.md

@@ -16,3 +16,10 @@
 # 20-5-2024
 - improved server systems
 - reorganized nixos modules
+
+# 15-12-2024
+- reorganized all modules
+- started detailled doc
+- enabled secureboot on linux
+- simplified systems
+- optimised imports

docs/INSTALL.md

@@ -0,0 +1,22 @@
+# NIXOS :
+
+## Secure Boot :
+
+After normal installation, do this :
+ 1. make sure to have secure boot enabled in setup mode
+ 2. run :
+    ```
+    nix-shell -p sbctl --run "sudo sbctl create-keys"
+    nix-shell -p sbctl --run "sudo sbctl enroll-keys --microsoft"
+    nix-shell -p sbctl --run "sbctl status"
+    ```
+    this ensure that secure boot is enabled.
+    more details [in lanzaboote] (https://github.com/nix-community/lanzaboote/blob/master/docs/QUICK_START.md)
+
+## TPM2 unlock :
+
+    with this config you can use luks passwordless :
+    `sudo systemd-cryptenroll /dev/$DISK --tpm2-device=auto --tpm2-pcrs=0+2+7` is run after every rebuild, so you are safe !
+    see [this reddit thread](https://www.reddit.com/r/NixOS/comments/xrgszw/nixos_full_disk_encryption_with_tpm_and_secure/) for details !
+          
+

docs/TODO.md

@@ -2,25 +2,31 @@
 
 ## bugfixes :
 
- - [X] fix `sshd` : fixed, added `neededForBoot` to bindMount
- - [X] fix samba Workgroup share not working
  - [ ] fix `gamemoded.service` : `gamemoded.service: Main process exited, code=exited, status=1/FAILURE`
 
 ## improvements :
 
+### NixOS
  - [X] Linux : reworked core modules
- - [ ] Linux Desktop : rework desktop modules
- - [ ] Linux Desktop : Theming
- - [ ] Linux : use BTRFS instead of ZFS for root
- - [ ] Linux : ZFS use better defaults
+ - [X] Linux Desktop : rework desktop modules
+ - [X] Linux : use BTRFS instead of ZFS for root
+ - [X] Update github actions
  - [ ] Make a documentation
- - [ ] Update github actions
+
+ ### Web
+ - [ ] web use latest nixpkgs;
+ - [ ] web hosts services
+ ### Users
+ - [ ] Users use HM options
  - [ ] Option to enable or disable users by systems
- - [ ] Darwin : Auto Update command
  - [ ] Home-Manager : set useGlobalPkgs to true and remove nixpkgs options.
 
- ## Possible :
+ ### MacOS
+ - [ ] Darwin : Auto Update command
+
 
+ ## Possible :
  - [ ] Server : pufferpanel for game servers
  - [ ] map unfree programs to unfree automatically
  - [ ] better git hooks (prepush/precommit)
+ - [ ] split very long module

flake.lock

@@ -9,24 +9,33 @@
     nixpkgs.url = "github:nixos/nixpkgs/refs/tags/24.05";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     # HM :
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     ## Secure boot
-    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1";
-    lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
+    lanzaboote = {
+      url = "github:nix-community/lanzaboote/v0.4.1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     ## Plasma
     # TODO : nix run github:pjones/plasma-manager
-    # plasma-manager.url = "github:pjones/plasma-manager";
-    # plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
-    # plasma-manager.inputs.home-manager.follows = "home-manager";
+    # plasma-manager = {
+    # url = "github:pjones/plasma-manager";
+    # inputs.nixpkgs.follows = "nixpkgs";
+    # home-manager.follows = "home-manager";
+    # };
 
     # macOS:
-    # TODO : remove what's not useful
     nixpkgs-darwin.url = "github:nixos/nixpkgs/release-24.05";
-    darwin.url = "github:LnL7/nix-darwin";
-    darwin.inputs.nixpkgs.follows = "nixpkgs-darwin";
-    home-manager-darwin.url = "github:nix-community/home-manager/release-24.05";
-    home-manager-darwin.inputs.nixpkgs.follows = "nixpkgs-darwin";
+    darwin = {
+      url = "github:LnL7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs-darwin";
+    };
+    home-manager-darwin = {
+      url = "github:nix-community/home-manager/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs-darwin";
+    };
     mac-app-util.url = "github:hraban/mac-app-util";
   };
 

flake.nix

@@ -0,0 +1,25 @@
+# modules :
+
+All configuration modules are independant and only imported if necessary.
+this is done so that non-imported modules don't get parsed if not in use (no web server parsing if no web server on the machine for example).
+
+## linux
+this is our core linux config. maybe it could benefit from splitting in separate files for filesystems and other things
+
+## desktop
+KDE desktop (for now). this is made for having a nice linux desktop
+
+## games
+tools to better run games on nixos. requires (linux)[##linux].
+
+## shared
+modules useful both in linux and macOS
+
+## vm
+module to turn a system into a VM
+
+## web
+a cool web/cloud server. linux only (relies on systemd). has no external dependencies.
+
+## macos
+nix-darwin module for MacOS.

modules/README.md

@@ -0,0 +1,115 @@
+# desktop.nix
+#
+#
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  options.desktop = with lib; {
+    enable = mkEnableOption "desktop experience";
+  };
+
+  config = lib.mkMerge [
+    (lib.attrsets.optionalAttrs config.desktop.enable {
+
+      services = {
+        displayManager.sddm = {
+          enable = true;
+          enableHidpi = true;
+          autoNumlock = true;
+          # this prevents issues with nvidia drivers
+          wayland.enable =
+            !(builtins.any (
+              x: x == "nvidia"
+            ) config.services.xserver.videoDrivers);
+        };
+      };
+
+      # set tag for version
+      system.nixos.tags = [ "Desktop" ];
+
+      #
+      services.xserver = {
+        enable = true;
+
+        # Enable Plasma 5 or 6
+        desktopManager.plasma5 = {
+          enable = true;
+          useQtScaling = true;
+          # default font with extra
+          notoPackage = pkgs.noto-fonts-lgc-plus;
+        };
+        # remove xterm
+        desktopManager.xterm.enable = false;
+        excludePackages = [ pkgs.xterm ];
+
+      };
+
+      # enable plasma
+      qt = {
+        enable = true;
+        platformTheme = "kde";
+      };
+
+      # enable tools
+      programs = {
+        dconf.enable = true;
+        kdeconnect.enable = true;
+        partition-manager.enable = true;
+      };
+
+      # remove useless KDE packages
+      environment = {
+        plasma5.excludePackages =
+          with pkgs.libsForQt5;
+          [
+            oxygen
+            khelpcenter
+            plasma-browser-integration
+            print-manager
+            kio-extras
+            khelpcenter
+            kwallet
+            kwallet-pam
+            kate
+            okular
+          ]
+          ++ (with pkgs.libsForQt5; [ kemoticons ]);
+
+        systemPackages =
+          with pkgs;
+          [
+            lightly-boehs
+            papirus-icon-theme
+            libsForQt5.kcalc
+          ]
+          ++ map callPackage [
+            ./packages/vapor-theme.nix
+            # ./packages/plasma-drawer.nix
+            # ./packages/ditto-menu.nix
+          ];
+      };
+    })
+    (lib.attrsets.optionalAttrs (!config.desktop.enable) {
+      system.nixos.tags = [ "Headless" ];
+      services.xserver.enable = false;
+
+      services.kmscon = {
+        enable = true;
+        fonts = [
+          {
+            name = "Source Code Pro";
+            package = pkgs.source-code-pro;
+          }
+          {
+            name = "nerdfont";
+            package = pkgs.nerdfonts;
+          }
+        ];
+      };
+    })
+  ];
+}

modules/desktop/default.nix

@@ -24,10 +24,4 @@ stdenv.mkDerivation rec {
     zip
   ];
 
-  # TODO :
-  # installPhase = ''
-  #   mkdir -p $out/share/plasma/plasmoids/plasma-drawer
-  #   cd $src
-  #   ${lib.getBin libsForQt5.kpackage}/bin/kpackagetool -i $out/share/plasma/plasmoids/plasma-drawer
-  # '';
 }