final commit before moving to gentoo

Nix is great, but it was hard for me to configure every part of system explicitly on everyday machine.
From now, I'm going to leave NixOS, but I will keep using Nix for further software development.
Mabye come back in PI for high level IOT Dev?

README.md

@@ -2,4 +2,6 @@
 
 dotfiles for nixos
 
-referenced heavily on [librephoenix's nixos-config](https://github.com/librephoenix/nixos-config).
+~~referenced heavily on [librephoenix's nixos-config](https://github.com/librephoenix/nixos-config).~~
+
+This config is now more looks like [sioodmy's config](https://github.com/sioodmy/dotfiles).

flake.lock

@@ -1,33 +1,30 @@
 {
   "nodes": {
-    "home-manager": {
+    "homix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1720042825,
+        "lastModified": 1720719665,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "narHash": "sha256-BKcOoDlMC86zExMKXFXQ04HO99fUNFmtEdvP+gB45Pk=",
-        "owner": "nix-community",
+        "owner": "sioodmy",
-        "repo": "home-manager",
+        "repo": "homix",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "62bc58f2350cbb061e61ac0f3d63018663fbe4cb",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "sioodmy",
-        "ref": "release-24.05",
+        "repo": "homix",
-        "repo": "home-manager",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1723310128,
+        "lastModified": 1752666637,
-        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+        "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153",
         "type": "github"
       },
       "original": {
@@ -39,24 +36,40 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723688146,
+        "lastModified": 1719690277,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1752687322,
+        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
     "root": {
       "inputs": {
-        "home-manager": "home-manager",
+        "homix": "homix",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },

flake.nix

@@ -2,66 +2,24 @@
   description = "kenryuS nixos configurations/dotfiles";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    homix.url = "github:sioodmy/homix";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, ... }:
+  outputs = inputs@{ self, nixpkgs, homix, ... }:
     let
-      systemSettings = {
-        system = "x86_64-linux";
-        hostname = "kenryu-nixos";
-        machine = "workstation";
-        timezone = "Asia/Tokyo";
-        locale = "ja_JP.UTF-8";
-        bootConf = {
-          mode = "uefi";
-          mountPath = "/boot";
-          grubDev = "";
-        };
-        gpuType = "nvidia";
-      };
-
-      userSettings = {
-        username = "kenryus";
-        name = "Kenryu Shibata";
-        email-dev = "kenryudev5894@gmail.com";
-        dotfilesDir = "/etc/nixos";
-        editor = "nvim";
-        editor-pkg = pkgs.neovim;
-      };
-
       pkgs = import inputs.nixpkgs {
-        system = systemSettings.system;
+        system = "x86_64-linux";
-        config = {
-          allowUnfree = true;
-          allowUnfreePredicate = (_: true );
-        };
       };
 
       lib = inputs.nixpkgs.lib;
-      home-manager = inputs.home-manager;
+    in
-    in {
+    {
-      nixosConfigurations.system = lib.nixosSystem {
+      nixosModules = {
-        system = systemSettings.system;
+        homix = homix.nixosModules.default;
-        modules = [
+      };
-          (./. + "/machines" + ("/" + systemSettings.machine) + "/configuration.nix")
+      nixosConfigurations = import ./hosts inputs;
-          home-manager.nixosModules.home-manager {
+
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.${userSettings.username} = import (./. + "/machines" + ("/" + systemSettings.machine) + "/home.nix");
-            home-manager.extraSpecialArgs = {
-              inherit userSettings;
-            };
-          }
-        ];
-        specialArgs = {
-          inherit systemSettings;
-          inherit userSettings;
-          inherit inputs;
-        };
-      };
     };
 }

hosts/default.nix

@@ -0,0 +1,20 @@
+{ self, nixpkgs, ... }:
+let
+  inherit (self) inputs;
+  mkHost = name:
+    nixpkgs.lib.nixosSystem {
+      modules = [
+        ./${name}
+        ../overlays
+      ] ++ builtins.attrValues self.nixosModules;
+
+      specialArgs = {
+        inherit inputs;
+        systemSettings = import ./${name}/systemSettings.nix;
+        userSettings = import ../user/userSettings.nix;
+      };
+    };
+in
+{
+  syushiki = mkHost "syushiki";
+}

hosts/syushiki/default.nix

@@ -0,0 +1,52 @@
+{ config, lib, pkgs, modulesPath, systemSettings, ... }: {
+  imports = [
+    ../../system
+    ../../system/nvidia
+    ../../user
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f4c95da6-3c6b-4414-a62a-c8c26c4a1c73";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/C83C-841F";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  fileSystems."/run/media/kenryus/hdd" = {
+    device = "/dev/disk/by-uuid/0d146628-12f4-4bb6-abde-bbf798a57c25";
+    fsType = "ext4";
+  };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/d933c349-8e70-41e1-8d13-605656dba18b"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault systemSettings.system;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  programs.appimage = {
+    enable = true;
+    binfmt = true;
+  };
+
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
+  # Open ports in the firewall.
+  networking.firewall.allowedTCPPorts = [ 3000 3001 22 ];
+
+  system.stateVersion = "24.05"; # Did you read the changelog?
+}

hosts/syushiki/systemSettings.nix

@@ -0,0 +1,6 @@
+{
+  system = "x86_64-linux";
+  hostname = "kenryu-nixos";
+  timezone = "Asia/Tokyo";
+  locale = "ja_JP.UTF-8";
+}

machines/base.nix

@@ -1,41 +0,0 @@
-{ pkgs, lib, config, systemSettings, userSettings, ... }:
-{
-  imports = [
-    ../system/hardware/audio.nix
-    ../system/hardware/time.nix
-    ../system/services/network-manager.nix
-    ../system/utils.nix
-  ];
-
-  time.timeZone = systemSettings.timezone;
-
-  networking.hostName = systemSettings.hostname;
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  nixpkgs.config.allowUnfree = true;
-
-  i18n.defaultLocale = systemSettings.locale;
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = systemSettings.locale;
-    LC_IDENTIFICATION = systemSettings.locale;
-    LC_MEASUREMENT = systemSettings.locale;
-    LC_MONETARY = systemSettings.locale;
-    LC_NAME = systemSettings.locale;
-    LC_NUMERIC = systemSettings.locale;
-    LC_PAPER = systemSettings.locale;
-    LC_TELEPHONE = systemSettings.locale;
-    LC_TIME = systemSettings.locale;
-  };
-
-  users.users.${userSettings.username} = {
-    isNormalUser = true;
-    description = userSettings.name;
-    extraGroups = [ "networkmanager" "wheel" "docker" "input" "flatpak" "dialout" "video" "input" "audio" "libvirtd" ];
-    packages = with pkgs; [];
-    uid = 1000;
-  };
-
-  environment.shells = with pkgs; [ bash ];
-  users.defaultUserShell = pkgs.bash;
-}

machines/workstation/configuration.nix

@@ -1,41 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../base.nix
-      ../../system/services/cups.nix
-      ../../system/services/ssh.nix
-      ../../system/services/polkit.nix
-      ../../system/services/flatpak.nix
-      ../../system/services/steam.nix
-      ../../system/services/tailscale.nix
-      ../../system/services/libvirtd.nix
-      ../../system/services/docker.nix
-      ../../system/hardware/kernel.nix
-      ../../system/hardware/nvidia.nix
-      ../../system/hardware/opengl.nix
-      ../../system/hardware/bluetooth.nix
-      ../../system/wm/sddm.nix
-    ];
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  programs.appimage = {
-    enable = true;
-    binfmt = true;
-  };
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  system.stateVersion = "24.05"; # Did you read the changelog?
-
-}
-

machines/workstation/hardware-configuration.nix

@@ -1,46 +0,0 @@
-# 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 + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/f4c95da6-3c6b-4414-a62a-c8c26c4a1c73";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C83C-841F";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  fileSystems."/run/media/kenryus/hdd" = {
-    device = "/dev/disk/by-uuid/0d146628-12f4-4bb6-abde-bbf798a57c25";
-    fsType = "ext4";
-  };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/d933c349-8e70-41e1-8d13-605656dba18b"; }
-    ];
-
-  # 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.enp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

machines/workstation/home.nix

@@ -1,34 +0,0 @@
-{ pkgs, userSettings, ... }:
-{
-  imports = [
-    ../../user/apps/browsers/firefox.nix
-    ../../user/dev/tools/git.nix
-    ../../user/dev/tools/gitui.nix
-    ../../user/dev/editor/vscodium.nix
-    ../../user/dev/editor/zed-editor.nix
-    ../../user/dev/lang/cc.nix
-    ../../user/dev/lang/python.nix
-    ../../user/dev/lang/rust.nix
-    ../../user/dev/ide/qtcreator.nix
-    ../../user/apps/utils/alacritty.nix
-    ../../user/apps/utils/keepassxc.nix
-    ../../user/apps/utils/cava.nix
-    ../../user/apps/utils/owncloud-client.nix
-    ../../user/apps/utils/fzf.nix
-    ../../user/apps/utils/zoxide.nix
-    ../../user/apps/media/vlc.nix
-    ../../user/apps/media/mpv.nix
-    ../../user/apps/media/yt-dlp.nix
-    ../../user/apps/games/mangohud.nix
-    ../../user/wm/xmonad/xmonad.nix
-  ];
-
-  home.username = userSettings.username;
-  home.homeDirectory = "/home/" + userSettings.username;
-
-  programs.home-manager.enable = true;
-
-  home.stateVersion = "24.05";
-
-  home.packages = with pkgs; [];
-}

newpkg.sh

@@ -1,63 +0,0 @@
-#!/bin/bash
-
-echo "newpkg.sh: create minimal nix file in current directory"
-
-if [ -z "$NIXOSSYSCONFIG" ]; then
-	echo "Error: Env Variable Missing, NIXOSSYSCONFIG"
-	exit 1
-fi
-
-if [ -z "$NIXOSHOMECONFIG" ]; then
-	echo "Error: Env Variable Missing, NIXOSHOMECONFIG"
-	exit 1
-fi
-
-if [ -z "$EDITOR" ]; then
-	echo "Error: Env Variable Missing, EDITOR"
-	exit 1
-fi
-
-echo -e "Select installation destination:\n[1]: System\n[2]: User\n[q]: quit"
-read dest
-echo "Specifiy the package to add:"
-read pkgName
-
-touch "$PWD/${pkgName}.nix"
-
-if [[ $dest -eq 1 ]]; then
-	echo -e "{ pkgs, ... }:\n{\n  environment.systemPackages = with pkgs; [\n    ${pkgName}\n  ];\n}" > "$PWD/${pkgName}.nix"
-	echo "Open editor to modify system imports? [y/N]: "
-	read doEdit
-	if [ "$doEdit" == "y" ] || [ "$doEdit" == "Y" ]; then
-		$EDITOR $NIXOSSYSCONFIG
-	fi
-elif [[ $dest -eq 2 ]]; then
-	echo -e "{ pkgs, ... }:\n{\n  home.packages = with pkgs; [\n    ${pkgName}\n  ];\n}" > "$PWD/${pkgName}.nix"
-	echo "Open editor to modify home imports? [y/N]: "
-	read doEdit
-	if [ "$doEdit" == "y" ] || [ "$doEdit" == "Y" ]; then
-		$EDITOR $NIXOSHOMECONFIG
-	fi
-elif [[ $dest == "q" ]]; then
-	exit 0
-else
-	echo "Error: Non-numeric or Out-ranged value inputed"
-	exit 1
-fi
-
-echo "Would you like to edit new nix file for further configuration? [y/N]: "
-read doNixEdit
-if [ "$doNixEdit" == "y" ] || [ "$doNixEdit" == "Y" ]; then
-	$EDITOR "$PWD/${pkgName}.nix"
-fi
-
-echo "Would you like to execute nixos-rebuild? [y/N]: "
-read doExec
-
-if [ "$doExec" == "y" ] || [ "$doExec" == "Y" ]; then
-	cd ~/.dotfiles
-	sudo nixos-rebuild --flake '.#system'
-else
-	echo "Exiting"
-	exit 0
-fi

overlays/default.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, lib, ... }:
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      qemu_full = prev.qemu_full.override {
+        cephSupport = false;
+        xenSupport = false;
+      };
+    })
+  ];
+}

