reestructuración

flake.nix

@@ -16,7 +16,6 @@
   let
     system = "x86_64-linux";
     
-    packages = import ./pkgs;
     pkgs = import nixpkgs {
       inherit system;
     };
@@ -65,10 +64,7 @@
     nixosConfigurations = configs "base" base;
     homeConfigurations = configs "home" home;
 
-    packages."${system}" = packages pkgs;
-
     overlay = self: super: {
-      local = packages super;
       unstable = import unstable { 
         inherit(super) config system;
       };

home/apps/default.nix

@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ...} :
+with lib;
+let
+  cfg = config.local.apps;
+in
+{
+  options.local.apps.enable = mkEnableOption "Applications and tools";
+  imports = [
+    ./docs.nix
+    ./editors
+    ./messaging.nix
+    ./multimedia.nix
+    ./steam
+    ./terminal
+    ./virtmanager.nix
+    ./web.nix
+  ];
+
+  config.local.apps = mkIf cfg.enable { 
+    docs.enable = mkDefault true;
+    editors.enable = mkDefault true;
+    messaging.enable = mkDefault true;
+    multimedia.enable = mkDefault true;
+    terminal.enable = mkDefault true;
+    web.enable = mkDefault true;
+  };
+}

home/apps/docs.nix

@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... } :
+with lib;
+let
+  cfg = config.local.apps.docs;
+in
+{
+  options.local.apps.docs.enable = mkEnableOption "Doc management tools";
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      libreoffice-fresh
+      okular
+      pdfarranger
+      xournal
+    ];
+    
+    xdg.mimeApps.defaultApplications = {
+      "application/pdf" = [ "org.kde.okular.desktop" ];
+    };
+  };
+}

home/apps/editors/default.nix

@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... } :
+with lib;
+let
+  cfg = config.local.apps.editors;
+in
+{
+  options.local.apps.editors.enable = mkEnableOption "Text editors";
+
+  imports = [ ./vscode ];
+
+  config = mkIf cfg.enable {
+    local.apps.editors.vscode = mkDefault true;
+
+    neovim.enable = true; 
+    helix.enable = true;
+  };
+
+}

home/apps/editors/vscode/default.nix

@@ -0,0 +1,19 @@
+{config, lib, pkgs, ...} :
+with lib;
+let
+  cfg = config.local.apps.editors.vscode;
+in
+{
+  options.local.apps.editors.vscode.enable = mkEnableOption "VSCodium";
+  
+  config = mkIf cfg.enable {
+    home.packages = [ rust-analyzer ];
+    programs.vscode = {
+      enable = true;
+      package = pkgs.vscodium;
+      mutableExtensionsDir = false;
+      extensions = attrValues (pkgs.callPackage ./extensions.nix {}).extensions;
+      userSettings = import ./settings.nix
+    };
+  };
+}

home/apps/editors/vscode/extensions.nix

