flake update

flake.lock

@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692763155,
+        "lastModified": 1693646047,
-        "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=",
+        "narHash": "sha256-VsuXtCGOhrzp1qb1CSoV/cO+5f+GPtA4J/SFYqqLyfo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a20e40acaebf067da682661aa67da8b36812606",
+        "rev": "fae8af43e201a8929ce45a5ea46192bbd1ffff18",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
     "jovian-nixos": {
       "flake": false,
       "locked": {
-        "lastModified": 1692837535,
+        "lastModified": 1693592878,
-        "narHash": "sha256-ixe4B/kUISjWECDro7LP7Lj8b6904DfNWXVdFQwFx4g=",
+        "narHash": "sha256-pPTf8gjZwivBicb/DPY3YwbkCROVt2qftqQONb1xC2M=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "afc6b957bc0a1868a56703d24d0233a17f702e62",
+        "rev": "d31a25e74b1bb7df342c0a53eeac4d4f91ea22b1",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1692952286,
+        "lastModified": 1693718952,
-        "narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=",
+        "narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "817e297fc3352fadc15f2c5306909aa9192d7d97",
+        "rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692913444,
+        "lastModified": 1693565476,
-        "narHash": "sha256-1SvMQm2DwofNxXVtNWWtIcTh7GctEVrS/Xel/mdc6iY=",
+        "narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "18324978d632ffc55ef1d928e81630c620f4f447",
+        "rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1692794066,
+        "lastModified": 1693636127,
-        "narHash": "sha256-H0aG8r16dj0x/Wz6wQhQxc9V7AsObOiHPaKxQgH6Y08=",
+        "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=",
         "owner": "NixOS",
         "repo": "nIxpkgs",
-        "rev": "fc944919f743bb22379dddf18dcb72db6cff84aa",
+        "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1693021060,
+        "lastModified": 1693724128,
-        "narHash": "sha256-/I+ziECG1s49DQ3MzImP43k2NYhqZ6mSYGZAvhASM40=",
+        "narHash": "sha256-puR8Sft6NKKZu5SgtpH2QrNyofzu51uTy+PdTrYU08U=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7c92643336b7a6f4289db7b11e23cf453080709b",
+        "rev": "ece5318a0bd48ddb7e00d555a067058c2d62869b",
         "type": "github"
       },
       "original": {

hosts/configuration_desktop.nix

@@ -73,6 +73,8 @@
     font-awesome                            # Icons
     hack-font
     corefonts                               # MS
+    intel-one-mono
+    office-code-pro
     (nerdfonts.override {                   # Nerdfont Icons override
       fonts = [
         "FiraCode"

hosts/configuration_server.nix

@@ -54,7 +54,7 @@
       ./rootCA.pem
   ];
 
-  fonts.fonts = with pkgs; [                # Fonts
+  fonts.packages = with pkgs; [                # Fonts
     carlito                                 # NixOS
     vegur                                   # NixOS
     source-code-pro

hosts/default.nix

@@ -156,6 +156,31 @@ in
     ];
   };
 
+  jupiter = lib.nixosSystem {                                # Desktop profile
+    inherit system;
+    #user = "dmz-user";
+    specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
+    modules = [
+      agenix.nixosModules.default
+      nur.nixosModules.nur
+      ./jupiter
+      ./configuration_desktop.nix
+      nixos-hardware.nixosModules.common-cpu-intel
+      nixos-hardware.nixosModules.common-pc-ssd
+
+      home-manager.nixosModules.home-manager {
+          nixpkgs.overlays = [
+            nur.overlay
+          ];
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+        imports = [(import ./home_server.nix)] ++ [(import ./jupiter/home.nix)];
+        };
+      }
+    ];
+  };
 
   q920 = lib.nixosSystem {                                # Laptop profile
     inherit system;

hosts/home.nix

@@ -51,17 +51,10 @@
         wireguard-tools
 
 # Video/Audio
-      #feh               # Image Viewer
         mpv               # Media Player
         youtube-dl
-      #pavucontrol       # Audio control
-      #stremio           # Media Streamer
-      #libva-utils       # vainfo
 
 # Apps
-      #firefox           # Browser
-      #google-chrome     # Browser
-      #remmina           # XRDP & VNC Client
         galculator
         tdesktop
         hdparm
@@ -82,79 +75,11 @@
         papirus-icon-theme
 
 # General configuration
-      #git              # Repositories
-      #killall          # Stop Applications
-      #nano             # Text Editor
-      #pciutils         # Computer utility info
-      #pipewire         # Sound
-      #usbutils         # USB utility info
-      #wacomtablet      # Wacom Tablet
-      #wget             # Downloader
-      #zsh              # Shell
         keepassxc
         libreoffice
-      #
+
-      # General home-manager
-      #alacritty        # Terminal Emulator
-      #dunst            # Notifications
-      #doom emacs       # Text Editor
-      #flameshot        # Screenshot
-      #libnotify        # Dep for Dunst
-      #neovim           # Text Editor
-      #rofi             # Menu
-      #udiskie          # Auto Mounting
-      #vim              # Text Editor
-      #
-      # Xorg configuration
-      #xclip            # Console Clipboard
-      #xorg.xev         # Input viewer
-      #xorg.xkill       # Kill Applications
-      #xorg.xrandr      # Screen settings
-      #xterm            # Terminal
-      #
-      # Xorg home-manager
-      #picom            # Compositer
-      #polybar          # Bar
-      #sxhkd            # Shortcuts
-      #
-      # Wayland configuration
-      #autotiling       # Tiling Script
-      #swayidle         # Idle Management Daemon
-      #wev              # Input viewer
-      #wl-clipboard     # Console Clipboard
-      #
-      # Wayland home-manager
-      #pamixer          # Pulse Audio Mixer
-      #swaylock-fancy   # Screen Locker
-      #waybar           # Bar
-      #
-      # Desktop
-      #blueman          # Bluetooth
-      #deluge           # Torrents
-      #discord          # Chat
-      #ffmpeg           # Video Support (dslr)
-      #gmtp             # Mount MTP (GoPro)
-      #gphoto2          # Digital Photography
-      #handbrake        # Encoder
-      #heroic           # Game Launcher
-      #hugo             # Static Website Builder
-      #lutris           # Game Launcher
-      #mkvtoolnix       # Matroska Tool
-      #new-lg4ff        # Logitech Drivers
-      #plex-media-player# Media Player
-      #polymc           # MC Launcher
-      #steam            # Games
-      #simple-scan      # Scanning
-      # 
-      # Laptop
-      #blueman          # Bluetooth
-      #light            # Display Brightness
-      #libreoffice      # Office Tools
-      #simple-scan      # Scanning
-      #
       # Flatpak
-      #obs-studio       # Recording/Live Streaming
+      super-slicer-latest
-      #super-slicer-latest
       #vscodium
       (vscode-with-extensions.override {
           vscode = vscodium;

hosts/jupiter/default.nix

@@ -0,0 +1,74 @@
+#
+#  Specific system configuration settings for desktop
+#
+#  flake.nix
+#   ├─ ./hosts
+#   │   └─ ./laptop
+#   │        ├─ default.nix *
+#   │        └─ hardware-configuration.nix       
+#   └─ ./modules
+#       ├─ ./desktop
+#       │   └─ ./hyprland
+#       │       └─ hyprland.nix
+#       ├─ ./modules
+#       │   └─ ./programs
+#       │       └─ waybar.nix
+#       └─ ./hardware
+#           └─ default.nix
+#
+
+{ config, pkgs, user, ... }:
+
+{
+  imports =                                                         # For now, if applying to other system, swap files
+    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+    (import ../../modules/desktop/virtualisation) ++   # Docker
+#    (import ../../modules/services/nas) ++                       # Server Services
+    (import ../../modules/hardware);                                # Hardware devices
+
+  boot = {                                  # Boot options
+    kernelPackages = pkgs.linuxPackages_latest;
+
+    loader = {                              # EFI Boot
+      systemd-boot.enable = true;
+      efi = {
+        canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot";
+      };
+      timeout = 1;                          # Grub auto select time
+    };
+  };
+
+#  environment = {
+#    systemPackages = with pkgs; [
+##      simple-scan
+##       intel-media-driver
+##       alacritty
+#    ];
+#  };
+
+  programs = {                              # No xbacklight, this is the alterantive
+    zsh.enable = true;
+    ssh.startAgent = false;
+    gnupg.agent = {
+      enable = false;
+      enableSSHSupport = true;
+      pinentryFlavor = "curses";
+    };
+  };
+
+  services = {
+    #auto-cpufreq.enable = true;
+    avahi = {                               # Needed to find wireless printer
+      enable = true;
+      nssmdns = true;
+      publish = {                           # Needed for detecting the scanner
+        enable = true;
+        addresses = true;
+        userServices = true;
+      };
+    };
+
+  };
+
+}

hosts/jupiter/hardware-configuration.nix

@@ -0,0 +1,248 @@
+#
+# Hardware settings for Teclast F5 10" Laptop
+# NixOS @ sda2
+#
+# flake.nix
+#  └─ ./hosts
+#      └─ ./laptop
+#          └─ hardware-configuration.nix *
+#
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
+  boot.initrd.secrets = {
+    "/root/NASKeyfile" =
+        /root/NASKeyfile;
+  };
+#  boot.initrd.luks.devices = {
+#    NAS-RAID1 = {
+#      device = "/dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088";
+#      keyFile = "/root/NASKeyfile";
+#    };
+#    NAS-RAID2 = {
+#      device = "/dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2";
+#      keyFile = "/root/NASKeyfile";
+#    };
+#  };
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+  boot.tmp.useTmpfs = true;
+  zramSwap.enable = true;
+
+  services.btrfs.autoScrub = {
+    enable = true;
+    interval = "monthly";
+    fileSystems = [
+      "/"
+#      "/mnt/Pluto"
+    ];
+  };
+
+  services.btrbk = {
+      instances = {
+          hf = {
+              onCalendar = "hourly";
+              settings = {
+                  incremental = "yes";
+                  snapshot_create = "ondemand";
+                  snapshot_dir = "@snapshots";
+                  timestamp_format = "long";
+
+                  snapshot_preserve = "2m 2w 5d 5h";
+                  snapshot_preserve_min = "latest";
+                
+                  volume =  {
+                      "/mnt/snapshots/root" = {
+                          snapshot_create = "always";
+                          subvolume = {
+                              "@" = {};
+                              "@home" = {};
+#                              "@nas/home" = {};
+                          };
+                      };
+                  };
+              };
+          };
+#          lf = {
+#              onCalendar = "daily";
+#              settings = {
+#                  incremental = "yes";
+#                  snapshot_create = "ondemand";
+#                  snapshot_dir = "@snapshots";
+#                  timestamp_format = "long";
+#
+#                  snapshot_preserve = "2m 2w 5d";
+#                  snapshot_preserve_min = "latest";
+#                
+#                  volume =  {
+#                      "/mnt/snapshots/Pluto" = {
+#                          snapshot_create = "always";
+#                          subvolume = {
+#                            "@" = {};
+#                            "@/Backups" = {};
+#                            "@/Games" = {};
+#                            "@/IT" = {};
+#                            "@/Media" = {};
+#                            "@/Pictures" = {};
+#                            "@/Rest" = {};
+#                          };
+#                      };
+#                  };
+#              };
+#          };
+      };
+  };
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ];
+    };
+
+  fileSystems."/srv" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ];
+    };
+
+    fileSystems."/mnt/snapshots/root" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    };
+
+#    fileSystems."/mnt/snapshots/Mars" =
+#    { device = "/dev/disk/by-label/NIXROOT";
+#      fsType = "btrfs";
+#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+#    };
+#
+#  fileSystems."/mnt/snapshots/Pluto" =
+#    { device = "/dev/disk/by-label/NAS-RAID";
+#      fsType = "btrfs";
+#      options = [ "compress=zstd,space_cache=v2,noatime,subvolid=5" ];
+#    };
+#
+#  fileSystems."/mnt/Pluto" =
+#    { device = "/dev/disk/by-label/NAS-RAID";
+#      fsType = "btrfs";
+#      options = [ "compress=zstd,space_cache=v2,noatime,subvol=@" ];
+#    };
+#
+#  fileSystems."/mnt/Mars" =
+#    { device = "/dev/disk/by-label/NIXROOT";
+#      fsType = "btrfs";
+#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async" ];
+#    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/NIXBOOT";
+      fsType = "vfat";
+    };
+
+#  fileSystems."/export/Pluto" =
+#    { device = "/mnt/Pluto";
+#      options = [ "bind" ];
+#    };
+# 
+#  fileSystems."/export/Mars" =
+#    { device = "/mnt/Mars";
+#      options = [ "bind" ];
+#    };
+ 
+  swapDevices = [ ];
+  
+  networking = {
+    vswitches = {
+        vs0 = {
+            interfaces = {
+                enp0s31f6 = {  };
+                lo1 = {
+                    type = "internal";
+                };
+                enp0s31f6iot = {
+                    type = "internal";
+                    vlan = 100;
+                };
+            };
+        };
+    };
+    useDHCP = false;                        # Deprecated
+    hostName = "jupiter";
+    domain = "home.opel-online.de";
+    networkmanager = {
+      enable = false;
+    };
+    timeServers = [
+        "192.168.2.1"
+    ];
+    interfaces = {
+#      enp0s31f6 = {
+#        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
+#        ipv4.addresses = [ {
+#            address = "45.142.114.153";
+#            prefixLength = 24;
+#        } ];
+#        ipv6.addresses = [ {
+#            address = "2a00:ccc1:101:19D::2";
+#            prefixLength = 64;
+#        } ];
+#      };
+      lo1 = {
+        useDHCP = true;
+        macAddress = "f6:14:f3:7b:1f:f7";
+      };
+    };
+#    defaultGateway = "45.142.114.1";
+    defaultGateway6 = {
+      address = "fe80::1";
+      interface = "lo1";
+    };
+#    nameservers = [ "9.9.9.9" "2620:fe::fe" ];
+    #firewall = {
+    #  enable = false;
+    #  #allowedUDPPorts = [ 53 67 ];
+    #  #allowedTCPPorts = [ 53 80 443 9443 ];
+    #};
+  };
+
+  systemd.services = {
+    "ovsdb".partOf = [ "network-setup.service" ];
+    "ovs-vswitchd".partOf = [ "network-setup.service" ];
+    "network-addresses-lo1" = {
+        requires = [ "network-setup.service" ];
+    };
+  };
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  powerManagement = {
+    cpuFreqGovernor = lib.mkDefault "powersave";
+    powertop.enable = true;
+#    powerUpCommands = ''
+#      ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
+#      ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2
+#    '';
+  };
+  
+}

hosts/jupiter/home.nix

@@ -0,0 +1,39 @@
+#
+#  Home-manager configuration for laptop
+#
+#  flake.nix
+#   ├─ ./hosts
+#   │   └─ ./laptop
+#   │       └─ home.nix *
+#   └─ ./modules
+#       └─ ./desktop
+#           └─ ./hyprland
+#              └─ hyprland.nix
+#
+
+{ pkgs, ... }:
+
+{
+  imports =
+    [
+      ../../modules/home.nix # Window Manager
+    ];
+
+  home = {                                # Specific packages for laptop
+    packages = with pkgs; [
+      # Applications
+
+      # Display
+      #light                              # xorg.xbacklight not supported. Other option is just use xrandr.
+
+      # Power Management
+      #auto-cpufreq                       # Power management
+      #tlp                                # Power management
+    ];
+  };
+
+  programs = {
+    alacritty.settings.font.size = 11;
+  };
+
+}