vm: nopasswd sudo, network experiments

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Python 3.12" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/nix-conf.iml" filepath="$PROJECT_DIR$/.idea/nix-conf.iml" />
+    </modules>
+  </component>
+</project>

.idea/nix-conf.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

flake.lock

@@ -1,12 +1,48 @@
 {
   "nodes": {
+    "nixlib": {
+      "locked": {
+        "lastModified": 1734829460,
+        "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixos-generators": {
+      "inputs": {
+        "nixlib": "nixlib",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734915500,
+        "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=",
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-generators",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734424634,
+        "lastModified": 1736012469,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
         "type": "github"
       },
       "original": {
@@ -18,6 +54,7 @@
     },
     "root": {
       "inputs": {
+        "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -1,4 +1,3 @@
-# /etc/nixos/flake.nix
 {
   description = "flake for Yura-PC";
 
@@ -6,16 +5,42 @@
     nixpkgs = {
       url = "github:NixOS/nixpkgs/nixos-unstable";
     };
+    nixos-generators = {
+      url = "github:nix-community/nixos-generators";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs }: {
+  outputs = { self, nixpkgs, nixos-generators }: {
     nixosConfigurations = {
       Yura-PC = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./configuration.nix
+          ./modules
+          ./hosts/common.nix
+          ./hosts/Yura-PC
         ];
       };
+      VM = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./modules
+          ./hosts/common.nix
+          ./hosts/vm
+        ];
+      };
+    };
+    # https://github.com/nix-community/nixos-generators?tab=readme-ov-file#using-in-a-flake
+    packages.x86_64-linux = {
+      proxmox = nixos-generators.nixosGenerate {
+        system = "x86_64-linux";
+        modules = [
+          ./modules
+          ./hosts/common.nix
+          ./hosts/vm
+        ];
+        format = "proxmox";
+      };
     };
   };
 }

hosts/Yura-PC/default.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ lib, config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports =
@@ -10,6 +10,7 @@
       ./hardware-configuration.nix
       # <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
     ];
+  mods.kb-input.enable = true;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -24,33 +25,9 @@
 
   boot.loader.timeout = 3;
   boot.loader.systemd-boot.configurationLimit = 5;
-
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
-  # boot.kernelPackages = pkgs.linuxKernel.kernels.linux_6_8;
-  # boot.kernelPackages = pkgs.linuxPackages_6_8;
-  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6;
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
-  # nix-prefetch-git --url https://github.com/zen-kernel/zen-kernel.git --rev v6.8.9-zen1 --fetch-submodules
-  # boot.kernelPackages = let
-  #   version = "6.8.9";
-  #   suffix = "zen1"; # use "lqx1" for linux_lqx
-  # in pkgs.linuxKernel.packagesFor (pkgs.linux_zen.override {
-  #   inherit version suffix;
-  #   modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
-  #   src = pkgs.fetchFromGitHub {
-  #     owner = "zen-kernel";
-  #     repo = "zen-kernel";
-  #     rev = "v${version}-${suffix}";
-  #     sha256 = "1wva92wk0pxii4f6hn27kssgrz8yy38kk38w2wm5hh1qyz3ij1vj";
-  #   };
-  # });
-
   boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ];
 
-  # https://discourse.nixos.org/t/dev-zfs-has-the-wrong-permissions-after-rebooting/48737
-  # environment.etc."tmpfiles.d/zfs.conf".text = ''
-  # z /dev/zfs          0666 - -     -
-  # '';
-
   # https://nixos.wiki/wiki/Accelerated_Video_Playback
   hardware.graphics = {
     enable = true;
@@ -58,7 +35,8 @@
       intel-media-driver # LIBVA_DRIVER_NAME=iHD
     ];
   };
-  # environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; # Force intel-media-driver
+
+  environment.etc.hosts.mode = "0644";
 
   networking.hostName = "Yura-PC"; # Define your hostname.
   networking.hostId = "110a2814"; # Required for ZFS.
@@ -71,24 +49,6 @@
   # Enable networking
   networking.networkmanager.enable = true;
 
-  # Set your time zone.
-  time.timeZone = "America/Los_Angeles";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
   services.xserver.enable = false;
@@ -98,17 +58,11 @@
   services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;
 
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
   # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -125,7 +79,7 @@
 
   # services.qemuGuest.enable = true;
   # services.spice-vdagentd.enable = true;
-  services.sshd.enable = true;
+  services.openssh.enable = true;
   services.flatpak.enable = true;
   # services.geoclue2.enable = true;
   location.provider = "geoclue2";
@@ -133,37 +87,6 @@
   security.pam.services.sddm.enableGnomeKeyring = true;
   # security.pam.services.sddm.gnupg.enable = true;
 
-  services.xserver.xkb.extraLayouts = {
-    minimak-4 = {
-      description = "English (US, Minimak-4)";
-      languages = [ "eng" ];
-      # symbolsFile = /etc/nixos/minimak;
-      symbolsFile = ./minimak;
-    };
-    minimak-8 = {
-      description = "English (US, Minimak-8)";
-      languages = [ "eng" ];
-      # symbolsFile = /etc/nixos/minimak;
-      symbolsFile = ./minimak;
-    };
-    minimak-12 = {
-      description = "English (US, Minimak-12)";
-      languages = [ "eng" ];
-      # symbolsFile = /etc/nixos/minimak;
-      symbolsFile = ./minimak;
-    };
-  };
-
-  i18n.inputMethod = {
-    type = "fcitx5";
-    enable = true;
-    fcitx5.waylandFrontend = true;
-    fcitx5.plasma6Support = true;
-    fcitx5.addons = with pkgs; [
-      fcitx5-mozc
-    ];
- };
-
 
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
@@ -181,10 +104,6 @@
     group = "cazzzer";
     extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "geoclue" ];
     packages = with pkgs; [
-      python312Packages.torch
-
-      kdePackages.kate
-      kdePackages.yakuake
       python3
       poetry
 
@@ -196,24 +115,17 @@
       nodejs_22
       pnpm
       bun
-
-      # yin_yang deps, f*** this packaging s***
-      python312Packages.systemd
-      python312Packages.pyside6
-      python312Packages.dateutils
-      python312Packages.psutil
-      libnotify
-      # thunderbird
     ];
   };
 
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = false;
   # Install firefox.