@@ -0,0 +1,208 @@
+{ lib, vscode-utils, vscode-extensions }: with vscode-utils; {
+  extensions = {
+    inherit (vscode-extensions.bbenoist) nix;
+    inherit (vscode-extensions.ms-vscode) cpptools;
+
+    rust = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "rust-lang";
+        name = "rust";
+        version = "0.7.8";
+        sha256 = "sha256-Y33agSNMVmaVCQdYd5mzwjiK5JTZTtzTkmSGTQrSNg0=";
+      };
+      meta.license = lib.licenses.mit;
+    };
+
+    indenticator = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "sirtori";
+        name = "indenticator";
+        version = "0.7.0";
+        sha256 = "sha256-J5iNO6V5US+GFyNjNNA5u9H2pKPozWKjQWcLAhl+BjY=";
+      };
+      meta.license = lib.licenses.mit;
+    };
+    
+    matlab = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "Gimly81";
+        name = "matlab";
+        version = "2.3.1";
+        sha256 = "sha256-0vx5L9efxvubb+JFunJJKaPvSxfgmYZkDJOxpXAV6xs=";
+      };
+      meta.license = lib.licenses.mit;
+    };
+
+    octave = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "toasty-technologies";
+        name = "octave";
+        version = "0.0.3";
+        sha256 = "sha256-tbqblaBX+wqgasfGLsFp49xYxXi5CF39YPYs0QyANt0=";
+      };
+    };
+
+    riscv = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "zhwu95";
+        name = "riscv";
+        version = "0.0.8";
+        sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY=";
+      };
+    };
+
+    pdf = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "tomoki1207";
+        name = "pdf";
+        version = "1.2.0";
+        sha256 = "sha256-/2u2yfAmSVBvfXIMt2VokkeYH8q8Y9Ca9YSDuwwpkq0=";
+      };
+    };
+
+    vscode-icons = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "vscode-icons-team";
+        name = "vscode-icons";
+        version = "12.0.0";
+        sha256 = "sha256-TQ/GPxNgbMBVlp+KNRd+M0vMxFSAjld/CCbVS9C1DuA=";
+      };
+    };
+
+    arm = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "dan-c-underwood";
+        name = "arm";
+        version = "1.7.4";
+        sha256 = "sha256-gZBM980AoD+0wnfHXJK9sqCuuLtRY08JnO3Qdq/TRfc=";
+      };
+    };
+
+    verilogHDL = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "mshr-h";
+        name = "VerilogHDL";
+        version = "1.5.4";
+        sha256 = "sha256-WxVEP37Z+hATTOZSozYSSGtDUSMKAO/nA6ORXbpjGMU=";
+      };
+    };
+
+    tcl = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "rashwell";
+        name = "tcl";
+        version = "0.1.0";
+        sha256 = "sha256-k8I/W3g98r/YCyIURgm7hh+0Bm0lg4Mdh/r8HsPSoX0=";
+      };
+    };
+
+    txt-syntax = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "xshrim";
+        name = "txt-syntax";
+        version = "0.2.1";
+        sha256 = "sha256-5MOHyTHAefD4X9dpMCJ1ArxBqvHRLfFjENXkIPmAw4M=";
+      };
+    };
+
+    linkerscript = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "ZixuanWang";
+        name = "linkerscript";
+        version = "1.0.2";
+        sha256 = "sha256-J6j4tXJ+gQWGJnMiqoIqJT2kGs/m8Njjm9pX9NCvJWc=";
+      };
+    };
+
+    vscode-drawio = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "hediet";
+        name = "vscode-drawio";
+        version = "1.6.4";
+        sha256 = "sha256-+VYdFk9VCp3KnvOASJ+jJSb1NBwykBlnd8EuSKw8sKI=";
+      };
+    };
+
+    better-comments = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "aaron-bond";
+        name = "better-comments";
+        version = "3.0.2";
+        sha256 = "sha256-hQmA8PWjf2Nd60v5EAuqqD8LIEu7slrNs8luc3ePgZc=";
+      };
+    };
+
+    code-spell-checker = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "streetsidesoftware";
+        name = "code-spell-checker";
+        version = "2.10.1";
+        sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0=";
+      };
+    };
+
+    vscode-todo-highlight = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "wayou";
+        name = "vscode-todo-highlight";
+        version = "1.0.5";
+        sha256 = "sha256-CQVtMdt/fZcNIbH/KybJixnLqCsz5iF1U0k+GfL65Ok=";
+      };
+    };
+
+    clang-format = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "xaver";
+        name = "clang-format";
+        version = "1.9.0";
+        sha256 = "sha256-q9DvkXbv+GTyeMVIyUQDK49Njsl9msbnOD1gyS4ljC8=";
+      };
+    };
+
+    markdown-all-in-one = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "yzhang";
+        name = "markdown-all-in-one";
+        version = "3.4.4";
+        sha256 = "sha256-2lZfWP+yk0Dp8INLjlJY5ROGu0sLaWhb4fT+O9xGg0s=";
+      };
+    };
+
+    path-intellisense = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "christian-kohler";
+        name = "path-intellisense";
+        version = "2.8.1";
+        sha256 = "sha256-lTKzMphkGgOG2XWqz3TW2G9sISBc/kG7oXqcIH8l+Mg=";
+      };
+    };
+
+    wav-preview = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "sukumo28";
+        name = "wav-preview";
+        version = "2.0.4";
+        sha256 = "sha256-N7Scz3vjDws4oTMqrM3mSANeW85GGpBUY2xfZx+WezY=";
+      };
+    };
+
+    indent-rainbow = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "oderwat";
+        name = "indent-rainbow";
+        version = "8.3.1";
+        sha256 = "sha256-dOicya0B2sriTcDSdCyhtp0Mcx5b6TUaFKVb0YU3jUc=";
+      };
+    };
+
+    python = buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "ms-python";
+        name = "python";
+        version = "2022.19.13141010";
+        sha256 = "sha256-8LbjpXLAAwK/oEPwpX+N1sWkSFNzQfWAkaBEQr49SQk=";
+      };
+    };
+  };
+}
+# para obtener el sha: lib.fakeSha256