pkgs/AppMan/AppMan.nix

@@ -1,60 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  coreutils,
-  gnused,
-  gnugrep,
-  curl,
-  wget,
-  binutils,
-  unzip,
-  gnutar,
-  zsync
-}:
-
-stdenv.mkDerivation rec {
-  pname = "AppMan";
-  version = "7.7";
-
-  src = fetchFromGitHub {
-    owner = "ivan-hc";
-    repo = "AM";
-    rev = "e8abedace64c32023086a9c79fe646d84588a995";
-    hash = "sha256-n0m5VWdMTYWv18cB++NYWMQZXNKWfnj0iHgj0ZNdjy8=";
-  };
-
-  propagatedBuildInputs = [
-    coreutils
-    gnused
-    gnugrep
-    curl
-    wget
-    binutils
-    unzip
-    gnutar
-    zsync
-  ];
-
-  buildPhase = ''
-    
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp APP-MANAGER $out/bin
-    ln -sf $out/bin/APP-MANAGER $out/bin/am
-  '';
-
-  meta = with lib; {
-    description = "Database & solutions for all AppImages and portable apps for GNU/Linux!";
-    longDescription = ''
-      AppImage package manager to install, update (for real) and manage ALL of them (system-wide or locally) thanks to its ever-growing AUR-inspired database listing 2000+ portable apps and programs for GNU/Linux.
-      The first, real centralized repository to manage your AppImages with the ease of APT and the power of PacMan.
-    '';
-    homepage = "https://portable-linux-apps.github.io/";
-    changelog = "https://github.com/ivan-hc/AM/releases/tag/${version}";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-  };
-}

