home: split up default.nix

4 files changed, 152 insertions, 141 deletions

diff --git a/home/default.nix b/home/default.nix
index 355291d..80984a3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,9 +3,11 @@
 with lib; {
   imports = [
     hm-isolation.homeManagerModule
+    ./desktop.nix
+    ./environ.nix
+    ./graphics.nix
     ./isolation.nix
     ./path.nix
-    ./unfree.nix
   ];
 
   options.local.workstation = with lib.types; mkOption {
@@ -46,147 +48,8 @@ with lib; {
       };
 
       language.base = "es_CR.UTF-8";
-
-      file = let
-        symlink = path: { source = config.lib.file.mkOutOfStoreSymlink path; };
-        #TODO: No sirve, creo que por readline
-        devNull = symlink "/dev/null";
-      in {
-        "vtmp" = symlink "/run/user/1000/vtmp";
-        ".calc_history" = devNull;
-        ".units_history" = devNull;
-      };
-    };
-
-    fonts.fontconfig.enable = true;
-
-    gtk = {
-      enable = true;
-      gtk3.bookmarks = [ "file:///home/ale/vtmp" "file:///home/ale/tmp" ];
-
-      gtk2.extraConfig = ''
-        gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
-        gtk-menu-images=1
-        gtk-button-images=1
-      '';
-
-      font = {
-        package = pkgs.noto-fonts;
-        name = "Noto Sans Regular";
-        #size = 14; <- caga layout de páginas
-      };
-
-      theme = {
-        package = pkgs.materia-theme;
-        name = "Materia-dark";
-      };
-    };
-
-    qt = {
-      enable = true;
-      platformTheme = "gtk";
-    };
-
-    xdg = {
-      enable = true;
-      configFile = {
-        "i3/config".text = import ./i3-config.nix {
-          inherit (pkgs) i3lock-color xautolock;
-          inherit (pkgs.xorg) setxkbmap;
-          inherit (pkgs.local) st tmux-lift;
-
-          i3status-rust = config.programs.i3status-rust.package;
-          rofi = config.programs.rofi.finalPackage;
-        };
-      };
-    };
-
-    systemd.user.tmpfiles.rules = [
-      "d %t/vtmp 0700"
-    ];
-
-    xsession = {
-      enable = true;
-      # Cambiar po windowManager.i3.enable al migrar
-      windowManager.command = "${pkgs.i3-gaps}/bin/i3";
     };
 
-    programs = {
-      home-manager.enable = true;
-
-      zsh = {
-        enable = true;
-        enableAutosuggestions = true;
-        enableSyntaxHighlighting = true;
-        initExtra = import ./zshrc.nix pkgs;
-      };
-
-      firefox = {
-        enable = true;
-
-        profiles."main.profile" = {
-          id = 0;
-          name = "default";
-        };
-
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-          decentraleyes
-          darkreader
-          keepassxc-browser
-          old-reddit-redirect
-          privacy-badger
-          ublock-origin
-          umatrix
-        ];
-      };
-
-      git = {
-        enable = true;
-        userName = "Alejandro Soto";
-        userEmail = "alejandro@34project.org";
-      };
-
-      i3status-rust = {
-        enable = true;
-      };
-
-      neovim = {
-        enable = true;
-        withRuby = false;
-        withPython3 = false;
-
-        extraConfig = ''
-          set number         " Enable line numbering
-          set relativenumber " Enable relative line numbering
-          set tabstop=4      " Set tap stop to 4
-          set shiftwidth=4   " Set shift width to 4 (same as tabstop)
-          set viminfo=       " No tracking
-        '';
-      };
-
-      rofi = {
-        enable = true;
-        theme = "DarkBlue";
-      };
-
-      tmux = {
-        enable = true;
-        aggressiveResize = true;
-        clock24 = true;
-        escapeTime = 10;
-        terminal = "xterm-256color";
-        keyMode = "vi";
-
-        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"
-          bind-key X set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}"
-        '';
-      };
-    };
+    programs.home-manager.enable = true;
   };
 }