home/apps/editors/vscode/settings.nix

@@ -0,0 +1,26 @@
+{
+  "files.autoSave" = "onFocusChange";
+  "explorer.confirmDelete" = false;
+  "explorer.confirmDragAndDrop" = false;
+  "security.workspace.trust.enabled" = false;
+  "workbench.startupEditor" = "none";
+  "workbench.colorTheme" = "Default High Contrast";
+  "editor.mouseWheelZoom" = true;
+  "editor.cursorSmoothCaretAnimation" = true;
+  "workbench.list.smoothScrolling" = true;
+  "editor.smoothScrolling" = true;
+  "editor.rulers" = [80 120];
+  "workbench.iconTheme" = "vscode-icons";
+  "workbench.editor.untitled.hint" = "hidden";
+  "editor.autoClosingDelete" = "never";
+  "editor.autoClosingOvertype" = "never";
+  "editor.autoClosingBrackets" = "never";
+  "editor.autoClosingQuotes" = "never";
+  "indentRainbow.colors" = [
+    "rgba(255,255,64,0.2)"
+    "rgba(127,255,127,0.2)"
+    "rgba(255,127,255,0.2)"
+    "rgba(79,236,236,0.2)"
+  ];
+  "hediet.vscode-drawio.theme" = "dark";
+}

home/apps/messaging.nix

@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... } :
+with lib;
+let
+  cfg = config.local.apps.messaging;
+in
+{
+  options.local.apps.messaging.enable = mkEnableOption "Messaging apps";
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      discord
+      signal-desktop
+      tdesktop
+      teams
+      thunderbird
+      zoom-us
+    ];
+  };
+}

home/apps/multimedia.nix

@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... } :
+with lib;
+let
+  cfg = config.local.apps.multimedia;
+in
+{
+  options.local.apps.multimedia.enable = mkEnableOption "Video and audio tools";
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      deluge
+      mpv
+      obs-studio
+      pavucontrol
+      spotify
+      vlc
+    ];
+  };
+}

home/apps/steam/default.nix

@@ -1,13 +1,12 @@
 {pkgs, lib, config, ...}:
 with lib; let 
- cfg = config.programs.steam;
+  cfg = config.local.apps.steam;
 in { 
-  options = {
-    programs.steam.enable = mkEnableOption "Weather to enable option or not.";
-  };
+  options.local.apps.steam.enable = mkEnableOption "Steam";
   config = mkIf cfg.enable {
     home.packages = [
       (pkgs.callPackage ./package.nix {})
+      protonup
     ];
   };
 } 

home/apps/terminal/default.nix

@@ -0,0 +1,32 @@
+{config, lib, pkgs, ...} :
+with lib;
+let
+  cfg = config.local.apps.terminal;
+in
+{
+  options.local.apps.terminal.enable = mkEnableOption "Terminal emulator settings";
+  config.programs = mkIf cfg.enable {
+    kitty = {
+      enable = true;
+      extraConfig = import ./kitty.conf.nix;
+    };
+
+    tmux = {
+      enable = true;
+      aggressiveResize = true;
+      clock24 = true;
+      escapeTime = 10;
+      terminal = "xterm-256color";
+      keyMode = "emacs";
+
+      extraConfig = ''
+      set -g mouse on
+      set -ga update-environment " LIFT_PID"
+      set -g set-titles on
+      set -g renumber-windows on
+      set -sa terminal-overrides ',xterm-termite:RGB'
+      set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,} %H:%M %d-%b-%y"
+      '';
+    };
+  };
+}

home/apps/virtmanager.nix

@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... } :
+with lib;
+let
+  cfg = config.local.apps.virtmanager;
+in
+{
+  options.local.apps.virtmanager.enable = mkEnableOption "Virtmanager";
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      virt-manager
+    ];
+  };
+}

