changes

src/system/machines/desktop/modules/disko/default.nix

@@ -1,16 +1,12 @@
-let
-  dev = "/dev/disk/by-id/ata-CT2000MX500SSD1_2137E5D2D47D";
-
-in
+{ disk }:
 {
   disko.devices = {
     disk = {
       one = {
         type = "disk";
-        device = dev;
+        device = disk;
         content = {
-          type = "table";
-          format = "gpt";
+          type = "gpt";
           partitions = {
             boot = {
               size = "1G";
@@ -38,28 +34,18 @@ in
       nix = {
         type = "lvm_vg";
         lvs = {
-          aaa = {
-            size = "1M";
-          };
-          zzz = {
-            size = "1M";
-          };
           root = {
-            size = "252G";
+            size = "5%";
             content = {
-              name = "root";
               type = "filesystem";
               format = "ext4";
               mountpoint = "/";
-              mountOptions = [
-                "defaults"
-              ];
+              mountOptions = [ "defaults" ];
             };
           };
           home = {
             size = "100%FREE";
             content = {
-              name = "home";
               type = "filesystem";
               format = "ext4";
               mountpoint = "/home";

src/system/machines/vm/modules/disko/default.nix

@@ -1,11 +1,10 @@
-{ disks ? [ "/dev/vda" ], ... }:
-
+{ disk ? "/dev/vda" }:
 {
   disko.devices = {
     disk = {
       one = {
-        device = builtins.elemAt disks 0;
         type = "disk";
+        device = disk;
         content = {
           type = "gpt";
           partitions = {
@@ -17,8 +16,6 @@
                 format = "vfat";
                 mountpoint = "/boot";
               };
-              bootable = true;
-              priority = 1;
             };
             primary = {
               size = "100%";
@@ -36,12 +33,6 @@
       vm = {
         type = "lvm_vg";
         lvs = {
-          aaa = {
-            size = "1M";
-          };
-          zzz = {
-            size = "1M";
-          };
           root = {
             size = "100%";
             content = {

src/system/machines/workstation/modules/disko/default.nix

@@ -1,16 +1,12 @@
-let
-  dev = "/dev/disk/by-id/ata-CT2000MX500SSD1_2137E5D2D47D";
-
-in
+{ disk }:
 {
   disko.devices = {
     disk = {
       one = {
         type = "disk";
-        device = dev;
+        device = disk;
         content = {
-          type = "table";
-          format = "gpt";
+          type = "gpt";
           partitions = {
             boot = {
               size = "1G";
@@ -38,28 +34,18 @@ in
       nix = {
         type = "lvm_vg";
         lvs = {
-          aaa = {
-            size = "1M";
-          };
-          zzz = {
-            size = "1M";
-          };
           root = {
-            size = "252G";
+            size = "5%";
             content = {
-              name = "root";
               type = "filesystem";
               format = "ext4";
               mountpoint = "/";
-              mountOptions = [
-                "defaults"
-              ];
+              mountOptions = [ "defaults" ];
             };
           };
           home = {
             size = "100%FREE";
             content = {
-              name = "home";
               type = "filesystem";
               format = "ext4";
               mountpoint = "/home";

src/user/default.nix

@@ -4,10 +4,15 @@ let
       entries = builtins.readDir dir;
       names = builtins.attrNames entries;
       
-      isModuleDir = path: 
+      excludedDirs = [ "config" "scripts" ];
+      isSubmodule = path:
+        builtins.pathExists "${path}/.git" &&
+        builtins.readFileType "${path}/.git" == "regular";
+      isModuleDir = path:
         builtins.pathExists path &&
         builtins.readFileType path == "directory" &&
-        builtins.baseNameOf path != "config";
+        !(builtins.elem (builtins.baseNameOf path) excludedDirs) &&
+        !(isSubmodule path);
       isModule = file: file == "default.nix";
       isNix = file: builtins.match ".*\\.nix" file != null && file != "default.nix";
 

src/user/modules/bash/config/alias.nix

@@ -1,17 +0,0 @@
-{ lib, config, ... }:
-
-with lib;
-let
-  gui = config.modules.user.gui.wm;
-  wm = {
-    enable = builtins.any (mod: mod.enable or false) (builtins.attrValues gui);
-  };
-
-in
-{
-  cd = "cd -L";
-  grep = "grep --color";
-  tree = "eza --tree --icons=never";
-  lt = mkForce "eza --tree --icons=never";
-  open = mkIf wm.enable "xdg-open";
-}

src/user/modules/bash/config/bash

@@ -0,0 +1 @@
+Subproject commit 25d055514de104f471c4c36dae83dc835ee006de

src/user/modules/bash/config/bashrc.nix

@@ -1,8 +0,0 @@
-''
-set -o vi
-
-bind 'set completion-ignore-case on'
-bind 'set completion-map-case on'
-
-export TERM=linux
-''

src/user/modules/bash/config/prompt.nix

@@ -1,154 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-let
-  git = config.modules.user.git;
-  gui = config.modules.user.gui.alacritty;
-
-in
-''
-check_ssh() {
-  if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
-    ssh_PS1="\n\[\033[01;37m\]\u@\h:\[\033[00m\]\n"
-    return 0
-  fi
-}
-
-${optionalString git.enable ''
-check_venv() {
-  add_icon() {
-    local icon=$1
-    if [[ ! $venv_icons =~ $icon ]]; then
-      venv_icons+="$icon "
-    fi
-  }
-
-  remove_icon() {
-    local icon=$1
-    venv_icons=''${venv_icons//$icon/}
-  }
-
-  py="py"
-  js="js"
-  nix="nix"
-
-  ${optionalString gui.enable ''
-  if [ -n "$DISPLAY" ]; then
-    py=""
-    js="󰌞"
-    nix=""
-  fi
-  ''}
-
-  python_icon="\[\033[01;33m\]$py\[\033[00m\]"
-  node_icon="\[\033[01;93m\]$js\[\033[00m\]"
-  nix_icon="\[\033[01;34m\]$nix\[\033[00m\]"
-
-  if [ -n "$IN_NIX_SHELL" ]; then
-    add_icon "$nix_icon"
-  else
-    remove_icon "$nix_icon"
-  fi
-
-  if [ -n "$VIRTUAL_ENV" ]; then
-    add_icon "$python_icon"
-  else
-    remove_icon "$python_icon"
-  fi
-
-  if [ -d "''${git_root}/node_modules" ]; then
-    add_icon "$node_icon"
-  else
-    remove_icon "$node_icon"
-  fi
-}
-
-set_git_dir() {
-  ${if gui.enable then ''
-  if [ -n "$DISPLAY" ]; then
-    project_icon=" "
-  else
-    project_icon="../"
-  fi
-  '' else ''
-  project_icon="../"
-  ''}
-  local superproject_root=$(git rev-parse --show-superproject-working-tree 2>/dev/null)
-  if [[ -n "$superproject_root" ]]; then
-    local submodule_name=$(basename "$git_root")
-
-    working_dir="\[\033[01;34m\]$project_icon''${superproject_root##*/}/$submodule_name$git_curr_dir\[\033[00m\]"
-  elif [ "$git_curr_dir" == "." ]; then
-    working_dir="\[\033[01;34m\]$project_icon$git_root_dir\[\033[00m\]"
-    return 0
-  else
-    working_dir="\[\033[01;34m\]$project_icon$git_root_dir$git_curr_dir\[\033[00m\]"
-    return 0
-  fi
-}
-
-relative_path() {
-  local absolute_target=$(readlink -f "$1")
-  local absolute_base=$(readlink -f "$2")
-  echo "''${absolute_target#$absolute_base}"
-}
-
-check_project() {
-  local git_root=$(git rev-parse --show-toplevel 2>/dev/null)
-
-  if [ -n "$git_root" ]; then
-    local git_branch=$(git branch --show-current 2>/dev/null)
-
-    if [ -z "$git_branch" ]; then
-      git_branch=$(git describe --tags --exact-match 2>/dev/null)
-      git_branch=''${git_branch:-$(git rev-parse --short HEAD 2>/dev/null)}
-    fi
-
-    local git_curr_dir=$(relative_path "." "$git_root")
-    local git_root_dir=$(basename "$git_root")
-
-    ${if gui.enable then ''
-    if [ -n "$DISPLAY" ]; then
-      git_branch_PS1="\[\033[01;31m\]$git_branch 󰘬:\[\033[00m\]"
-    else
-      git_branch_PS1="\[\033[01;31m\]$git_branch:\[\033[00m\]"
-    fi
-    '' else ''
-    git_branch_PS1="\[\033[01;31m\]$git_branch:\[\033[00m\]"
-    ''}
-
-    set_git_dir
-    check_venv
-
-    return 0
-  fi
-}
-''}
-
-function set_prompt() {
-  local green_arrow="\[\033[01;32m\]>> "
-  local white_text="\[\033[00m\]"
-  local working_dir="\[\033[01;34m\]\w\[\033[00m\]"
-
-  local ssh_PS1
-
-  check_ssh
-
-  ${optionalString git.enable ''
-  local venv_icons
-  local git_branch_PS1
-
-  check_project
-  ''}
-
-  ${if git.enable
-    then
-      ''PS1="$ssh_PS1\n$working_dir\n$venv_icons$green_arrow$git_branch_PS1$white_text"''
-    else
-      ''PS1="$ssh_PS1\n$working_dir\n$green_arrow$white_text"''
-  }
-  return 0
-}
-
-PROMPT_COMMAND="set_prompt"
-''

src/user/modules/bash/default.nix

@@ -9,13 +9,15 @@ in
   config = mkIf cfg.enable {
     programs.bash = {
       enable = true;
-      enableCompletion = true;
-
-      initExtra = import ./config/prompt.nix { inherit lib config; };
-      bashrcExtra = import ./config/bashrc.nix;
-      shellAliases = import ./config/alias.nix { inherit lib config; };
+      initExtra = "source ~/.config/bash/bashrc";
       profileExtra = import ./config/shellHook.nix { inherit lib config; };
     };
+    
+    # .bashrc
+    home.file.".config/bash" = {
+      source = ./config/bash;
+      recursive = true;
+    };
 
     programs = {
       ripgrep.enable = true;

src/user/modules/git/default.nix

@@ -22,7 +22,7 @@ in
         git-crypt
       ];
       file.".config/git" = {
-        source = ./config;
+        source = ./git;
         recursive = true;
       };
     };

src/user/modules/utils/modules/vim/default.nix

@@ -16,7 +16,7 @@ in
         vim
        ];
       file.".vim" = {
-        source = ./config;
+        source = ./vim;
         recursive = true;
       };
     };