system/audio/default.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+{
+  services.pulseaudio = {
+    support32Bit = true;
+    daemon.config = {
+      flat-volumes = "yes";
+    };
+    package = pkgs.pulseaudioFull;
+  };
+
+  security.rtkit.enable = true;
+  #services.pipewire = {
+  #  enable = true;
+  #  alsa.enable = true;
+  #  alsa.support32Bit = true;
+  #  pulse.enable = true;
+  #  jack.enable = true;
+  #};
+
+  environment.systemPackages = with pkgs; [
+    alsa-utils
+  ];
+}

system/default.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }: {
+  imports = [
+    ./audio
+    ./bluetooth
+    ./inputMethods
+    ./kernel
+    ./locale
+    ./network
+    ./nix
+    ./opengl
+    ./time
+    ./users
+    ./services
+    ./vnc
+    ./wm
+    ./env.nix
+    ./utils.nix
+  ];
+}

system/env.nix

@@ -0,0 +1,6 @@
+{ ... }:
+{
+  environment.variables = {
+    EDITOR = "vim";
+  };
+}

system/hardware/audio.nix

@@ -1,13 +0,0 @@
-{ ... }:
-{
-  #hardware.pulseaudio.enable = true;
-
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-}

system/hardware/opengl.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.extraPackages = with pkgs; [
-    mesa
-  ];
-}

system/hardware/time.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.timesyncd.enable = true;
-}

system/inputMethods/default.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, systemSettings, ... }:
+{
+  i18n = {
+    inputMethod = {
+      enable = true;
+      type = "fcitx5";
+      fcitx5 = {
+        waylandFrontend = true;
+        plasma6Support = true;
+        addons = with pkgs; [
+          fcitx5-mozc
+          fcitx5-skk
+        ];
+      };
+    };
+  };
+}

system/locale/default.nix

@@ -0,0 +1,14 @@
+{ systemSettings, ... }: {
+  i18n.defaultLocale = systemSettings.locale;
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = systemSettings.locale;
+    LC_IDENTIFICATION = systemSettings.locale;
+    LC_MEASUREMENT = systemSettings.locale;
+    LC_MONETARY = systemSettings.locale;
+    LC_NAME = systemSettings.locale;
+    LC_NUMERIC = systemSettings.locale;
+    LC_PAPER = systemSettings.locale;
+    LC_TELEPHONE = systemSettings.locale;
+    LC_TIME = systemSettings.locale;
+  };
+}

system/network/default.nix