home/apps/web.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... } :
+with lib;
+let
+  cfg = config.local.apps.web;
+in
+{
+  options.local.apps.web.enable = mkEnableOption "Browsers";
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      chromium
+      firefox
+    ];
+    
+    xdg.mimeApps.defaultApplications = {
+      "application/x-extension-htm" = [ "firefox.desktop" ];
+      "application/x-extension-html" = [ "firefox.desktop" ];
+      "application/x-extension-shtml" = [ "firefox.desktop" ];
+      "application/x-extension-xht" = [ "firefox.desktop" ];
+      "application/x-extension-xhtml" = [ "firefox.desktop" ];
+      "application/xhtml+xml" = [ "firefox.desktop" ];
+      "text/html" = [ "firefox.desktop" ];
+      "x-scheme-handler/http" = [ "firefox.desktop" ];
+      "x-scheme-handler/https" = [ "firefox.desktop" ];
+    };
+  };
+}

home/cli.nix

@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... } :
+with lib;
+{
+  programs = {
+    zsh = { 
+      enable = true;
+      enableSyntaxHighlighting = true;
+      initExtra = import ./zshrc.nix pkgs;
+    };
+    git = {
+      enable = true;
+      userEmail = "fabian@cluster451.org";
+      userName = "Fabián Montero";
+      signing.key = "E77A808BF9A955D668EEEA6473FA9C9CB5F0249B";
+    };
+  };
+  
+  home.packages = with pkgs; 
+  [
+    calc
+    file
+    gcc
+    htop
+    killall
+    man-pages
+    man-pages-posix
+    tree
+    units
+    unzip
+    usbutils
+    zip
+  ];
+}

home/default.nix

@@ -4,11 +4,13 @@ with lib;
 {
   imports = [
     (hm-isolation.homeManagerModule)
+    ./apps
     ./allowUnfreeWhitelist.nix
+    ./fonts.nix
     ./gui
     ./isolation.nix
     ./options.nix
-    ./path.nix
+    ./cli.nix
     ./systemd
   ];
 
@@ -38,19 +40,14 @@ with lib;
     "unstable".flake = unstable;
   };
 