-  programs.firefox.enable = true;
+  # programs.firefox.enable = true;
   programs.kdeconnect.enable = true;
   programs.fish.enable = true;
   programs.git.enable = true;
+  programs.git.lfs.enable = true;
   # https://nixos.wiki/wiki/Git
   programs.git.package = pkgs.git.override { withLibsecret = true; };
   programs.lazygit.enable = true;
@@ -222,6 +134,9 @@
   programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
   # programs.starship.enable = true;
   programs.wireshark.enable = true;
+  programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
+  programs.bat.enable = true;
+  programs.htop.enable = true;
 
   # https://nixos.wiki/wiki/Docker
   virtualisation.docker.enable = true;
@@ -283,49 +198,55 @@
     zlib
   ];
 
-  # attempt to fix flatpak firefox cjk fonts 
+  # attempt to fix flatpak firefox cjk fonts
   # fonts.fontconfig.defaultFonts.serif = [
   #   "Noto Serif"
   #   "DejaVu Serif"
   # ];
+  # fonts.fontconfig.defaultFonts.sansSerif = [
+  #   "Noto Sans"
+  #   "DejaVu Sans"
+  # ];
+
+  workarounds.flatpak.enable = true;
+  fonts.packages = with pkgs; [
+    fantasque-sans-mono
+    nerd-fonts.fantasque-sans-mono
+    noto-fonts
+    noto-fonts-emoji
+    noto-fonts-cjk-sans
+    noto-fonts-cjk-serif
+    jetbrains-mono
+   ];
+  # fonts.fontDir.enable = true;
+  # fonts.fontconfig.allowBitmaps = false;
   
   environment.systemPackages = with pkgs; [
-    level-zero
+    darkman
-    oneDNN
-    python312Packages.torch
-    # zfs
-    # fish
-
-    bat
-    # bluez
-#     docker_27
-#     docker-compose
     dust
     efibootmgr
     eza
     fastfetch
     fd
-    # flatpak
+    ffmpeg
-    kdePackages.flatpak-kcm
+    host-spawn # for flatpaks
     kdePackages.filelight
-    # git
+    kdePackages.flatpak-kcm
+    kdePackages.kate
+    kdePackages.yakuake
     gcr
     gnome-keyring # config for this and some others
     gnumake
     helix
-    htop
     jetbrains-toolbox # or maybe do invidual ones?
     # jetbrains.rust-rover
     # jetbrains.pycharm-professional
     # jetbrains.webstorm
+    android-studio
     mediainfo
     micro
     mpv
-    neofetch
-    # neovim
     nextcloud-client
-    noto-fonts-cjk-sans
-    noto-fonts-cjk-serif
     lxqt.pavucontrol-qt
     pinentry
     rbw
@@ -334,28 +255,12 @@
     starship
     tealdeer
     tela-circle-icon-theme
-    fantasque-sans-mono
-    jetbrains-mono
     virt-viewer
     waypipe
     whois
-    # wireshark
     yt-dlp
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
   ];
 