diff --git a/home/desktop.nix b/home/desktop.nix
new file mode 100644
index 0000000..fd6b974
--- /dev/null
+++ b/home/desktop.nix
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+with lib; {
+  config = mkIf (!config.home.isolation.active) {
+    xdg.configFile."i3/config".text = import ./i3-config.nix {
+      inherit (pkgs) i3lock-color xautolock;
+      inherit (pkgs.xorg) setxkbmap;
+      inherit (pkgs.local) st tmux-lift;
+
+      i3status-rust = config.programs.i3status-rust.package;
+      rofi = config.programs.rofi.finalPackage;
+    };
+
+    xsession = {
+      enable = true;
+      # Cambiar por windowManager.i3.enable al migrar
+      windowManager.command = "${pkgs.i3-gaps}/bin/i3";
+    };
+
+    programs = {
+      firefox = {
+        enable = true;
+
+        profiles."main.profile" = {
+          id = 0;
+          name = "default";
+        };
+
+        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+          decentraleyes
+          darkreader
+          keepassxc-browser
+          old-reddit-redirect
+          privacy-badger
+          ublock-origin
+          umatrix
+        ];
+      };
+
+      i3status-rust.enable = true;
+
+      rofi = {
+        enable = true;
+        theme = "DarkBlue";
+      };
+
+      tmux = {
+        enable = true;
+        aggressiveResize = true;
+        clock24 = true;
+        escapeTime = 10;
+        terminal = "xterm-256color";
+        keyMode = "vi";
+
+        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"
+          bind-key X set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}"
+        '';
+      };
+    };
+  };
+}
diff --git a/home/environ.nix b/home/environ.nix
new file mode 100644
index 0000000..5b20f51
--- /dev/null
+++ b/home/environ.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+with lib; {
+  config = {
+    xdg.enable = true;
+
+    systemd.user.tmpfiles.rules = [
+      "d %t/vtmp 0700"
+    ];
+
+    home.file = let
+      symlink = path: { source = config.lib.file.mkOutOfStoreSymlink path; };
+      #TODO: No sirve, creo que por readline
+      devNull = symlink "/dev/null";
+    in {
+      "vtmp" = symlink "/run/user/1000/vtmp";
+      ".calc_history" = devNull;
+      ".units_history" = devNull;
+    };
+
+    programs = {
+      zsh = {
+        enable = true;
+        enableAutosuggestions = true;
+        enableSyntaxHighlighting = true;
+        initExtra = import ./zshrc.nix pkgs;
+      };
+
+      git = {
+        enable = true;
+        userName = "Alejandro Soto";
+        userEmail = "alejandro@34project.org";
+      };
+
+      neovim = {
+        enable = true;
+        withRuby = false;
+        withPython3 = false;
+
+        extraConfig = ''
+          set number         " Enable line numbering
+          set relativenumber " Enable relative line numbering
+          set tabstop=4      " Set tap stop to 4
+          set shiftwidth=4   " Set shift width to 4 (same as tabstop)
+          set viminfo=       " No tracking
+        '';
+      };
+    };
+  };
+}
diff --git a/home/graphics.nix b/home/graphics.nix
new file mode 100644
index 0000000..724f9d4
--- /dev/null
+++ b/home/graphics.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+with lib; {
+  config = {
+    fonts.fontconfig.enable = true;
+
+    gtk = {
+      enable = true;
+      gtk3.bookmarks = [ "file:///home/ale/vtmp" "file:///home/ale/tmp" ];
+
+      gtk2.extraConfig = ''
+        gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+        gtk-menu-images=1
+        gtk-button-images=1
+      '';
+
+      font = {
+        package = pkgs.noto-fonts;
+        name = "Noto Sans Regular";
+        #size = 14; <- caga layout de páginas
+      };
+
+      theme = {
+        package = pkgs.materia-theme;
+        name = "Materia-dark";
+      };
+    };
+
+    qt = {
+      enable = true;
+      platformTheme = "gtk";
+    };
+  };
+}