@@ -0,0 +1,9 @@
+{ systemSettings, ... }:
+{
+  networking = {
+    hostName = systemSettings.hostname;
+    networkmanager.enable = true;
+    firewall.enable = true;
+  };
+  systemd.services.NetworkManager-wait-online.enable = false;
+}

system/nix/default.nix

@@ -0,0 +1,34 @@
+{ ... }: {
+  nix = {
+    gc.automatic = false;
+
+    settings = {
+      auto-optimise-store = true;
+      builders-use-substitutes = true;
+      allowed-users = ["@wheel"];
+      trusted-users = ["@wheel"];
+      commit-lockfile-summary = "Update flake.lock";
+      accept-flake-config = true;
+      keep-derivations = true;
+      keep-outputs = true;
+      warn-dirty = false;
+      sandbox = true;
+      max-jobs = "auto";
+      log-lines = 30;
+      experimental-features = [ "nix-command" "flakes" ];
+      substituters = [
+        "https://cache.nixos.org"
+      ];
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      ];
+    };
+  };
+
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      allowBroken = true;
+    };
+  };
+}

system/nvidia/default.nix

@@ -6,7 +6,8 @@
     modesetting.enable = true;
     powerManagement.enable = false;
     powerManagement.finegrained = false;
-    open = true;
     nvidiaSettings = true;
+    open = false;
+    package = config.boot.kernelPackages.nvidiaPackages.production;
   };
 }

system/opengl/default.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  hardware.graphics.enable = true;
+  hardware.graphics.enable32Bit = true;
+  hardware.graphics.extraPackages = with pkgs; [
+    mesa
+  ];
+}

system/services/default.nix

@@ -0,0 +1,13 @@
+{ ... }: {
+  imports = [
+    ./cups
+    ./docker
+    ./flatpak
+    ./libvirtd
+    ./podman
+    ./polkit
+    ./ssh
+    ./steam
+    ./tailscale
+  ];
+}

system/services/docker/default.nix

@@ -1,17 +1,19 @@
-{ pkgs, config, ... }:
+{ pkgs, config, lib, ... }:
 {
+  virtualisation.containers.enable = true;
+
   virtualisation.docker = {
     enable = true;
     storageDriver = "overlay2";
     enableOnBoot = true;
+    daemon.settings = {
+      features.cdi = true;
+    };
   };
 
   environment.systemPackages = with pkgs; [
     docker
     docker-compose
     docker-buildx
-    nvidia-container-toolkit
   ];
-
-  hardware.nvidia-container-toolkit.enable = true;
 }

system/services/network-manager.nix

@@ -1,5 +0,0 @@
-{ ... }:
-{
-  networking.networkmanager.enable = true;
-  systemd.network.wait-online.enable = false;
-}

system/services/podman/default.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+{
+  virtualisation.containers.enable = true;
+
+  virtualisation.podman = {
+    enable = true;
+    dockerCompat = false;
+    dockerSocket.enable = false;
+    defaultNetwork.settings.dns_enabled = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    dive
+    virtiofsd
+    podman-tui
+    podman-compose
+  ];
+
+  hardware.nvidia-container-toolkit.enable = true;
+}

system/services/steam/default.nix

@@ -2,4 +2,5 @@
 {
   environment.systemPackages = [ pkgs.steam ];
   programs.steam.enable = true;
+  programs.steam.fontPackages = with pkgs; [ ipafont ];
 }

system/time/default.nix

@@ -0,0 +1,6 @@
+{ systemSettings, ... }:
+{
+  time.timeZone = systemSettings.timezone;
+
+  services.timesyncd.enable = true;
+}

system/users/default.nix

@@ -0,0 +1,40 @@
+{ pkgs, config, userSettings, ... }: {
+  users.users.${userSettings.username} = {
+    isNormalUser = true;
+    description = userSettings.name;
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "docker"
+      "podman"
+      "input"
+      "flatpak"
+      "dialout"
+      "video"
+      "audio"
+      "libvirtd"
+      "nix"
+      "power"
+      "docker"
+    ];
+    uid = 1000;
+    homix = true;
+  };
+
+  users.defaultUserShell = pkgs.bash;
+
+  security.sudo = {
+    enable = true;
+    extraRules = [
+      {
+        commands = 
+          builtins.map (command: {
+            command = "/run/current-system/sw/bin/${command}";
+            options = ["NOPASSWD"];
+          })
+          [ "poweroff" "reboot" "nixos-rebuild" "systemctl" "nmtui" "tailscale" ];
+        groups = [ "wheel" ];
+      }
+    ];
+  };
+}

system/utils.nix

@@ -5,10 +5,12 @@
     vim
     wget
     file
+    eza
     jq
+    killall
     htop
+    btop
     mc
-    git
     parted
     tree
     tmux

system/vnc/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, lib, ... }:
+let
+  use-vnc = pkgs.callPackage ./use-vnc-script.nix { };
+in
+{
+  environment.systemPackages = with pkgs; [
+    x11vnc
+    wayvnc
+    use-vnc
+  ];
+}

system/vnc/use-vnc-script.nix

@@ -0,0 +1,10 @@
+{ pkgs, lib, ... }:
+pkgs.writeShellScriptBin "use-vnc" ''
+  if [[ $XDG_SESSION_TYPE == "x11" ]]; then
+      x11vnc -display :0 &
+  else
+      wayvnc 0.0.0.0 &
+  fi
+
+  sudo echo $! > /var/run/use-vnc.pid
+  ''

system/wm/default.nix

@@ -0,0 +1,11 @@
+{ ... }: {
+  imports = [
+    ./dbus
+    ./fonts
+    ./gnome-keyring
+    ./plasma
+    ./sddm
+    ./sway
+    ./xmonad
+  ];
+}