-  programs = {
-    home-manager.enable = true;
-    neovim.enable = true; 
-    zsh = { 
-      enable = true;
-      enableSyntaxHighlighting = true;
-      initExtra = import ./zshrc.nix pkgs;
-    };
-    git = {
-      enable = true;
-      userEmail = "fabian@cluster451.org";
-      userName = "Fabián Montero";
-      signing.key = "E77A808BF9A955D668EEEA6473FA9C9CB5F0249B";
+  programs.home-manager.enable = true;
+
+  local = {
+    apps.enable = mkDefault (!config.home.isolation.active);
+    
+    gui = {
+      enable = mkDefault true;
+      desktop = mkDefault (!config.home.isolation.active);
     };
   };
 }

home/gui/autorandr.nix

@@ -1,8 +1,14 @@
 { config, pkgs, lib, ... } :
 with lib;
+let
+  cfg = config.local.gui.autorandr;
+in
 {
+  options.local.gui.autorandr.enable = mkEnableOption "Autorandr";
+  config = mkIf cfg.enable {
     programs.autorandr = {
       enable = true;
       profiles."${config.local.platform}" = config.local.display.autorandrProfile;
     };
+  };
 }

home/gui/default.nix

@@ -1,43 +1,49 @@
 { config, pkgs, lib, ... } :
 with lib;
+let
+  cfg = config.local.gui;
+in
 {
+  options.local.gui = {
+    enable = mkEnableOption "GUI settings and programs";
+    desktop = mkEnableOption "i3 desktop envirorment"
+  };
 
   imports = [
     ./autorandr.nix
-    ./desktop
+    ./fonts.nix
+    ./gtk.nix
     ./i3.nix
     ./polybar.nix
     ./startx.nix
   ];
 
-  config = mkIf ( !config.home.isolation.active ) { 
+  config = mkIf cfg.enable { 
     
-    services.picom = {
+    local.gui = { 
+      fonts.enable = mkDefault true;
+      gtk.enable = mkDefault true;
+
+      autorandr.enable = mkDefault cfg.desktop;
+      i3.enable = mkDefault cfg.desktop;
+      polybar.enable = mkDefault cfg.desktop;
+      startx.enable = mkDefault cfg.desktop;
+    };
+
+    services = mkIf cfg.desktop {
+      picom = {
         enable = true;
       };
     
-    services.dunst = {
+      dunst = {
         enable = true;
       };
     
-    services.betterlockscreen = {
+      betterlockscreen = {
         enable = true;
       };
+    };
 
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "application/pdf" = [ "org.kde.okular.desktop" ];
-        "application/x-extension-htm" = [ "firefox.desktop" ];
-        "application/x-extension-html" = [ "firefox.desktop" ];
-        "application/x-extension-shtml" = [ "firefox.desktop" ];
-        "application/x-extension-xht" = [ "firefox.desktop" ];
-        "application/x-extension-xhtml" = [ "firefox.desktop" ];
-        "application/xhtml+xml" = [ "firefox.desktop" ];
-        "text/html" = [ "firefox.desktop" ];
-        "x-scheme-handler/http" = [ "firefox.desktop" ];
-        "x-scheme-handler/https" = [ "firefox.desktop" ];
-      };
-    };
+    xdg.mimeApps.enable = true;
   };
 }

home/gui/desktop/default.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ...} :
-with lib;
-{
-  imports = [
-    ./terminal.nix
-    ./steam
-    ./vscode.nix
-  ];
-                          # el sistema de shenvs detecta
-                          # que esto solo va para mi home,
-                          # no para las shenvs
-  programs.steam.enable = !config.home.isolation.active;
-}

home/gui/desktop/terminal.nix

@@ -1,28 +0,0 @@
-{config, lib, pkgs, ...} :
-with lib;
-{
-  programs = mkIf ( !config.home.isolation.active ) {
-    kitty = {
-        enable = true;
-        extraConfig = import ./kitty.conf.nix;
-    };
-
-    tmux = {
-        enable = true;
-        aggressiveResize = true;
-        clock24 = true;
-        escapeTime = 10;
-        terminal = "xterm-256color";
-        keyMode = "emacs";
-
-        extraConfig = ''
-        set -g mouse on
-        set -ga update-environment " LIFT_PID"
-        set -g set-titles on
-        set -g renumber-windows on
-        set -sa terminal-overrides ',xterm-termite:RGB'
-        set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,} %H:%M %d-%b-%y"
-        '';
-    };
-  };
-}

home/gui/desktop/vscode.nix

@@ -1,67 +0,0 @@
-{config, lib, pkgs, ...} :
-with lib;
-{
-  programs.vscode = mkIf ( !config.home.isolation.active ) {
-    enable = true;
-    package = pkgs.vscodium;
-    haskell = {
-      enable = true;
-      hie.enable = false;
-    };
-    mutableExtensionsDir = false;
-    extensions = (with pkgs.vscode-extensions; [
-      bbenoist.nix
-      ms-toolsai.jupyter
-      ms-vscode.cpptools
-    ]) ++ (with pkgs.local.vscode-extensions; [
-      rust-lang.rust
-      sirtori.indenticator
-      toasty-technologies.octave
-      Gimly81.matlab
-      zhwu95.riscv
-      tomoki1207.pdf
-      vscode-icons-team.vscode-icons
-      dan-c-underwood.arm
-      mshr-h.VerilogHDL
-      rashwell.tcl
-      xshrim.txt-syntax
-      ZixuanWang.linkerscript
-      hediet.vscode-drawio
-      aaron-bond.better-comments
-      streetsidesoftware.code-spell-checker
-      wayou.vscode-todo-highlight
-      xaver.clang-format
-      yzhang.markdown-all-in-one
-      christian-kohler.path-intellisense
-      sukumo28.wav-preview
-      oderwat.indent-rainbow
-      ms-python.python
-    ]);
-    userSettings = {
-      "files.autoSave" = "onFocusChange";
-      "explorer.confirmDelete" = false;
-      "explorer.confirmDragAndDrop" = false;
-      "security.workspace.trust.enabled" = false;
-      "workbench.startupEditor" = "none";
-      "workbench.colorTheme" = "Default High Contrast";
-      "editor.mouseWheelZoom" = true;
-      "editor.cursorSmoothCaretAnimation" = true;
-      "workbench.list.smoothScrolling" = true;
-      "editor.smoothScrolling" = true;
-      "editor.rulers" = [80 120];
-      "workbench.iconTheme" = "vscode-icons";
-      "workbench.editor.untitled.hint" = "hidden";
-      "editor.autoClosingDelete" = "never";
-      "editor.autoClosingOvertype" = "never";
-      "editor.autoClosingBrackets" = "never";
-      "editor.autoClosingQuotes" = "never";
-      "indentRainbow.colors" = [
-        "rgba(255,255,64,0.2)"
-        "rgba(127,255,127,0.2)"
-        "rgba(255,127,255,0.2)"
-        "rgba(79,236,236,0.2)"
-      ];
-      "hediet.vscode-drawio.theme" = "dark";
-    };
-  };
-}

home/gui/fonts.nix

@@ -0,0 +1,15 @@
+{ config, pkgs, lib, ... } :
+with lib;
+let
+  cfg = config.local.gui.fonts;
+in
+{
+  options.local.gui.fonts.enable = mkEnableOption "Font management";
+  config = mkIf cfg.enable {
+    fonts.fontconfig.enable = true;
+    
+    home.packages = with pkgs; [
+      jetbrains-mono
+    ];
+  };
+}

home/gui/gtk.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... } :
+with lib;
+let
+  cfg = config.local.gui.gtk;
+in
+{
+  options.local.gui.gtk.enable = mkEnableOption "GTK related programs";
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      gruvbox-dark-icons-gtk
+      libsForQt5.breeze-gtk
+    ];
+  }
+}

