Update 9/18/2024 00:25

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/e1391fb22e18a36f57e6999c7a9f966dc80ac073' (2024-07-03)
  → 'github:nix-community/home-manager/c2cd2a52e02f1dfa1c88f95abeb89298d46023be' (2024-08-23)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/36bae45077667aff5720e5b3f1a5458f51cf0776' (2024-08-27)
  → 'github:NixOS/nixpkgs/71e91c409d1e654808b2621f28a327acfdad8dc2' (2024-08-28)

flake.lock

@@ -7,27 +7,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "lastModified": 1726440980,
+        "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1723310128,
-        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
+        "lastModified": 1726489388,
+        "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
+        "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9",
         "type": "github"
       },
       "original": {
@@ -39,16 +39,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723688146,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "lastModified": 1726463316,
+        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },

flake.nix

@@ -2,8 +2,8 @@
   description = "kenryuS nixos configurations/dotfiles";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };

machines/base.nix

@@ -31,7 +31,7 @@
   users.users.${userSettings.username} = {
     isNormalUser = true;
     description = userSettings.name;
-    extraGroups = [ "networkmanager" "wheel" "docker" "input" "flatpak" "dialout" "video" "input" "audio" "libvirtd" ];
+    extraGroups = [ "networkmanager" "wheel" "docker" "podman" "input" "flatpak" "dialout" "video" "input" "audio" "libvirtd" ];
     packages = with pkgs; [];
     uid = 1000;
   };

machines/workstation/configuration.nix

@@ -12,12 +12,14 @@
       ../../system/services/steam.nix
       ../../system/services/tailscale.nix
       ../../system/services/libvirtd.nix
-      ../../system/services/docker.nix
+      ../../system/services/podman.nix
       ../../system/hardware/kernel.nix
       ../../system/hardware/nvidia.nix
       ../../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.

machines/workstation/home.nix

@@ -2,13 +2,18 @@
 {
   imports = [
     ../../user/apps/browsers/firefox.nix
+    ../../user/apps/browsers/chromium.nix
+    ../../user/apps/thunderbird.nix
     ../../user/dev/tools/git.nix
     ../../user/dev/tools/gitui.nix
+    ../../user/dev/tools/firefox-devedition.nix
+    ../../user/dev/tools/dbeaver-bin.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 +24,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/services/podman.nix

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

system/utils.nix

@@ -5,8 +5,11 @@
     vim
     wget
     file
+    eza
     jq
     htop
+    btop
+    fastfetch
     mc
     git
     parted

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/chromium.nix

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

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/dbeaver-bin.nix

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

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;
+    };
+  };
+}