system/wm/fonts/default.nix

@@ -2,7 +2,10 @@
 {
   fonts.packages = with pkgs; [
     _0xproto
+    nerd-fonts._0xproto
     ipafont
     takao
+    noto-fonts-cjk-serif
+    noto-fonts-cjk-sans
   ];
 }

system/wm/plasma/default.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
-    ./dbus.nix
+    ../dbus
   ];
   services.desktopManager.plasma6.enable = true;
 

system/wm/sddm/default.nix

@@ -1,12 +1,12 @@
 { config, pkgs, lib, ... }:
 {
   imports = [
-    ./fonts.nix
+    ../fonts
-    ./dbus.nix
+    ../dbus
-    ./gnome-keyring.nix
+    ../gnome-keyring
-    ./xmonad.nix
+    ../xmonad
-    ./sway.nix
+    ../sway
-    ./plasma.nix
+    ../plasma
   ];
 
   environment.systemPackages = with pkgs; [

system/wm/sway/default.nix

@@ -1,8 +1,8 @@
 { pkgs, lib, config, ... }:
 {
   imports = [
-    ./gnome-keyring.nix
+    ../gnome-keyring
-    ./dbus.nix
+    ../dbus
   ];
 
   programs.sway = {

system/wm/xmonad/default.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   services.xserver.windowManager.xmonad = {
     enable = true;

user/README.md

@@ -0,0 +1,3 @@
+* `packages`: packages that have zero to few configs and do not require any wrapping
+* `wrapped`: packages that is wrapped with extensive config
+* `homed`: packages that has configuration on common home directory.

user/apps/browsers/firefox.nix

@@ -1,4 +0,0 @@
-{ pkgs, config, ... }:
-{
-  home.packages = [ pkgs.firefox ];
-}

user/apps/games/mangohud.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    mangohud
-  ];
-}

user/apps/media/mpv.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    mpv
-  ];
-}

user/apps/media/vlc.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    vlc
-  ];
-}

user/apps/media/yt-dlp.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    yt-dlp
-  ];
-}

user/apps/utils/alacritty.nix

@@ -1,10 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  home.packages = with pkgs; [
-    alacritty
-  ];
-  programs.alacritty.enable = true;
-  programs.alacritty.settings = {
-    window.opacity = lib.mkForce 0.85;
-  };
-}

user/apps/utils/cava.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    cava
-  ];
-}

user/apps/utils/fzf.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    fzf
-  ];
-}

user/apps/utils/keepassxc.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    keepassxc
-  ];
-}

user/apps/utils/zoxide.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    zoxide
-  ];
-}

user/default.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+  imports = [
+    ./packages
+    ./homed
+    ./wrapped
+  ];
+}

user/dev/editor/neovim.nix

@@ -1,16 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    neovim
-  ];
-
-  programs.neovim = {
-    enable = true;
-    vimAlias = false;
-    viAlias = false;
-    withRuby = false;
-    withPython3 = false;
-    withNodeJs = false;
-    package = pkgs.neovim-unwrapped;
-  };
-}

user/dev/editor/vscodium.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.vscodium ];
-}

user/dev/editor/zed-editor.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.zed-editor ];
-}

user/dev/ide/qtcreator.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.qtcreator ];
-}

user/dev/lang/cc.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    gcc
-    gdb
-    cmake
-    autoconf
-    automake
-    libtool
-    clang-analyzer
-    clang-tools
-  ];
-}

user/dev/lang/python.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    python3Full
-  ];
-}

user/dev/lang/rust.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    rustup
-  ];
-}

user/dev/tools/git.nix

@@ -1,7 +0,0 @@
-{ config, pkgs, userSettings, ... }:
-{
-  home.packages = [ pkgs.git ];
-  programs.git.enable = true;
-  programs.git.userName = userSettings.name;
-  programs.git.userEmail = userSettings.email-dev;
-}

user/dev/tools/gitui.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    gitui
-  ];
-}

user/homed/default.nix

@@ -0,0 +1,10 @@
+{ ... }:
+{
+  imports = [
+    ./git
+    ./polybar
+    ./profile
+    ./xmonad
+    ./zed-editor
+  ];
+}

user/homed/git/default.nix

@@ -0,0 +1,19 @@
+{ config, pkgs, userSettings, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    git
+    gh
+  ];
+
+  homix.".gitconfig".text = ''
+    [user]
+            email = ${userSettings.email-dev}
+            name = ${userSettings.name}
+    [credential "https://github.com"]
+            helper = 
+            helper = ${pkgs.gh}/bin/gh auth git-credential
+    [credential "https://gist.github.com"]
+            helper = 
+            helper = ${pkgs.gh}/bin/gh auth git-credential
+  '';
+}

user/homed/polybar/default.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+let
+  bar-launcher = conf: bar:
+    pkgs.writeShellScriptBin "launch-polybar-${conf}" ''
+      killall -q polybar
+      polybar -c ~/.config/polybar/${conf}.ini ${bar} 2>&1 | tee /tmp/polybar.log & disown
+    '';
+in
+{
+  environment.systemPackages = [
+    pkgs.polybar
+    (bar-launcher "xmonadAppTray" "apptray")
+  ];
+  homix.".config/polybar/xmonadAppTray.ini".source = ./xmonadAppTray.ini;
+}

user/homed/polybar/xmonadAppTray.ini

