Update: 08/18/2024 06:51:28 PM

flake.lock

@@ -7,16 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1723399884,
+        "lastModified": 1720042825,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -39,16 +39,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723362943,
+        "lastModified": 1723688146,
-        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
+        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
+        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.05",
         "type": "indirect"
       }
     },

flake.nix

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

machines/workstation/configuration.nix

@@ -24,6 +24,11 @@
   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 = [ ... ];

machines/workstation/hardware-configuration.nix

@@ -24,6 +24,11 @@
       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"; }
     ];

machines/workstation/home.nix

@@ -1,23 +1,33 @@
 { pkgs, userSettings, ... }:
 {
-  home.username = userSettings.username;
-  home.homeDirectory = "/home/" + userSettings.username;
-
-  programs.home-manager.enable = true;
-
   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/utils/alacritty.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

@@ -0,0 +1,63 @@
+#!/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

pkgs/AppMan/AppMan.nix

@@ -0,0 +1,60 @@
+{
+  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/hardware/kernel.nix

@@ -1,5 +1,5 @@
 { config, pkgs, ... }:
 {
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_stable;
+  boot.kernelPackages = pkgs.linuxPackages;
   boot.consoleLogLevel = 3;
 }

system/hardware/opengl.nix

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

system/services/network-manager.nix

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

user/apps/games/mangohud.nix

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

user/apps/media/mpv.nix

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

user/apps/media/vlc.nix

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

user/apps/media/yt-dlp.nix

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

user/apps/utils/cava.nix

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

user/apps/utils/fzf.nix

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

user/apps/utils/keepassxc.nix

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

user/apps/utils/owncloud-client.nix

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

user/apps/utils/zoxide.nix

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

user/dev/editor/neovim.nix

@@ -0,0 +1,16 @@
+{ 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/tools/gitui.nix

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