flake.lock

@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
+        "lastModified": 1720042825,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728067476,
+        "lastModified": 1725001927,
-        "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
+        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
+        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,19 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1728018373,
+<<<<<<< HEAD
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+=======
+        "lastModified": 1725103162,
+        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+>>>>>>> 5655c8a056d725790ff88631d9bcc98875ef0333
         "type": "github"
       },
       "original": {

flake.nix

@@ -91,4 +91,3 @@
     };
   };
 }
-

hosts/desktop/default.nix

@@ -11,12 +11,17 @@
 
     # CLI
     ../../modules/system/cli/common.nix
+    ../../modules/system/cli/podman.nix
 
     # Hardware
     ../../modules/system/hardware/firewall.nix
     ../../modules/system/hardware/garbage-collection.nix
     ../../modules/system/hardware/locale.nix
     ../../modules/system/hardware/nvidia.nix
+
+    # Containers
+    # ../../modules/containers/adguard.nix
+    # ../../modules/containers/caddy.nix
   ];
 
   nix.settings = {
@@ -45,7 +50,17 @@
     extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  services.openssh.enable = true;
+
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # sunshine
+  services.sunshine = {
+    enable = true;
+    autoStart = true;
+    capSysAdmin = true;
+    openFirewall = true;
+  };
 
   system.stateVersion = "24.05";
 

hosts/desktop/hardware-configuration.nix

@@ -8,18 +8,18 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b4cefbc5-dd3d-4a4b-84d0-031b2ed7655c";
+    { device = "/dev/disk/by-uuid/f8dc500b-2b36-4ca8-940b-1716742d6cf3";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/9A7D-7464";
+    { device = "/dev/disk/by-uuid/029A-9287";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };

hosts/desktop/home.nix

@@ -30,7 +30,10 @@
     host = "xv-desktop";
 
     home.packages = with pkgs; [
-       unstable.prismlauncher
+      unstable.prismlauncher
+      unstable.modrinth-app
+      unstable.vesktop
+      unstable.blender
     ];
 
     home.stateVersion = "24.05";

hosts/laptop/default.nix

@@ -22,8 +22,6 @@
     ../../modules/system/hardware/laptop.nix
     ../../modules/system/hardware/locale.nix
     ../../modules/system/hardware/printing.nix
-    ../../modules/system/hardware/fprint.nix
-    ../../modules/system/hardware/virt.nix
   ];
 
   nix.settings = {
@@ -59,7 +57,6 @@
   };
 
   services.libinput.enable = true;
-  services.fwupd.enable = true;
 
   system.stateVersion = "24.05";
 

hosts/laptop/home.nix

@@ -38,22 +38,17 @@
       kdenlive
       unstable.prismlauncher
       unstable.joplin-desktop
+      unstable.moonlight-qt
       unstable.prusa-slicer
       signal-desktop
       unstable.vesktop
+      unstable.rnote
       unstable.blender
-      loupe
+      unstable.openscad-unstable
-      unstable.bottles
-
-      # Systemverilog
-      unstable.gtkwave
-      unstable.verilator
-      gnumake
 
       # Office
       libreoffice
-      onlyoffice-bin
+      unstable.onlyoffice-bin
-      papers
 
       # Image editing
       gimp

hosts/vnix-ctr/default.nix

@@ -0,0 +1,53 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+
+    # CLI
+    ../../modules/system/cli/common.nix
+    ../../modules/system/cli/podman.nix
+
+    # Hardware
+    ../../modules/system/hardware/firewall.nix
+    ../../modules/system/hardware/garbage-collection.nix
+    ../../modules/system/hardware/locale.nix
+  ];
+
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+
+    substituters = [
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
+
+  # Bootloader
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sda";
+    useOSProber = true;
+  };
+
+  # Networking
+  networking.networkmanager.enable = true;
+
+  networking.firewall = {
+    allowedTCPPorts = [ 80 443 1080 ];
+    allowedUDPPorts = [ 53 ];
+  };
+
+  # Configure user
+  users.users.xeovalyte = {
+    isNormalUser = true;
+    description = "Timo Boomers";
+    extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
+  };
+
+  system.stateVersion = "24.05";
+
+}

hosts/vnix-ctr/home.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    # GUI
+    ../../modules/home/gui/theming.nix
+  
+    # CLI
+    ../../modules/home/cli/common
+  ];
+
+  guiTheming.enable = false;  
+
+  home = {
+    username = "xeovalyte";
+    homeDirectory = "/home/xeovalyte";
+  };
+
+  home.stateVersion = "24.05";
+}

modules/containers/adguard.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+  virtualisation.oci-containers.containers = {
+    adguardhome = {
+      image = "docker.io/adguard/adguardhome";
+      autoStart = true;
+      ports = [
+        "192.168.100.107:53:53/udp"
+        "81:3000/tcp"
+      ];
+      volumes = [
+        "workdir:/opt/adguardhome/work"
+        "confdir:/opt/adguardhome/conf"
+      ];
+    };
+  };
+
+  networking.firewall = {
+    allowedTCPPorts = [ 81 53 ];
+    allowedUDPPorts = [ 53 ];
+  };
+}

modules/containers/caddy.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+pkgs.dockerTools.buildImage {
+  name = "caddy-custom";
+  tag = "latest";
+
+  fromImage = "docker.io/caddy";
+  fromImageName = null;
+  fromImageTag = "2.8.4-builder";
+
+  runAsRoot = ''
+    #!${pkgs.runtimeShell}
+
+    xcaddy build --with github.com/caddy-dns/cloudflare
+  '';
+}