@@ -0,0 +1,15 @@
+[bar/apptray]
+monitor-strict = false
+bottom = false
+width = 7%
+height = 24px
+offset-x = 93%
+modules-right = tray
+foreground = #ffffff00
+background = #000000A0
+border-color = #000000
+
+[module/tray]
+type = internal/tray
+tray-spacing = 2px
+format-margin = 4px

user/homed/profile/default.nix

@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  homix.".profile".source = ./profile;
+}

user/homed/profile/profile

@@ -0,0 +1,3 @@
+export XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share
+
+export PATH="$PATH:${XDG_BIN_HOME:-$HOME/.local/bin}"

user/homed/xmonad/README.md

@@ -0,0 +1,4 @@
+xmobar weather station
+
+- *RJNG*: Gifu Air Base
+- *RJGG*: Nagoya Airport

user/homed/xmonad/default.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 {
-  home.packages = with pkgs; [
+  environment.systemPackages = with pkgs; [
     xmobar
     dunst
     networkmanagerapplet
@@ -13,5 +13,6 @@
     xdg-desktop-portal-gtk
   ];
 
-  home.file.".config/xmonad/xmonad.hs".source = ./xmonad.hs;
+  #homix.".config/xmonad/xmonad.hs".source = ./xmonad.hs;
+  #homix.".config/xmobar/xmobarrc".source = ./xmobarrc;
 }

user/homed/xmonad/xmobarrc

@@ -0,0 +1,46 @@
+Config { font = "DejaVu Sans Mono 9"
+       , additionalFonts = ["DejaVu Sans Mono italic 9"]
+       , borderColor = "black"
+       , border = FullB
+       , bgColor = "black"
+       , fgColor = "whitesmoke"
+       , alpha = 160
+       , position = TopSize L 93 24
+       , textOffset = -1
+       , iconOffset = -1
+       , lowerOnStart = True
+       , pickBroadest = False
+       , persistent = False
+       , hideOnStart = False
+       , iconRoot = "."
+       , allDesktops = True
+       , overrideRedirect = False
+       , textOutputFormat = Ansi
+       , commands = [ Run Weather "RJNG" ["-t","@<station> <tempC>C, <rh>%, <pressure>hPa",
+                                          "-L","18","-H","25",
+                                          "--normal","green",
+                                          "--high","red",
+                                          "--low","lightblue"] 36000
+                    , Run Weather "RJGG" ["-t","@<station> <tempC>C, <rh>%, <pressure>hPa",
+                                          "-L", "18", "-H", "25",
+                                          "--normal", "green",
+                                          "--high", "red",
+                                          "--low", "lightblue"] 36000
+                    , Run Network "wlo1" ["-L","0","-H","32",
+                                          "--normal","green","--high","red"] 10
+                    , Run Network "enp4s0" ["-L","0","-H","32",
+                                          "--normal","green","--high","red"] 10
+                    , Run Cpu ["-L","3","-H","50",
+                               "--normal","green","--high","red"] 10
+                    , Run Memory ["-t","Mem: <usedratio>%"] 10
+                    , Run Swap [] 10
+                    , Run Com "uname" ["-s","-r"] "" 36000
+                    , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10
+                    , Run StdinReader
+                    ]
+       , sepChar = "%"
+       , alignSep = "}{"
+       , template = "%StdinReader% | %cpu% | <box>%memory% * %swap%</box> | %wlo1% - %enp4s0% }\
+                    \{ %RJNG% <fc=#ee9a00><fn=1>%date%</fn></fc>"
+       }
+

user/homed/xmonad/xmonad.hs

@@ -0,0 +1,221 @@
+import XMonad
+import Data.Monoid
+import System.Exit
+
+-- XMonad Contrib
+import XMonad.Actions.Submap
+import XMonad.Actions.Minimize
+import XMonad.Actions.CopyWindow
+import XMonad.Actions.CycleWS
+import XMonad.Hooks.DynamicLog
+import XMonad.Hooks.ManageDocks
+import XMonad.Hooks.ManageHelpers
+import XMonad.Layout.Gaps
+import XMonad.Layout.Minimize
+import XMonad.Layout.NoBorders
+import XMonad.Layout.Tabbed
+import XMonad.Util.Run
+import XMonad.Util.Run(spawnPipe)
+import XMonad.Util.SpawnOnce
+
+import qualified XMonad.StackSet as W
+import qualified Data.Map as M
+
+-- Main Terminal Program
+term :: String
+term = "alacritty"
+
+-- Launcher Program
+menu :: String
+menu = "rofi -show drun"
+
+-- Focus Follows Mouse
+ffm :: Bool
+ffm = True
+
+-- Click Focus
+cf :: Bool
+cf = False
+
+-- Border Width
+bw :: Dimension
+bw = 1
+
+-- Modifier Key (1: left alt, 2: right alt, 4: win key)
+modKey :: KeyMask
+modKey = mod4Mask
+
+-- workspace
+ws :: [String]
+ws = ["term", "web", "school", "docs", "code", "debug", "media", "games", "other"]
+
+-- Border Color Normal
+bcn :: String
+bcn = "#dddddd"
+
+-- Border Color Focused
+bcf :: String
+bcf = "#ff0000"
+
+-- Key Bindings
+keyBinds conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
+    [
+        -- Program Launch KB
+        ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf),
+        ((modm, xK_r), spawn menu),
+
+        -- Program Close KB
+        ((modm .|. shiftMask, xK_c), kill),
+        ((modm .|. shiftMask .|. controlMask, xK_c), spawn "xkill"),
+
+        -- WM Related KB
+        ((modm, xK_Escape), visualSubmap def $ M.fromList $
+            [
+                ((shiftMask, xK_q), subName "Exit" $ io exitSuccess),
+                ((0, xK_r), subName "Restart" $ spawn "xmonad --recompile; xmonad --restart")
+            ]
+        ),
+
+        -- Layout Related KB
+        ((modm, xK_space), sendMessage NextLayout),
+        ((modm .|. shiftMask, xK_space), setLayout $ XMonad.layoutHook conf),
+        ((modm, xK_comma), sendMessage (IncMasterN 1)),
+        ((modm, xK_period), sendMessage (IncMasterN (-1))),
+        ((modm, xK_f), sendMessage $ JumpToLayout "Full"),
+
+        -- Gaps Related KB
+        (
+            (modm, xK_g), visualSubmap def $ M.fromList $
+            [
+                ((0, xK_g), subName "Toggle Gaps" $ sendMessage $ ToggleGaps),
+                ((controlMask, xK_h), subName "Toggle Left Gap" $ sendMessage $ ToggleGap L),
+                ((controlMask, xK_l), subName "Toggle Right Gap" $ sendMessage $ ToggleGap R),
+                ((controlMask, xK_k), subName "Toggle Up Gap" $ sendMessage $ ToggleGap U),
+                ((controlMask, xK_j), subName "Toggle Down Gap" $ sendMessage $ ToggleGap D),
+                ((0, xK_h), subName "Inc Left Gap" $ sendMessage $ IncGap 5 L),
+                ((0, xK_l), subName "Inc Right Gap" $ sendMessage $ IncGap 5 R),
+                ((0, xK_k), subName "Inc Up Gap" $ sendMessage $ IncGap 5 U),
+                ((0, xK_j), subName "Inc Down Gap" $ sendMessage $ IncGap 5 D),
+                ((shiftMask, xK_h), subName "Dec Left Gap" $ sendMessage $ DecGap 5 L),
+                ((shiftMask, xK_l), subName "Dec Right Gap" $ sendMessage $ DecGap 5 R),
+                ((shiftMask, xK_k), subName "Dec Up Gap" $ sendMessage $ DecGap 5 U),
+                ((shiftMask, xK_j), subName "Dec Down Gap" $ sendMessage $ DecGap 5 D)
+            ]
+        ),
+
+        -- Windows Related KB
+        ((modm, xK_a), refresh),
+        ((modm, xK_Tab), windows W.focusDown),
+        ((modm, xK_j), windows W.focusDown),
+        ((modm, xK_k), windows W.focusUp),
+        ((modm, xK_m), windows W.focusMaster),
+        ((modm, xK_Return), windows W.swapMaster),
+        ((modm .|. shiftMask, xK_j), windows W.swapDown),
+        ((modm .|. shiftMask, xK_k), windows W.swapUp),
+        ((modm, xK_h), sendMessage Expand),
+        ((modm, xK_l), sendMessage Shrink),
+        ((modm, xK_t), withFocused $ windows . W.sink),
+        ((modm, xK_m), withFocused minimizeWindow),
+        ((modm .|. shiftMask, xK_m), withLastMinimized maximizeWindowAndFocus),
+        ((modm .|. controlMask, xK_c), windows copyToAll),
+        ((modm .|. controlMask .|. shiftMask, xK_c), killAllOtherCopies),
+        ((modm .|. shiftMask, xK_c), kill1)
+    ]
+
+    ++
+
+    -- Workspace Related KB
+    [
+        ((modm, xK_Page_Up), nextWS),
+        ((modm, xK_Page_Down), prevWS),
+        ((modm, xK_n), nextWS),
+        ((modm, xK_p), prevWS)
+    ]
+
+    ++
+    
+    [
+        ((m .|. modm, k), windows $ f i)
+            | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
+            , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask), (copy, controlMask)]
+    ]
+
+mouseBinds (XConfig {XMonad.modMask = modm}) = M.fromList
+    [
+        ((modm, button1), \w -> focus w >> mouseMoveWindow w >> windows W.shiftMaster),
+        ((modm, button2), \w -> focus w >> windows W.shiftMaster),
+        ((modm, button3), \w -> focus w >> mouseResizeWindow w >> windows W.shiftMaster)
+    ]
+
+layouts = avoidStruts(tiled ||| Mirror tiled ||| gaped_tiled ||| tabbed shrinkText tabConfig) ||| noBorders Full ||| gaped_full
+    where
+        tiled = minimize(Tall nmaster delta ratio)
+        gaped_tiled = gaps surrounded_gap $ minimize(Tall nmaster delta ratio)
+        gaped_full = gaps surrounded_gap $ noBorders Full
+        surrounded_gap = [(U,10),(D,10),(L,10),(R,10)]
+        nmaster = 1
+        ratio = 1/2
+        delta = 3/100
+        tabConfig = def {
+            fontName = "xft:DejaVu Sans Mono",
+            activeColor = "#aaaaaa",
+            inactiveColor = "#8a8a8a"
+        }
+
+-- Manage Hook
+mh = composeAll
+    [
+        title =? "Picture-in-Picture" --> doSideFloat SE,
+        isFullscreen --> doFullFloat,
+        isDialog --> doCenterFloat
+    ]
+-- Event Hook
+eh = mempty
+-- Log Hook
+lh h = dynamicLogWithPP $ statbarPipe { ppOutput = hPutStrLn h }
+
+-- Startup Hook
+sh = do
+    spawn "launch-polybar-xmonadAppTray"
+    spawnOnce "feh --bg-scale ~/画像/wallpaper/85444653_p0.jpg"
+
+-- Status bar used in WM
+statbar :: String
+statbar = "xmobar"
+
+statbarPipe = xmobarPP {
+    ppOrder = \(ws:l:t:_) -> [ws,t],
+    ppCurrent = xmobarColor "red" "black" . \s -> wrap "[" "]" (s ++ " ●"),
+    ppUrgent = xmobarColor "gray" "black" . \s -> wrap "{" "}" (s ++ " ●"),
+    ppVisible = xmobarColor "red" "black" . \s -> pad (s ++ " ◎"),
+    ppHidden = xmobarColor "gray" "black" . \s -> pad (s ++ " ●"),
+    ppHiddenNoWindows = xmobarColor "gray" "black" . \s -> pad (s ++ " ○"),
+    ppTitle = xmobarColor "red" "black" . shorten 32,
+    ppLayout = id,
+    ppOutput = putStrLn,
+    ppWsSep = " ",
+    ppSep = " | "
+}
+
+main :: IO()
+main = do
+    wsbar <- spawnPipe statbar
+    xmonad . docks $ myConfig wsbar
+
+myConfig bar = def {
+    terminal = term,
+    focusFollowsMouse = ffm,
+    clickJustFocuses = cf,
+    borderWidth = bw,
+    modMask = modKey,
+    workspaces = ws,
+    normalBorderColor = bcn,
+    focusedBorderColor = bcf,
+    keys = keyBinds,
+    mouseBindings = mouseBinds,
+    layoutHook = layouts,
+    manageHook = mh <+> manageDocks,
+    handleEventHook = eh,
+    logHook = lh bar,
+    startupHook = sh
+}