-  # nix.package = pkgs.nixFlakes;
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  environment.etc."current-system-packages".text =
-    let
-      packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
-      sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique packages);
-      formatted = builtins.concatStringsSep "\n" sortedUnique;
-    in
-      formatted;
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -370,7 +275,7 @@
   # services.openssh.enable = true;
 
   # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
+  networking.firewall.allowedTCPPorts = [ 8080 ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;

hosts/common.nix

@@ -0,0 +1,31 @@
+{ config, pkgs, ... }: {
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # Set your time zone.
+  time.timeZone = "America/Los_Angeles";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale  = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS        = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT    = "en_US.UTF-8";
+    LC_MONETARY       = "en_US.UTF-8";
+    LC_NAME           = "en_US.UTF-8";
+    LC_NUMERIC        = "en_US.UTF-8";
+    LC_PAPER          = "en_US.UTF-8";
+    LC_TELEPHONE      = "en_US.UTF-8";
+    LC_TIME           = "en_US.UTF-8";
+  };
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  environment.etc."current-system-packages".text =
+    let
+      packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
+      sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique packages);
+      formatted = builtins.concatStringsSep "\n" sortedUnique;
+    in
+      formatted;
+}

hosts/vm/default.nix

@@ -0,0 +1,148 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+#      ./hardware-configuration-vm.nix
+    ];
+  mods.kb-input.enable = true;
+
+#  boot.kernelParams = [ "console=tty0" ];
+  proxmox.qemuConf.bios = "ovmf";
+  proxmox.qemuExtraConf = {
+    machine = "q35";
+#    efidisk0 = "local-lvm:vm-9999-disk-1";
+    cpu = "host";
+  };
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.plymouth.enable = true;
+  boot.plymouth.theme = "breeze";
+  boot.kernelParams = [
+    "sysrq_always_enabled=1"
+  ];
+
+#  boot.loader.timeout = lib.mkForce 3;
+  boot.loader.systemd-boot.configurationLimit = 5;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
+  boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ];
+
+  environment.etc.hosts.mode = "0644";
+
+  # managed by cloud-init
+  # networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver.enable = false;
+
+  # Enable the KDE Plasma Desktop Environment.
+  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+  services.desktopManager.plasma6.enable = true;
+  services.flatpak.enable = true;
+
+  # VM services
+  services.cloud-init.enable = true;
+  services.cloud-init.network.enable = false;
+  services.qemuGuest.enable = true;
+  services.spice-vdagentd.enable = true;
+  services.openssh.enable = true;
+  services.openssh.settings.PasswordAuthentication = false;
+  services.openssh.settings.KbdInteractiveAuthentication = false;
+
+  security.sudo.wheelNeedsPassword = false;
+
+  users.groups = {
+    cazzzer = {
+      gid = 1000;
+    };
+  };
+  users.users.cazzzer = {
+    password = "";
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWgEzbEjbbu96MVQzkiuCrw+UGYAXN4sRe2zM6FVopq cazzzer@Yura-PC"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIApFeLVi3BOquL0Rt+gQK2CutNHaBDQ0m4PcGWf9Bc43 cazzzer@Yura-TPX13"
+    ];
+    isNormalUser = true;
+    description = "Yura";
+    uid = 1000;
+    group = "cazzzer";
+    extraGroups = [ "wheel" "docker" "wireshark" ];
+  };
+
+  # Install firefox.
+  programs.firefox.enable = true;
+  programs.fish.enable = true;
+  programs.git.enable = true;
+  programs.lazygit.enable = true;
+  programs.neovim.enable = true;
+
+  programs.bat.enable = true;
+  programs.htop.enable = true;
+  programs.wireshark.enable = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+
+  # https://github.com/flatpak/flatpak/issues/2861
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+
+#  workarounds.flatpak.enable = true;
+  fonts.packages = with pkgs; [
+    noto-fonts-cjk-sans
+    noto-fonts-cjk-serif
+    fantasque-sans-mono
+    nerd-fonts.fantasque-sans-mono
+    jetbrains-mono
+  ];
+
+  environment.systemPackages = with pkgs; [
+    darkman
+    dust
+    efibootmgr
+    eza
+    fastfetch
+    fd
+    host-spawn # for flatpaks
+    kdePackages.flatpak-kcm
+    kdePackages.filelight
+    kdePackages.kate
+    kdePackages.yakuake
+    gnumake
+    helix
+    mediainfo
+    micro
+    mpv
+    ripgrep
+    starship
+    tealdeer
+    tela-circle-icon-theme
+    waypipe
+    whois
+    yt-dlp
+    zfs
+  ];
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.11"; # Did you read the comment?
+}

