Update ~8/26/24

machines/workstation/configuration.nix

@@ -18,12 +18,16 @@
       ../../system/hardware/opengl.nix
       ../../system/hardware/bluetooth.nix
       ../../system/wm/sddm.nix
+      ../../system/hardware/inputMethods.nix
+      ../../system/env.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  systemd.enableUnifiedCgroupHierarchy = false;
+
   programs.appimage = {
     enable = true;
     binfmt = true;

machines/workstation/home.nix

@@ -2,13 +2,16 @@
 {
   imports = [
     ../../user/apps/browsers/firefox.nix
+    ../../user/apps/thunderbird.nix
     ../../user/dev/tools/git.nix
     ../../user/dev/tools/gitui.nix
+    ../../user/dev/tools/firefox-devedition.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/lang/ecmascript.nix
     ../../user/dev/ide/qtcreator.nix
     ../../user/apps/utils/alacritty.nix
     ../../user/apps/utils/keepassxc.nix
@@ -19,7 +22,11 @@
     ../../user/apps/media/vlc.nix
     ../../user/apps/media/mpv.nix
     ../../user/apps/media/yt-dlp.nix
+    ../../user/apps/graphics/gimp.nix
+    ../../user/apps/graphics/inkscape.nix
     ../../user/apps/games/mangohud.nix
+    ../../user/apps/office/texlive.nix
+    ../../user/shell/bash.nix
     ../../user/wm/xmonad/xmonad.nix
   ];
 

newpkg.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "newpkg.sh: create minimal nix file in current directory"
+echo "newpkg.sh: create minimal nix file in current directory, Current Directory: $PWD"
 
 if [ -z "$NIXOSSYSCONFIG" ]; then
 	echo "Error: Env Variable Missing, NIXOSSYSCONFIG"

system/env.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+{
+  environment.variables = {
+    EDITOR = "vim";
+    MOZ_ENABLE_WAYLAND = 1;
+  };
+}

system/hardware/inputMethods.nix

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

system/hardware/nvidia.nix

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

system/services/docker.nix

@@ -1,9 +1,14 @@
-{ 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; [
@@ -13,5 +18,5 @@
     nvidia-container-toolkit
   ];
 
-  hardware.nvidia-container-toolkit.enable = true;
+  hardware.nvidia-container-toolkit.enable = lib.lists.elem "nvidia" config.services.xserver.videoDrivers;
 }

system/utils.nix

@@ -5,6 +5,7 @@
     vim
     wget
     file
+    eza
     jq
     htop
     mc

user/.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/apps/browsers/firefox.nix

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

user/apps/graphics/gimp.nix

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

user/apps/graphics/inkscape.nix

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

user/apps/office/texlive.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+let
+  mytex = pkgs.texliveMedium.withPackages
+    (ps: [
+      ps.biber
+      ps.biblatex
+      ps.bibtex
+      ps.import
+      ps.subfiles
+      ps.wrapfig
+      ps.collection-langjapanese
+    ]);
+in
+{
+  home.packages = with pkgs; [
+    mytex
+    pandoc
+    qpdf
+  ];
+}

user/apps/thunderbird.nix

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

user/dev/lang/cc.nix

@@ -6,6 +6,7 @@
     cmake
     autoconf
     automake
+    gnumake
     libtool
     clang-analyzer
     clang-tools

user/dev/lang/ecmascript.nix

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

user/dev/tools/firefox-devedition.nix

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

user/profile.nix

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

user/shell/bash.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+let
+  lsCmd = "eza -la --git -s type";
+in
+{
+  home.packages = with pkgs; [
+    bash
+  ];
+
+  programs.bash = {
+    enable = true;
+    shellAliases = {
+      search-pkg = "nix search -I nixpkgs=flake:nixpkgs  nixpkgs";
+      newpkg = "bash ~/.dotfiles/newpkg.sh";
+      rebuild = "sudo nixos-rebuild switch --flake '.#system'";
+      l = lsCmd;
+      ls = lsCmd;
+    };
+  };
+}