user/homed/zed-editor/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [ pkgs.zed-editor ];
+
+  homix.".config/zed/settings.json".source = ./settings.json;
+}

user/homed/zed-editor/settings.json

@@ -0,0 +1,47 @@
+// Zed settings
+//
+// For information on how to configure Zed, see the Zed
+// documentation: https://zed.dev/docs/configuring-zed
+//
+// To see all of Zed's default settings without changing your
+// custom settings, run the `open default settings` command
+// from the command palette or from `Zed` application menu.
+{
+  "assistant": {
+    "default_model": {
+      "provider": "ollama",
+      "model": "mistral:7b"
+    },
+    "version": "2"
+  },
+  "base_keymap": "VSCode",
+  "theme": "Gruvbox Material",
+  "telemetry": {
+    "metrics": false
+  },
+  "vim_mode": true,
+  "buffer_font_family": "0xProto",
+  "buffer_font_size": 16,
+  "ui_font_size": 16,
+  "tab_size": 4,
+  "tabs": {
+    "close_position": "right",
+    "file_icons": true,
+    "git_status": true
+  },
+  "format_on_save": "off",
+  "language_models": {
+    "ollama": {
+      "api_url": "http://127.0.0.1:11434"
+    }
+  },
+  "terminal": {
+      "shell": {
+          "with_arguments": {
+            "program": "/run/current-system/sw/bin/bash",
+            "args": []
+          }
+      },
+      "blinking": "on"
+  }
+}