home/gui/i3.nix

@@ -1,8 +1,12 @@
 { config, pkgs, lib, ... } :
 with lib;
+let
+  cfg = config.local.gui.i3;
+in
 {
-  
-  xsession.windowManager.i3 = mkIf ( !config.home.isolation.active ) {
+  options.local.gui.i3.enable = mkEnableOption "i3 window manager";
+  config = mkIf cfg.enable {
+    xsession.windowManager.i3 = {
       enable = true;
       package = pkgs.i3-gaps;
       
@@ -93,4 +97,5 @@ with lib;
         bars = [  ];
       };
     };
+  };
 }

home/gui/polybar.nix

@@ -1,6 +1,11 @@
 { config, pkgs, lib, ... } :
 with lib;
+let
+  cfg = config.local.gui.polybar;
+in
 {
+  options.local.gui.polybar.enable = mkEnableOption "Polybar";
+  config = mkIf cfg.enable {
     services.polybar = mkIf ( !config.home.isolation.active ) {
       enable = true;
       package = pkgs.polybarFull;
@@ -245,12 +250,12 @@ with lib;
           label = "%date% %time%";
         };
         
-#      "module/semanatec" = {
-#        type = "custom/script"
-#        exec = "/home/fabian/bin/semanatec/target/release/semanatec"
-#        interval = 3600
-#        format-prefix = ""
-#      };
+  #      "module/semanatec" = {
+  #        type = "custom/script"
+  #        exec = "/home/fabian/bin/semanatec/target/release/semanatec"
+  #        interval = 3600
+  #        format-prefix = ""
+  #      };
         
         "module/pulseaudio" = {
           type = "internal/pulseaudio";
@@ -452,4 +457,5 @@ with lib;
         };
       };
     };
+  };
 }

home/gui/startx.nix

@@ -1,7 +1,11 @@
 { config, pkgs, lib, ... } :
 with lib;