modules/home/cli/common/helix.nix

@@ -3,9 +3,6 @@
 {
   home.packages = with pkgs; [
     unstable.marksman
-    unstable.svls
-    unstable.nil
-    unstable.nixpkgs-fmt
   ];
 
   programs.helix = {
@@ -19,28 +16,11 @@
       };
     };
     languages = {
-      # Rust
       language-server.rust-analyzer.config = {
         cargo = {
           features = "all";
         };
       };
-
-      # Systemverilog
-      language-server.svls = {
-        command = "svls";
-      };
-
-      language = [
-        {
-          name = "verilog";
-          language-servers = [ "svls" ];
-        }
-        {
-          name = "nix";
-          language-servers = [ "svls" ];
-        }
-      ];
     };
     themes = {
       base16 = let

modules/home/gui/common/firefox.nix

@@ -1,11 +1,6 @@
 { inputs, pkgs, ... }:
 
 {
-  # about:policies
-  # Check about:support for extension/add-on ID strings.
-  # Check about:config for options.
-  
-
   home.packages = with pkgs; [
     unstable.firefoxpwa
   ];
@@ -47,31 +42,6 @@
       };
     };
     profiles.xeovalyte = {
-      bookmarks = [
-        {
-          name = "Toolbar";
-          toolbar = true;
-          bookmarks = [
-            {
-              name = "Brightspace";
-              bookmarks = [
-                {
-                  name = "LCA";
-                  url = "https://brightspace.tudelft.nl/d2l/le/content/681008/Home";
-                }
-                {
-                  name = "DSA";
-                  url = "https://brightspace.tudelft.nl/d2l/le/content/681012/Home";
-                }
-                {
-                  name = "iEE";
-                  url = "https://brightspace.tudelft.nl/d2l/le/content/681018/Home";
-                }
-              ];
-            }
-          ];
-        }
-      ];
       search.engines = {
         "Nix" = {
           urls = [{
@@ -123,7 +93,7 @@
         "browser.shell.defaultBrowserCheckCount" = 1;
         "dom.security.https_only_mode" = true;
         "privacy.trackingProtection.enabled" = true;
-        "browser.toolbars.bookmarks.visibility" = "newtab";
+        "browser.toolbars.bookmarks.visibility" = "never";
         "browser.translations.neverTranslateLanguages" = "nl";
         "browser.newtabpage.pinned" = [
           {

modules/system/cli/common.nix

@@ -4,7 +4,7 @@
   environment.systemPackages = with pkgs; [
     usbutils
     tree
-    fastfetch
+    neofetch
     btop
     git
   ];

modules/system/gui/hyprland.nix

@@ -31,6 +31,7 @@
   };
 
   # Sound configuration
+  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {

modules/system/hardware/firewall.nix

@@ -3,7 +3,7 @@
 {
   networking.firewall = {
     enable = true;
-    allowedTCPPorts = [ 53317 3000 24800 ];
+    allowedTCPPorts = [ 53317 3000 ];
-    allowedUDPPorts = [ 53317 24800 ];
+    allowedUDPPorts = [ 53317 ];
   };
 }

modules/system/hardware/fprint.nix

@@ -3,5 +3,31 @@
 {
   services.fprintd.enable = true;
 
-  security.pam.services.login.fprintAuth = false;
+  security.pam.services.hyprlock = {
+    text = ''
+      auth  sufficient  pam_unix.so try_first_pass likeauth nullok
+      auth  sufficient  ${pkgs.fprintd}/lib/security/pam_fprintd.so
+      auth  include     login
+    '';
+  };
+
+  security.pam.services.greetd = {
+    text = ''
+      account required pam_unix.so # unix (order 10900)
+
+      # Authentication management.
+      auth sufficient pam_unix.so likeauth nullok try_first_pass # unix (order 11600)
+      auth sufficient /nix/store/bz12s6mba297725i9y35p73lvsic8gd3-fprintd-1.94.2/lib/security/pam_fprintd.so # fprintd (order 11400)
+      auth required pam_deny.so # deny (order 12400)
+
+      # Password management.
+      password sufficient pam_unix.so nullok yescrypt # unix (order 10200)
+
+      # Session management.
+      session required pam_env.so conffile=/etc/pam/environment readenv=0 # env (order 10100)
+      session required pam_unix.so # unix (order 10200)
+      session required pam_loginuid.so # loginuid (order 10300)
+      session optional /nix/store/dzp7d4k1d94s1x49p9171mvcsfyxr7bj-systemd-254.6/lib/security/pam_systemd.so # systemd (order 12000)   login
+    '';
+  };
 }

modules/system/hardware/laptop.nix

@@ -1,17 +1,17 @@
 { ... }:
 
 {
-  # services.auto-cpufreq.enable = true;
+  services.auto-cpufreq.enable = true;
-  # services.auto-cpufreq.settings = {
+  services.auto-cpufreq.settings = {
-  #   battery = {
+    battery = {
-  #     governor = "powersave";
+      governor = "powersave";
-  #     turbo = "never";
+      turbo = "never";
-  #   };
+    };
-  #   charger = {
+    charger = {
-  #     governor = "performance";
+      governor = "performance";
-  #     turbo = "auto";
+      turbo = "auto";
-  #   };
+    };
-  # };
+  };
 
   services.power-profiles-daemon.enable = true;
 

modules/system/hardware/virt.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
-
-  users.users.xeovalyte.extraGroups = [ "libvirtd" ];
-
-  environment.systemPackages = with pkgs; [
-    quickemu
-  ];
-}