user/packages/cava/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    cava
+  ];
+}

user/packages/chromium/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    chromium
+  ];
+}

user/packages/dbeaver/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    dbeaver-bin
+  ];
+}

user/packages/default.nix

@@ -0,0 +1,31 @@
+{ ... }: {
+  imports = [
+    ./cava
+    ./chromium
+    ./dbeaver
+    ./firefox
+    ./firefox-dev-edition
+    ./freecad
+    ./fzf
+    ./gimp
+    ./gitui
+    ./inkscape
+    ./kdenlive
+    ./keepassxc
+    ./kicad
+    ./krita
+    ./libreoffice-fresh
+    ./mangohud
+    ./mpv
+    ./obs-studio
+    ./owncloud-client
+    ./pandoc
+    ./python3
+    ./qtcreator
+    ./thunderbird
+    ./tldr
+    ./vlc
+    ./yt-dlp
+    ./zoxide
+  ];
+}

user/packages/firefox-dev-edition/default.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    firefox-devedition-bin
+  ];
+
+  environment.variables = {
+    MOZ_ENABLE_WAYLAND = 1;
+  };
+}

user/packages/firefox/default.nix

@@ -0,0 +1,10 @@
+{  pkgs, config, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    firefox
+  ];
+
+  environment.variables = {
+    MOZ_ENABLE_WAYLAND = 1;
+  };
+}

user/packages/freecad/default.nix

@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  environment.systemPackages = [ pkgs.freecad ];
+}

user/packages/fzf/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    fzf
+  ];
+
+  environment.variables = {
+    FZF_ALT_C_OPTS = ''
+    --walker-skip .git,node_modules,target
+    --preview 'tree -C {}'
+    '';
+    FZF_COMPLETION_OPTS = "--border --info=inline";
+    FZF_COMPLETION_PATH_OPTS = "--walker file,dir,follow,hidden";
+    FZF_COMPLETION_DIR_OPTS = "--walker dir,follow";
+  };
+}

user/packages/gimp/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    gimp
+  ];
+}

user/packages/gitui/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    gitui
+  ];
+}

user/packages/inkscape/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    inkscape
+  ];
+}

user/packages/kdenlive/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    kdePackages.kdenlive
+  ];
+}

user/packages/keepassxc/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    keepassxc
+  ];
+}

user/packages/kicad/default.nix

@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  environment.systemPackages = [ pkgs.kicad ];
+}

user/packages/krita/default.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = [ pkgs.krita ];
+}

user/packages/libreoffice-fresh/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    libreoffice-fresh
+  ];
+}