+let
+  cfg = config.local.gui.startx;
+in
 {
-  config = mkIf ( !config.home.isolation.active ) {
+  options.local.gui.startx.enable = mkEnableOption "startx";
+  config = mkIf cfg.enable {
     xsession.enable = true;
     
     home.file.".xinitrc".source = let
@@ -13,7 +17,4 @@ with lib;
     in
     pkgs.writeShellScript "xinitrc" content;
   };
-
-  
-
 }

home/path.nix

@@ -1,61 +0,0 @@
-{ config, lib, pkgs, ... } :
-with lib;
-{
-  home.packages = with pkgs; 
-  [
-    file
-    gcc
-    helix
-    killall
-    man-pages
-    man-pages-posix
-    tree
-    units
-    unzip
-    zip
-  ] ++ optionals ( !config.home.isolation.active ) [
-    arandr
-    arduino
-    betterdiscordctl
-    blas
-    calc
-    cargo-edit
-    chromium
-    deluge
-    discord
-    firefox
-    gruvbox-dark-icons-gtk
-    htop
-    jetbrains.pycharm-professional
-    jellyfin-media-player
-    jq
-    libreoffice-fresh
-    libsForQt5.breeze-gtk
-    maim
-    mpv
-    obs-studio
-    okular
-    pandoc
-    pavucontrol
-    pdfarranger
-    # polymc marked as insecure, not installing untill this is fixed
-    protonup
-    rar
-    runelite
-    rust-analyzer
-    rustup
-    signal-desktop
-    spotify
-    tdesktop
-    teams
-    thunderbird
-    tor
-    tor-browser-bundle-bin
-    usbutils
-    virt-manager
-    vlc
-    xclip
-    xournalpp
-    zoom-us
-  ];
-}

home/platforms/posixlycorrect.nix

@@ -2,6 +2,11 @@
   config.local = {
     nixos = true;
 
+    apps = {
+      steam.enable = true;
+      virtmanager.enable = true;
+    };
+
     display = {
       "0" = "DisplayPort-0";
       "1" = "DisplayPort-1";

home/shenvs/tor.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  static = true;
+  namespaced = true;
+  
+  packages = with pkgs; [
+    tor
+    tor-browser-bundle-bin
+  ];
+}
+

home/zshrc.nix

@@ -74,7 +74,7 @@
   alias ls='ls --color -F'
   alias l='ls --color -FhAltr'
   alias x='killall --ignore-case --user=$(whoami) --interactive'
-  alias sc='${maim}/bin/maim -s -u | xclip -selection clipboard -t image/png -i'
+  alias sc='${maim}/bin/maim -s -u | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png -i'
   alias tree='tree -CF'
   alias lock="betterlockscreen -l"
   alias nightmode="${redshift}/bin/redshift -P -O 1000"

pkgs/default.nix

@@ -1,6 +0,0 @@
-pkgs:
-with pkgs.lib; let
-  inherit (pkgs) callPackage;
-in {
-  vscode-extensions = callPackage ./vscode.nix {};
-}

pkgs/vscode.nix

@@ -1,203 +0,0 @@
-{ lib, vscode-utils }: with vscode-utils; {
-  rust-lang.rust = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "rust-lang";
-      name = "rust";
-      version = "0.7.8";
-      sha256 = "sha256-Y33agSNMVmaVCQdYd5mzwjiK5JTZTtzTkmSGTQrSNg0=";
-    };
-    meta.license = lib.licenses.mit;
-  };
-
-  sirtori.indenticator = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "sirtori";
-      name = "indenticator";
-      version = "0.7.0";
-      sha256 = "sha256-J5iNO6V5US+GFyNjNNA5u9H2pKPozWKjQWcLAhl+BjY=";
-    };
-    meta.license = lib.licenses.mit;
-  };
-   
-  Gimly81.matlab = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "Gimly81";
-      name = "matlab";
-      version = "2.3.1";
-      sha256 = "sha256-0vx5L9efxvubb+JFunJJKaPvSxfgmYZkDJOxpXAV6xs=";
-    };
-    meta.license = lib.licenses.mit;
-  };
-
-  toasty-technologies.octave = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "toasty-technologies";
-      name = "octave";
-      version = "0.0.3";
-      sha256 = "sha256-tbqblaBX+wqgasfGLsFp49xYxXi5CF39YPYs0QyANt0=";
-    };
-  };
-
-  zhwu95.riscv = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "zhwu95";
-      name = "riscv";
-      version = "0.0.8";
-      sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY=";
-    };
-  };
-
-  tomoki1207.pdf = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "tomoki1207";
-      name = "pdf";
-      version = "1.2.0";
-      sha256 = "sha256-/2u2yfAmSVBvfXIMt2VokkeYH8q8Y9Ca9YSDuwwpkq0=";
-    };
-  };
-
-  vscode-icons-team.vscode-icons = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "vscode-icons-team";
-      name = "vscode-icons";
-      version = "12.0.0";
-      sha256 = "sha256-TQ/GPxNgbMBVlp+KNRd+M0vMxFSAjld/CCbVS9C1DuA=";
-    };
-  };
-
-  dan-c-underwood.arm = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "dan-c-underwood";
-      name = "arm";
-      version = "1.7.4";
-      sha256 = "sha256-gZBM980AoD+0wnfHXJK9sqCuuLtRY08JnO3Qdq/TRfc=";
-    };
-  };
-
-  mshr-h.VerilogHDL = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "mshr-h";
-      name = "VerilogHDL";
-      version = "1.5.4";
-      sha256 = "sha256-WxVEP37Z+hATTOZSozYSSGtDUSMKAO/nA6ORXbpjGMU=";
-    };
-  };
-
-  rashwell.tcl = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "rashwell";
-      name = "tcl";
-      version = "0.1.0";
-      sha256 = "sha256-k8I/W3g98r/YCyIURgm7hh+0Bm0lg4Mdh/r8HsPSoX0=";
-    };
-  };
-
-  xshrim.txt-syntax = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "xshrim";
-      name = "txt-syntax";
-      version = "0.2.1";
-      sha256 = "sha256-5MOHyTHAefD4X9dpMCJ1ArxBqvHRLfFjENXkIPmAw4M=";
-    };
-  };
-
-  ZixuanWang.linkerscript = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "ZixuanWang";
-      name = "linkerscript";
-      version = "1.0.2";
-      sha256 = "sha256-J6j4tXJ+gQWGJnMiqoIqJT2kGs/m8Njjm9pX9NCvJWc=";
-    };
-  };
-
-  hediet.vscode-drawio = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "hediet";
-      name = "vscode-drawio";
-      version = "1.6.4";
-      sha256 = "sha256-+VYdFk9VCp3KnvOASJ+jJSb1NBwykBlnd8EuSKw8sKI=";
-    };
-  };
-
-  aaron-bond.better-comments = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "aaron-bond";
-      name = "better-comments";
-      version = "3.0.2";
-      sha256 = "sha256-hQmA8PWjf2Nd60v5EAuqqD8LIEu7slrNs8luc3ePgZc=";
-    };
-  };
-
-  streetsidesoftware.code-spell-checker = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "streetsidesoftware";
-      name = "code-spell-checker";
-      version = "2.10.1";
-      sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0=";
-    };
-  };
-
-  wayou.vscode-todo-highlight = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "wayou";
-      name = "vscode-todo-highlight";
-      version = "1.0.5";
-      sha256 = "sha256-CQVtMdt/fZcNIbH/KybJixnLqCsz5iF1U0k+GfL65Ok=";
-    };
-  };
-
-  xaver.clang-format = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "xaver";
-      name = "clang-format";
-      version = "1.9.0";
-      sha256 = "sha256-q9DvkXbv+GTyeMVIyUQDK49Njsl9msbnOD1gyS4ljC8=";
-    };
-  };
-
-  yzhang.markdown-all-in-one = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "yzhang";
-      name = "markdown-all-in-one";
-      version = "3.4.4";
-      sha256 = "sha256-2lZfWP+yk0Dp8INLjlJY5ROGu0sLaWhb4fT+O9xGg0s=";
-    };
-  };
-
-  christian-kohler.path-intellisense = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "christian-kohler";
-      name = "path-intellisense";
-      version = "2.8.1";
-      sha256 = "sha256-lTKzMphkGgOG2XWqz3TW2G9sISBc/kG7oXqcIH8l+Mg=";
-    };
-  };
-
-  sukumo28.wav-preview = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "sukumo28";
-      name = "wav-preview";
-      version = "2.0.4";
-      sha256 = "sha256-N7Scz3vjDws4oTMqrM3mSANeW85GGpBUY2xfZx+WezY=";
-    };
-  };
-
-  oderwat.indent-rainbow = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "oderwat";
-      name = "indent-rainbow";
-      version = "8.3.1";
-      sha256 = "sha256-dOicya0B2sriTcDSdCyhtp0Mcx5b6TUaFKVb0YU3jUc=";
-    };
-  };
-
-  ms-python.python = buildVscodeMarketplaceExtension {
-    mktplcRef = {
-      publisher = "ms-python";
-      name = "python";
-      version = "2022.19.13141010";
-      sha256 = "sha256-8LbjpXLAAwK/oEPwpX+N1sWkSFNzQfWAkaBEQr49SQk=";
-    };
-  };
-# para obtener el sha: lib.fakeSha256
-}