hosts/vm/hardware-configuration.nix

@@ -0,0 +1,37 @@
+# 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 = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/da85e220-e2b0-443a-9a0c-a9516b8e5030";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/3F96-8974";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

modules/default.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ./mods
+    ./workarounds
+  ];
+}

modules/mods/default.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+  imports = [
+    ./kb-input.nix
+  ];
+}

modules/mods/kb-input.nix

@@ -0,0 +1,42 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.mods.kb-input;
+in {
+  options = {
+    mods.kb-input = {
+      enable = lib.mkEnableOption "input method and custom keyboard layout";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.xserver.xkb.extraLayouts = {
+      minimak-4 = {
+        description = "English (US, Minimak-4)";
+        languages = [ "eng" ];
+        symbolsFile = ./minimak;
+      };
+      minimak-8 = {
+        description = "English (US, Minimak-8)";
+        languages = [ "eng" ];
+        symbolsFile = ./minimak;
+      };
+      minimak-12 = {
+        description = "English (US, Minimak-12)";
+        languages = [ "eng" ];
+        symbolsFile = ./minimak;
+      };
+    };
+
+    i18n.inputMethod = {
+      type = "fcitx5";
+      enable = true;
+      fcitx5.waylandFrontend = true;
+      fcitx5.plasma6Support = true;
+      fcitx5.addons = [ pkgs.fcitx5-mozc ];
+    };
+  };
+}

modules/workarounds/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./flatpak.nix
+  ];
+}

modules/workarounds/flatpak.nix

@@ -0,0 +1,44 @@
+# https://github.com/knightpp/nixos-cfg/blob/main/modules/workarounds/flatpak.nix
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.workarounds.flatpak;
+in {
+  options = {
+    workarounds.flatpak = {
+      enable = lib.mkEnableOption "flatpak workaround";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    system.fsPackages = [pkgs.bindfs];
+    fileSystems = let
+      mkRoSymBind = path: {
+        device = path;
+        fsType = "fuse.bindfs";
+        options = ["ro" "resolve-symlinks" "x-gvfs-hide"];
+      };
+      aggregated = pkgs.buildEnv {
+        name = "system-fonts-and-icons";
+        paths = builtins.attrValues {
+          inherit (pkgs.libsForQt5) breeze-qt5;
+          inherit
+            (pkgs)
+            noto-fonts
+            noto-fonts-emoji
+            noto-fonts-cjk-sans
+            noto-fonts-cjk-serif
+            ;
+        };
+        pathsToLink = ["/share/fonts" "/share/icons"];
+      };
+    in {
+      # Create an FHS mount to support flatpak host icons/fonts
+      "/usr/share/icons" = mkRoSymBind "${aggregated}/share/icons";
+      "/usr/share/fonts" = mkRoSymBind "${aggregated}/share/fonts";
+    };
+  };
+}