bluurb

36 files changed, 527 insertions, 929 deletions

diff --git a/home-manager/static/alacritty-wavez.json b/assets/alacritty-wavez.json
index a5656ff..a5656ff 100644
--- a/home-manager/static/alacritty-wavez.json
+++ b/assets/alacritty-wavez.json
diff --git a/home-manager/static/helix-wavez.toml b/assets/helix-wavez.toml
index 2ef9c39..2ef9c39 100644
--- a/home-manager/static/helix-wavez.toml
+++ b/assets/helix-wavez.toml
diff --git a/home-manager/static/wallpaper.jpg b/assets/wallpaper.jpg
index b0993d4..b0993d4 100644
--- a/home-manager/static/wallpaper.jpg
+++ b/assets/wallpaper.jpg
diff --git a/configuration/core/default.nix b/configuration/core/default.nix
new file mode 100644
index 0000000..87917ab
--- /dev/null
+++ b/configuration/core/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  imports = [
+    ./users.nix
+    ./services.nix
+    ./settings.nix
+    ./packages.nix
+  ];
+}
diff --git a/configuration/packages.nix b/configuration/core/packages.nix
index cf4baea..cf4baea 100644
--- a/configuration/packages.nix
+++ b/configuration/core/packages.nix
diff --git a/configuration/services.nix b/configuration/core/services.nix
index 9997d71..9997d71 100644
--- a/configuration/services.nix
+++ b/configuration/core/services.nix
diff --git a/configuration/nix-settings.nix b/configuration/core/settings.nix
index d765c47..e7a7b2e 100644
--- a/configuration/nix-settings.nix
+++ b/configuration/core/settings.nix
@@ -1,5 +1,6 @@
 { ... }:
 {
+  nixpkgs.config.allowUnfree = true;
 	nix.settings = {
 		experimental-features = [ "nix-command" "flakes" ];
 		trusted-users = [ "root" "jras" ];
diff --git a/configuration/users/default.nix b/configuration/core/users.nix
index a074ac9..26703a0 100644
--- a/configuration/users/default.nix
+++ b/configuration/core/users.nix
@@ -2,6 +2,9 @@
 {
   programs.zsh.enable = true;
 
+  security.sudo.execWheelOnly = true;
+  security.sudo.wheelNeedsPassword = false;
+
   users.mutableUsers = false;
   users.users.jras = {
     createHome = true;
diff --git a/configuration/home-manager/ansible.nix b/configuration/home-manager/ansible.nix
new file mode 100644
index 0000000..67aff1c
--- /dev/null
+++ b/configuration/home-manager/ansible.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+	home.packages = with pkgs; [
+	    ansible-language-server
+	    ansible-lint
+	];
+}
diff --git a/configuration/home-manager/core/default.nix b/configuration/home-manager/core/default.nix
new file mode 100644
index 0000000..9c33f66
--- /dev/null
+++ b/configuration/home-manager/core/default.nix
@@ -0,0 +1,74 @@
+{ pkgs, inputs, ... }:
+{
+
+  imports = [
+    ./helix.nix
+    ./shell.nix
+  ];
+
+  home.packages = [
+    pkgs.gnumake
+    pkgs.git-crypt
+    pkgs.bitwarden-cli
+
+    pkgs.fd
+    pkgs.glow
+    pkgs.eza
+
+    pkgs.nixfmt-rfc-style
+    inputs.nil.packages."${pkgs.system}".nil
+  ];
+
+  programs.ripgrep.enable = true;
+  programs.btop.enable = true;
+
+  programs.zoxide = {
+    enable = true;
+    options = [ "--cmd cd" ];
+  };
+  programs.fzf.enable = true;
+
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+  };
+
+  programs.git = {
+    enable = true;
+    aliases = {
+      b = "branch";
+      f = "fetch";
+      p = "pull";
+      s = "status";
+      co = "checkout";
+      pu = "push";
+      nb = "checkout -b";
+      db = "branch -D";
+      lg =
+        "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
+      praise = "blame";
+      bump = "!git bump";
+      ae = "!git add -A && git commit --amend";
+      ad = "commit --amend";
+      ac = "!git add -A && git commit";
+      rmbs =
+        "!git branch | grep -wv master | grep -wv main | xargs git branch -D";
+    };
+    extraConfig = {
+      pull.rebase = false;
+      init.defaultBranch = "main";
+    };
+  };
+
+  services.ssh-agent.enable = true;
+  programs.ssh = {
+    enable = true;
+    package = "${pkgs.openssh}";
+    addKeysToAgent = "yes";
+  };
+
+  programs.taskwarrior = {
+    enable = true;
+    package = "${pkgs.taskwarrior3}";
+  };
+}
diff --git a/configuration/home-manager/core/helix.nix b/configuration/home-manager/core/helix.nix
new file mode 100644
index 0000000..42861ce
--- /dev/null
+++ b/configuration/home-manager/core/helix.nix
@@ -0,0 +1,42 @@
+{ pkgs, inputs, ... }:
+{
+  home.sessionVariables = { EDITOR = "hx"; };
+  home.file = {
+    helix-ferra = {
+      source = ../../../assets/helix-wavez.toml;
+      target = ".config/helix/themes/wavez.toml";
+    };
+  };
+
+  programs.helix = {
+    enable = true;
+    package = inputs.helix.packages."${pkgs.system}".helix;
+    defaultEditor = true;
+    settings = {
+      theme = "wavez";
+      keys.normal = {
+        space.F = "file_picker_in_current_buffer_directory";
+      };
+      editor = {
+        end-of-line-diagnostics = "hint";
+        line-number = "relative";
+        bufferline = "always";
+        auto-save = false;
+
+        inline-diagnostics = {
+          cursor-line = "error";
+        };
+
+        lsp = {
+          enable = true;
+          display-messages = true;
+        };
+
+        indent-guides = {
+          render = true;
+          skip-levels = 1;
+        };
+      };
+     };
+  };
+}
diff --git a/configuration/home-manager/core/shell.nix b/configuration/home-manager/core/shell.nix
new file mode 100644
index 0000000..183b9ae
--- /dev/null
+++ b/configuration/home-manager/core/shell.nix
@@ -0,0 +1,69 @@
+{ pkgs, lib, ... }:
+{
+  programs.zsh = {
+    enable = true;
+    defaultKeymap = "emacs";
+    initExtra = ''
+    # https://github.com/jeffreytse/zsh-vi-mode
+    source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
+    '';
+    shellAliases = {
+      g = "git";
+    };
+  };
+
+  programs.starship = {
+    enable = true;
+    settings = {
+      directory.style = "blue";
+
+      format = lib.concatStrings [
+        "$username"
+        "$hostname"
+        "$directory"
+        "$git_branch"
+        "$git_state"
+        "$git_status"
+        "$cmd_duration"
+        "$line_break"
+        "$python"
+        "$openstack"
+        "$character"
+      ];
+
+      character = {
+        success_symbol = "[❯](purple)";
+        error_symbol = "[❯](red)";
+        vimcmd_symbol = "[❮](green)";
+      };
+
+      git_branch = {
+        format = "[$branch]($style)";
+        style = "bright-black";
+      };
+
+      git_status = {
+        format =
+          "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)";
+        style = "cyan";
+        conflicted = "​";
+        untracked = "​";
+        modified = "​";
+        staged = "​";
+        renamed = "​";
+        deleted = "​";
+        stashed = "≡";
+      };
+
+      git_state = {
+        format = "'([$state( $progress_current/$progress_total)]($style))' ";
+        style = "bright-black";
+      };
+
+      cmd_duration = {
+        format = "[$duration]($style) ";
+        style = "yellow";
+      };
+    };
+  };
+}
diff --git a/configuration/home-manager/frontend-dev.nix b/configuration/home-manager/frontend-dev.nix
new file mode 100644
index 0000000..3a957cd
--- /dev/null
+++ b/configuration/home-manager/frontend-dev.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    dart-sass
+    tailwindcss
+    tailwindcss-language-server
+    vscode-langservers-extracted
+  ];
+
+  programs.helix.languages.language = [
+    {
+      name = "html";
+      language-servers = [ "vscode-html-language-server" "tailwindcss-language-server" ];
+    }
+    {
+      name = "css";
+      language-servers = [ "vscode-css-language-server" "tailwindcss-language-server" ];
+    }
+  ];
+}
diff --git a/home-manager/systemd/llama.nix b/configuration/home-manager/hostnet.nix
index 96c0d62..b8f6418 100644
--- a/home-manager/systemd/llama.nix
+++ b/configuration/home-manager/hostnet.nix
@@ -1,10 +1,37 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 let
+  nodePkgs = pkgs.nodePackages;
   homeDir = "${config.home.homeDirectory}";
   llamaDir = "${homeDir}/.llama";
   apache2Dir = "${homeDir}/.apache2";
   httpd = "${pkgs.apacheHttpd}/bin/httpd";
 in {
+  home.packages = [
+    pkgs.pre-commit
+    nodePkgs.webpack
+    nodePkgs.webpack-cli
+
+    (pkgs.writeShellScriptBin "use-toolbox" ''
+      source ${config.home.homeDirectory}/projects/toolbox/var/bootstrap.zsh
+    '')
+  ];
+
+  programs = {
+    rbenv = {
+      enable = true;
+      enableZshIntegration = true;
+      plugins = [{
+        name = "ruby-build";
+        src = pkgs.fetchFromGitHub {
+          owner = "rbenv";
+          repo = "ruby-build";
+          rev = "v20230717";
+          hash = "sha256-kvdANiz9R5pQMTBRHvxC5bfBewIhXc+sgRbe7V2rVU8=";
+        };
+      }];
+    };
+  };
+
   systemd.user.services.llama = {
     Unit.Description = "Hostnet Apache LLama";
     Service = {
diff --git a/home-manager/compositor/hyprland.nix b/configuration/home-manager/hyprland.nix
index f4c35de..08af2a1 100644
--- a/home-manager/compositor/hyprland.nix
+++ b/configuration/home-manager/hyprland.nix
@@ -1,6 +1,6 @@
-{ pkgs, inputs, monitor-names, ... }:
+{ pkgs, inputs, ... }:
 let
-  wallpaper = ../static/wallpaper.jpg;
+  wallpaper = ../../assets/wallpaper.jpg;
 in
 {
   home.packages = with pkgs; [
@@ -140,7 +140,7 @@ in
     mainBar = {
       layer = "top";
       position = "bottom";
-      output = monitor-names;
+      # output = monitor-names;
       modules-left = [
         "hyprland/workspaces"
       ];
@@ -206,4 +206,52 @@ in
       }
     ];
   };
+
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      window = {
+        padding = { x = 5; y = 2; };
+      };
+      env = { TERM = "alacritty-direct"; };
+      terminal.shell = {
+        program = "${pkgs.zsh}/bin/zsh";
+        args = [ "-l" ];
+      };
+    } // builtins.fromJSON (builtins.readFile ../../assets/alacritty-wavez.json);
+  };
+
+  xdg.mimeApps = {
+    enable = true;
+    defaultApplications = {
+      "x-scheme-handler/http" = "firefox.desktop";
+      "x-scheme-handler/https" = "firefox.desktop";
+      "x-scheme-handler/chrome" = "firefox.desktop";
+      "text/html" = "firefox.desktop";
+      "application/x-extension-htm" = "firefox.desktop";
+      "application/x-extension-html" = "firefox.desktop";
+      "application/x-extension-shtml" = "firefox.desktop";
+      "application/xhtml+xml" = "firefox.desktop";
+      "application/x-extension-xhtml" = "firefox.desktop";
+      "application/x-extension-xht" = "firefox.desktop";
+    };
+    associations.added = {
+      "x-scheme-handler/http" = "firefox.desktop";
+      "x-scheme-handler/https" = "firefox.desktop";
+      "x-scheme-handler/chrome" = "firefox.desktop";
+      "text/html" = "firefox.desktop";
+      "application/x-extension-htm" = "firefox.desktop";
+      "application/x-extension-html" = "firefox.desktop";
+      "application/x-extension-shtml" = "firefox.desktop";
+      "application/xhtml+xml" = "firefox.desktop";
+      "application/x-extension-xhtml" = "firefox.desktop";
+      "application/x-extension-xht" = "firefox.desktop";
+    };
+  };
+
+  programs.rbw.enable = true;
+  programs.rbw.settings = {
+    email = "jaspert.ras@gmail.com";
+    pinentry = pkgs.pinentry-gnome3;
+  };
 }
diff --git a/configuration/home-manager/php.nix b/configuration/home-manager/php.nix
new file mode 100644
index 0000000..ab56f44
--- /dev/null
+++ b/configuration/home-manager/php.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+	programs.helix.languages.language-server.intelephense = with pkgs.nodePackages; {
+		command = "${intelephense}/bin/intelephense";
+	};
+
+  programs.git.ignores = [
+    ".phpactor.json"
+    ".phpcomplete_extended/"
+    ".phpunit.result.cache"
+    ".phpcs.xml"
+  ];
+}
diff --git a/configuration/home-manager/python.nix b/configuration/home-manager/python.nix
new file mode 100644
index 0000000..464fc39
--- /dev/null
+++ b/configuration/home-manager/python.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+{
+  home.packages = [
+    pkgs.pyright
+    pkgs.black
+    pkgs.ruff
+  ];
+
+  programs.helix.languages = {
+    language = [
+      {
+        name = "python";
+        language-servers = [ "pyright" "ruff" ];
+        formatter = { command = "black"; args = ["--line-length" "88" "--quiet" "-"]; };
+        auto-format = true;
+      }
+    ];
+    language-server.pyright.config.python.analysis = { typeCheckingMode = "basic"; };
+    language-server.ruff = { command = "ruff"; };
+    language-server.ruff.config.setting = { args = ["--ignore" "E501" ]; };
+  };
+
+  programs.starship.settings = {
+    python = {
+      format = "[$virtualenv]($style) ";
+      style = "bright-black";
+    };
+  };
+}
diff --git a/configuration/home-manager/tarrel.nix b/configuration/home-manager/tarrel.nix
new file mode 100644
index 0000000..a8ddb9f
--- /dev/null
+++ b/configuration/home-manager/tarrel.nix
@@ -0,0 +1,38 @@
+{ pkgs, ... }:
+{
+    imports = [
+      ../home-manager/core
+      ../home-manager/hyprland.nix
+    ];
+
+    home.username = "jras";
+    home.homeDirectory = "/home/jras";
+    home.stateVersion = "23.11";
+
+    programs.git = {
+      userName = "Jasper Ras";
+      userEmail = "jaspert.ras@gmail.com";
+    };
+
+    home.file = {
+      gamestream-start = {
+        text = ''
+        #!${pkgs.zsh}/bin/zsh
+        ${pkgs.hyprland}/bin/hyprctl keyword monitor HDMI-A-1,1920x1080@59.94,auto,2
+        '';
+        target = "bin/gamestream-start";
+        executable = true;
+      };
+      gamestream-end = {
+        text = ''
+        #!${pkgs.zsh}/bin/zsh
+        ${pkgs.hyprland}/bin/hyprctl keyword monitor HDMI-A-1,preferred,auto,1
+        '';
+        target = "bin/gamestream-end";
+        executable = true;
+      };
+    };
+
+    programs.zsh.envExtra = "export PATH=$HOME/bin:$PATH";
+  };
+}
diff --git a/configuration/snorlax/default.nix b/configuration/snorlax/default.nix
index fa60d0e..ee9755e 100644
--- a/configuration/snorlax/default.nix
+++ b/configuration/snorlax/default.nix
@@ -1,11 +1,10 @@
 { ... }:
 {
   imports = [
-    ../nix-settings.nix
-    ../users
-
     ./disk-config.nix
     ./git.nix
+
+    ../core
   ];
 
   networking.hostName = "snorlax";
diff --git a/configuration/tarrel/default.nix b/configuration/tarrel/default.nix
index f92285b..f8519a7 100644
--- a/configuration/tarrel/default.nix
+++ b/configuration/tarrel/default.nix
@@ -1,25 +1,23 @@
-{ pkgs, inputs, config, ... }:
+{ config, ... }:
 {
   imports = [
     ./hardware-configuration.nix
+    ./home-manager.nix
 
-    ../packages.nix
-    ../services.nix
-    ../users
+    ../core
     ../hyprland.nix
-    ../nix-settings.nix
   ];
 
-  nixpkgs.config.allowUnfree = true;
+  system.stateVersion = "24.05";
+
+  networking.hostName = "tarrel";
+  networking.networkmanager.enable = true;
+
+  users.users.jras.extraGroups = [ "networkmanager" ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  environment.systemPackages = with pkgs; [
-    zola
-    discord
-  ];
-
   hardware.graphics.enable = true;
   services.xserver.videoDrivers = ["nvidia"];
   hardware.nvidia = {
@@ -33,35 +31,6 @@
 
   security.rtkit.enable = true;
   
-  time.timeZone = "Europe/Amsterdam";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "nl_NL.UTF-8";
-    LC_IDENTIFICATION = "nl_NL.UTF-8";
-    LC_MEASUREMENT = "nl_NL.UTF-8";
-    LC_MONETARY = "nl_NL.UTF-8";
-    LC_NAME = "nl_NL.UTF-8";
-    LC_NUMERIC = "nl_NL.UTF-8";
-    LC_PAPER = "nl_NL.UTF-8";
-    LC_TELEPHONE = "nl_NL.UTF-8";
-    LC_TIME = "nl_NL.UTF-8";
-  };
-
-  console.keyMap = "us-acentos";
-
-  programs.zsh.enable = true;
-
-  users.users.jras = {
-    isNormalUser = true;
-    description = "Jasper";
-    extraGroups = [ "networkmanager" "wheel" "audio" ];
-    shell = pkgs.zsh;
-  };
-
-  security.sudo.execWheelOnly = true;
-  security.sudo.wheelNeedsPassword = false;
-
   environment.sessionVariables = {
     TERMINAL = "alacritty";
     EDITOR = "helix";
@@ -69,18 +38,6 @@
 
   environment.pathsToLink = [ "/libexec" ];
 
-  networking.hostName = "tarrel";
-  networking.networkmanager.enable = true;
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users.jras = import ../../home-manager/entrypoints/personal.nix;
-    extraSpecialArgs = { inherit inputs; monitor-names = ["DP-2" "HDMI-A-1"]; };
-  };
-
-  system.stateVersion = "24.05"; # Did you read the comment?
-
   services.sunshine = {
     enable = true;
     autoStart = true;
diff --git a/configuration/tarrel/home-manager.nix b/configuration/tarrel/home-manager.nix
new file mode 100644
index 0000000..9709129
--- /dev/null
+++ b/configuration/tarrel/home-manager.nix
@@ -0,0 +1,42 @@
+{ pkgs, inputs, ... }:
+{
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.extraSpecialArgs = { inherit inputs; };
+  home-manager.users.jras = {
+    imports = [
+      ../home-manager/core
+      ../home-manager/hyprland.nix
+    ];
+
+    home.username = "jras";
+    home.homeDirectory = "/home/jras";
+    home.stateVersion = "23.11";
+
+    programs.git = {
+      userName = "Jasper Ras";
+      userEmail = "jaspert.ras@gmail.com";
+    };
+
+    home.file = {
+      gamestream-start = {
+        text = ''
+        #!${pkgs.zsh}/bin/zsh
+        ${pkgs.hyprland}/bin/hyprctl keyword monitor HDMI-A-1,1920x1080@59.94,auto,2
+        '';
+        target = "bin/gamestream-start";
+        executable = true;
+      };
+      gamestream-end = {
+        text = ''
+        #!${pkgs.zsh}/bin/zsh
+        ${pkgs.hyprland}/bin/hyprctl keyword monitor HDMI-A-1,preferred,auto,1
+        '';
+        target = "bin/gamestream-end";
+        executable = true;
+      };
+    };
+
+    programs.zsh.envExtra = "export PATH=$HOME/bin:$PATH";
+  };
+}
diff --git a/configuration/work/default.nix b/configuration/work/default.nix
index 5bc9958..f17ac74 100644
--- a/configuration/work/default.nix
+++ b/configuration/work/default.nix
@@ -1,15 +1,17 @@
-{ config, pkgs, inputs, ... }:
+{ config, pkgs, ... }:
 {
   imports = [
     ./hardware-configuration.nix
+    ./home-manager.nix
 
-    ../packages.nix
-    ../services.nix
-    ../users
+    ../core
     ../hyprland.nix
-    ../nix-settings.nix
   ];
 
+  system.stateVersion = "24.05"; # Do NOT change before reading configuration.nix
+
+  users.users.jras.extraGroups = [ "networkmanager" "docker" ];
+
   age.secrets.ghostnet-cert.file = ../../secrets/ghostnet-cert.age;
   age.secrets.ghostnet-key.file = ../../secrets/ghostnet-key.age;
   age.secrets.ghostnet-ca.file = ../../secrets/ghostnet-ca.age;
@@ -21,19 +23,6 @@
   age.secrets.systems-ca.file = ../../secrets/systems-ca.age;
   age.secrets.systems-tls-auth.file = ../../secrets/systems-tls-auth.age;
 
-  environment.systemPackages = with pkgs; [
-    slack
-    git-review
-    hexchat
-    apacheHttpd
-    moonlight-qt
-    brightnessctl
-    hugo
-    google-chrome
-  ];
-
-  nixpkgs.config.allowUnfree = true;
-
   virtualisation.docker = {
     enable = true;
     enableOnBoot = true;
@@ -51,21 +40,6 @@
   networking.nameservers = [ "1.1.1.1" ];
   networking.firewall.allowedTCPPorts = [];
 
-  time.timeZone = "Europe/Amsterdam";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "nl_NL.UTF-8";
-    LC_IDENTIFICATION = "nl_NL.UTF-8";
-    LC_MEASUREMENT = "nl_NL.UTF-8";
-    LC_MONETARY = "nl_NL.UTF-8";
-    LC_NAME = "nl_NL.UTF-8";
-    LC_NUMERIC = "nl_NL.UTF-8";
-    LC_PAPER = "nl_NL.UTF-8";
-    LC_TELEPHONE = "nl_NL.UTF-8";
-    LC_TIME = "nl_NL.UTF-8";
-  };
-
   services.libinput.mouse.accelProfile = "flat";
   services.libinput.mouse.accelSpeed = "-5";
   services.upower.enable = true;
@@ -151,20 +125,6 @@
     variant = "";
   };
 
-  users.users.jras = {
-    isNormalUser = true;
-    description = "Jasper Ras";
-    extraGroups = [ "networkmanager" "wheel" "docker" ];
-    packages = with pkgs; [ git ];
-  };
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.users.jras = import ../../home-manager/entrypoints/work.nix;
-  home-manager.extraSpecialArgs = { inherit inputs; monitor-names = ["eDP-1" "HDMI-A-1" "DP-10"]; };
-
   programs.gnupg.agent.enable = true;
   programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
-
-  system.stateVersion = "24.05"; # Do NOT change before reading configuration.nix
 }
diff --git a/configuration/work/home-manager.nix b/configuration/work/home-manager.nix
new file mode 100644
index 0000000..bbfb0a9
--- /dev/null
+++ b/configuration/work/home-manager.nix
@@ -0,0 +1,83 @@
+{ pkgs, inputs, ... }:
+{
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.extraSpecialArgs = { inherit inputs; };
+  home-manager.users.jras = {
+    imports = [
+      ../home-manager/core
+
+      ../home-manager/hyprland.nix
+      ../home-manager/hostnet.nix
+      ../home-manager/php.nix
+      ../home-manager/ansible.nix
+      ../home-manager/python.nix
+    ];
+
+    home.username = "jras";
+    home.homeDirectory = "/home/jras";
+    home.stateVersion = "22.11";
+    home.sessionPath = [ "$HOME/.local/bin" "$HOME/.plenv/bin" ];
+
+    home.packages = with pkgs; [
+      slack
+      moonlight-qt
+      brightnessctl
+      google-chrome
+    ];
+
+    programs.git = {
+      userName = "Jasper Ras";
+      userEmail = "jras@hostnet.nl";
+      extraConfig = { gitreview.username = "jrasper"; };
+      ignores = [
+        ".direnv"
+        ".envrc"
+        ".project"
+        ".settings/"
+        ".buildpath"
+        "tags"
+        ".hhconfig"
+        ".DS_Store"
+        ".idea/"
+        ".vagrant/"
+        "*.swp"
+        "clover.xml"
+        "yarn-error.log"
+        "gsuite-auth.json"
+        "venv/"
+        "shell.nix"
+
+        ".devenv*"
+        "devenv*"
+        ".pre-commit-config.yaml"
+      ];
+    };
+
+    programs.zsh.envExtra = "export PATH=$HOME/.plenv/bin:$PATH";
+    programs.zsh.initExtra = ''
+      eval "$(plenv init -)"
+      eval "$(dircolors)"
+    '';
+    programs.zsh.shellAliases = {
+      ssh = "TERM=xterm-256color ssh";
+    };
+
+    programs.pyenv.enable = true;
+    programs.pyenv.enableZshIntegration = true;
+    programs.ssh = {
+      controlMaster = "auto";
+      controlPersist = "12h";
+      serverAliveInterval = 11;
+      matchBlocks = {
+        "*.g1i.one".user = "jasras";
+        "*.os1.openstack.group.one".user = "jasras";
+        "*.one.com".user = "jasras";
+        "91.184.16.185".port = 12345;
+        "*.compute.prv.vps1-testpod-cph3.one.com".forwardAgent = true;
+        "access.*.one.com".forwardAgent = true;
+        "access.*.g1i.one".forwardAgent = true;
+      };
+    };
+  };
+}
diff --git a/home-manager/alacritty/argonout.json b/home-manager/alacritty/argonout.json
deleted file mode 100644
index a31e323..0000000
--- a/home-manager/alacritty/argonout.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "colors": {
-    "primary": {
-      "background": "0x292C3E",
-      "foreground": "0xEBEBEB"
-    },
-    "normal": {
-      "black": "0x0d0d0d",
-      "red": "0xFF301B",
-      "green": "0xA0E521",
-      "yellow": "0xFFC620",
-      "blue": "0x1BA6FA",
-      "magenta": "0x8763B8",
-      "cyan": "0x21DEEF",
-      "white": "0xEBEBEB"
-    },
-    "bright": {
-      "black": "0x6D7070",
-      "red": "0xFF4352",
-      "green": "0xB8E466",
-      "yellow": "0xFFD750",
-      "blue": "0x1BA6FA",
-      "magenta": "0xA578EA",
-      "cyan": "0x73FBF1",
-      "white": "0xFEFEF8"
-    }
-  }
-}
-
diff --git a/home-manager/alacritty/catppuccin-frappe.json b/home-manager/alacritty/catppuccin-frappe.json
deleted file mode 100644
index e465a9b..0000000
--- a/home-manager/alacritty/catppuccin-frappe.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "colors": {
-    "primary": {
-      "background": "#303446",
-      "foreground": "#C6D0F5",
-      "dim_foreground": "#C6D0F5",
-      "bright_foreground": "#C6D0F5"
-    },
-    "cursor": {
-      "text": "#303446",
-      "cursor": "#F2D5CF"
-    },
-    "vi_mode_cursor": {
-      "text": "#303446",
-      "cursor": "#BABBF1"
-    },
-    "search": {
-      "matches": {
-        "foreground": "#303446",
-        "background": "#A5ADCE"
-      },
-      "focused_match": {
-        "foreground": "#303446",
-        "background": "#A6D189"
-      }
-    },
-    "hints": {
-      "start": {
-        "foreground": "#303446",
-        "background": "#E5C890"
-      },
-      "end": {
-        "foreground": "#303446",
-        "background": "#A5ADCE"
-      }
-    },
-    "selection": {
-      "text": "#303446",
-      "background": "#F2D5CF"
-    },
-    "normal": {
-      "black": "#51576D",
-      "red": "#E78284",
-      "green": "#A6D189",
-      "yellow": "#E5C890",
-      "blue": "#8CAAEE",
-      "magenta": "#F4B8E4",
-      "cyan": "#81C8BE",
-      "white": "#B5BFE2"
-    },
-    "bright": {
-      "black": "#626880",
-      "red": "#E78284",
-      "green": "#A6D189",
-      "yellow": "#E5C890",
-      "blue": "#8CAAEE",
-      "magenta": "#F4B8E4",
-      "cyan": "#81C8BE",
-      "white": "#A5ADCE"
-    },
-    "dim": {
-      "black": "#51576D",
-      "red": "#E78284",
-      "green": "#A6D189",
-      "yellow": "#E5C890",
-      "blue": "#8CAAEE",
-      "magenta": "#F4B8E4",
-      "cyan": "#81C8BE",
-      "white": "#B5BFE2"
-    },
-    "indexed_colors": [
-      {
-        "index": 16,
-        "color": "#EF9F76"
-      },
-      {
-        "index": 17,
-        "color": "#F2D5CF"
-      }
-    ]
-  }
-}
diff --git a/home-manager/alacritty/catppuccin-latte.json b/home-manager/alacritty/catppuccin-latte.json
deleted file mode 100644
index f4a9b2b..0000000
--- a/home-manager/alacritty/catppuccin-latte.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "colors": {
-    "primary": {
-      "background": "#EFF1F5",
-      "foreground": "#4C4F69",
-      "dim_foreground": "#4C4F69",
-      "bright_foreground": "#4C4F69"
-    },
-    "cursor": {
-      "text": "#EFF1F5",
-      "cursor": "#DC8A78"
-    },
-    "vi_mode_cursor": {
-      "text": "#EFF1F5",
-      "cursor": "#7287FD"
-    },
-    "search": {
-      "matches": {
-        "foreground": "#EFF1F5",
-        "background": "#6C6F85"
-      },
-      "focused_match": {
-        "foreground": "#EFF1F5",
-        "background": "#40A02B"
-      },
-      "footer_bar": {
-        "foreground": "#EFF1F5",
-        "background": "#6C6F85"
-      }
-    },
-    "hints": {
-      "start": {
-        "foreground": "#EFF1F5",
-        "background": "#DF8E1D"
-      },
-      "end": {
-        "foreground": "#EFF1F5",
-        "background": "#6C6F85"
-      }
-    },
-    "selection": {
-      "text": "#EFF1F5",
-      "background": "#DC8A78"
-    },
-    "normal": {
-      "black": "#5C5F77",
-      "red": "#D20F39",
-      "green": "#40A02B",
-      "yellow": "#DF8E1D",
-      "blue": "#1E66F5",
-      "magenta": "#EA76CB",
-      "cyan": "#179299",
-      "white": "#ACB0BE"
-    },
-    "bright": {
-      "black": "#6C6F85",
-      "red": "#D20F39",
-      "green": "#40A02B",
-      "yellow": "#DF8E1D",
-      "blue": "#1E66F5",
-      "magenta": "#EA76CB",
-      "cyan": "#179299",
-      "white": "#BCC0CC"
-    },
-    "dim": {
-      "black": "#5C5F77",
-      "red": "#D20F39",
-      "green": "#40A02B",
-      "yellow": "#DF8E1D",
-      "blue": "#1E66F5",
-      "magenta": "#EA76CB",
-      "cyan": "#179299",
-      "white": "#ACB0BE"
-    },
-    "indexed_colors": [
-      {
-        "index": 16,
-        "color": "#FE640B"
-      },
-      {
-        "index": 17,
-        "color": "#DC8A78"
-      }
-    ]
-  }
-}
diff --git a/home-manager/alacritty/kanagawa.json b/home-manager/alacritty/kanagawa.json
deleted file mode 100644
index 3ed1a40..0000000
--- a/home-manager/alacritty/kanagawa.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "colors": {
-    "primary": {
-      "background": "0x1f1f28",
-      "foreground": "0xdcd7ba"
-    },
-    "normal": {
-      "black": "0x090618",
-      "red": "0xc34043",
-      "green": "0x76946a",
-      "yellow": "0xc0a36e",
-      "blue": "0x7e9cd8",
-      "magenta": "0x957fb8",
-      "cyan": "0x6a9589",
-      "white": "0xc8c093"
-    },
-    "bright": {
-      "black": "0x727169",
-      "red": "0xe82424",
-      "green": "0x98bb6c",
-      "yellow": "0xe6c384",
-      "blue": "0x7fb4ca",
-      "magenta": "0x938aa9",
-      "cyan": "0x7aa89f",
-      "white": "0xdcd7ba"
-    },
-    "selection": {
-      "background": "0x2d4f67",
-      "foreground": "0xc8c093"
-    },
-    "indexed_colors": [
-      {
-        "index": 16,
-        "color": "0xffa066"
-      },
-      {
-        "index": 17,
-        "color": "0xff5d62"
-      }
-    ]
-  }
-}
-
diff --git a/home-manager/alacritty/retrowave.json b/home-manager/alacritty/retrowave.json
deleted file mode 100644
index 63559cf..0000000
--- a/home-manager/alacritty/retrowave.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "colors": {
-    "primary": {
-      "background": "0x070825",
-      "foreground": "0x46BDFF"
-    },
-    "normal": {
-      "black": "0x181A1F",
-      "red": "0xFF16B0",
-      "green": "0x929292",
-      "yellow": "0xfcee54",
-      "blue": "0xffffff",
-      "magenta": "0xFF92DF",
-      "cyan": "0xdf81fc",
-      "white": "0xFFFFFF"
-    },
-    "bright": {
-      "black": "0xFF16B0",
-      "red": "0xf85353",
-      "green": "0xfcee54",
-      "yellow": "0xffffff",
-      "blue": "0x46BDFF",
-      "magenta": "0xFF92DF",
-      "cyan": "0xff901f",
-      "white": "0xffffff"
-    },
-    "selection": {
-      "background": "0x2d4f67",
-      "foreground": "0xc8c093"
-    },
-    "indexed_colors": [
-      {
-        "index": 16,
-        "color": "0xffa066"
-      },
-      {
-        "index": 17,
-        "color": "0xff5d62"
-      }
-    ]
-  }
-}
diff --git a/home-manager/alacritty/solarized.yaml b/home-manager/alacritty/solarized.yaml
deleted file mode 100644
index 1f9591c..0000000
--- a/home-manager/alacritty/solarized.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Colors (Solarized Light)
-colors:
-  # Default colors
-  primary:
-    background: '0xfdf6e3'
-    foreground: '0x586e75'
-
-  # Normal colors
-  normal:
-    black:   '0x073642'
-    red:     '0xdc322f'
-    green:   '0x859900'
-    yellow:  '0xb58900'
-    blue:    '0x268bd2'
-    magenta: '0xd33682'
-    cyan:    '0x2aa198'
-    white:   '0xeee8d5'
-
-  # Bright colors
-  bright:
-    black:   '0x002b36'
-    red:     '0xcb4b16'
-    green:   '0x586e75'
-    yellow:  '0x657b83'
-    blue:    '0x839496'
-    magenta: '0x6c71c4'
-    cyan:    '0x93a1a1'
-    white:   '0xfdf6e3'
diff --git a/home-manager/alacritty/tokyonight.json b/home-manager/alacritty/tokyonight.json
deleted file mode 100644
index a918eb0..0000000
--- a/home-manager/alacritty/tokyonight.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "colors": {
-    "primary": {
-      "background": "0x24283b",
-      "foreground": "0xc0caf5"
-    },
-    "normal": {
-      "black": "0x1d202f",
-      "red": "0xf7768e",
-      "green": "0x9ece6a",
-      "yellow": "0xe0af68",
-      "blue": "0x7aa2f7",
-      "magenta": "0xbb9af7",
-      "cyan": "0x7dcfff",
-      "white": "0xa9b1d6"
-    },
-    "bright": {
-      "black": "0x414868",
-      "red": "0xf7768e",
-      "green": "0x9ece6a",
-      "yellow": "0xe0af68",
-      "blue": "0x7aa2f7",
-      "magenta": "0xbb9af7",
-      "cyan": "0x7dcfff",
-      "white": "0xc0caf5"
-    },
-    "indexed_colors": [
-      {
-        "index": 16,
-        "color": "0xff9e64"
-      },
-      {
-        "index": 17,
-        "color": "0xdb4b4b"
-      }
-    ]
-  }
-}
-
diff --git a/home-manager/common.nix b/home-manager/common.nix
deleted file mode 100644
index 19a5c99..0000000
--- a/home-manager/common.nix
+++ /dev/null
@@ -1,289 +0,0 @@
-{ lib, pkgs, inputs, ... }: {
-  imports = [
-    ./compositor/hyprland.nix
-  ];
-  home.packages = [
-    pkgs.gnumake
-    pkgs.git-crypt
-    pkgs.maim
-    pkgs.xkcdpass
-    pkgs.speedtest-cli
-    pkgs.bitwarden-cli
-    # Language servers
-    pkgs.nixfmt-rfc-style
-    inputs.nil.packages."${pkgs.system}".nil
-    pkgs.pyright
-    pkgs.gopls
-    pkgs.lua-language-server
-    pkgs.ansible-language-server
-    pkgs.ansible-lint
-    # ---
-    pkgs.fd
-    pkgs.glow
-    pkgs.eza
-    pkgs.openssh
-
-    pkgs.cobra-cli
-    pkgs.yq-go
-
-    # Programming languages
-    pkgs.gleam
-    pkgs.erlang_26
-    pkgs.elixir_1_15
-    pkgs.elixir_ls
-
-    # Python formatted and linter
-    pkgs.python313
-    pkgs.black
-    pkgs.ruff
-
-    pkgs.font-awesome
-    pkgs.pinentry-gnome3
-  ];
-
-
-  home.sessionVariables = { EDITOR = "hx"; };
-  home.sessionPath = [ "$GOBIN" ];
-
-  programs.ripgrep.enable = true;
-  programs.bat.enable = true;
-  programs.btop.enable = true;
-  programs.go = {
-    enable = true;
-    goPath = "go";
-    goBin = "go/bin";
-  };
-  programs.rbw.enable = true;
-  programs.rbw.settings = {
-    email = "jaspert.ras@gmail.com";
-    pinentry = pkgs.pinentry-gnome3;
-  };
-
-  programs.zoxide = {
-    enable = true;
-    options = [ "--cmd cd" ];
-  };
-  programs.fzf.enable = true;
-
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-  };
-
-  programs.zsh = {
-    enable = true;
-    defaultKeymap = "emacs";
-    envExtra = ''
-      export ZVM_VI_INSERT_ESCAPE_BINDKEY="jk"
-    '';
-    initExtra = ''
-      # https://github.com/jeffreytse/zsh-vi-mode
-                  source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
-    '';
-    shellAliases = {
-      g = "git";
-    };
-  };
-
-  programs.git = {
-    enable = true;
-    aliases = {
-      b = "branch";
-      f = "fetch";
-      p = "pull";
-      s = "status";
-      co = "checkout";
-      pu = "push";
-      nb = "checkout -b";
-      db = "branch -D";
-      lg =
-        "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-      praise = "blame";
-      bump = "!git bump";
-      ae = "!git add -A && git commit --amend";
-      ad = "commit --amend";
-      ac = "!git add -A && git commit";
-      rmbs =
-        "!git branch | grep -wv master | grep -wv main | xargs git branch -D";
-    };
-    extraConfig = {
-      pull.rebase = false;
-      init.defaultBranch = "main";
-    };
-  };
-
-  programs.starship = {
-    enable = true;
-    settings = {
-      directory.style = "blue";
-
-      format = lib.concatStrings [
-        "$username"
-        "$hostname"
-        "$directory"
-        "$git_branch"
-        "$git_state"
-        "$git_status"
-        "$cmd_duration"
-        "$line_break"
-        "$python"
-        "$openstack"
-        "$character"
-      ];
-
-      character = {
-        success_symbol = "[❯](purple)";
-        error_symbol = "[❯](red)";
-        vimcmd_symbol = "[❮](green)";
-      };
-
-      git_branch = {
-        format = "[$branch]($style)";
-        style = "bright-black";
-      };
-
-      git_status = {
-        format =
-          "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)";
-        style = "cyan";
-        conflicted = "​";
-        untracked = "​";
-        modified = "​";
-        staged = "​";
-        renamed = "​";
-        deleted = "​";
-        stashed = "≡";
-      };
-
-      git_state = {
-        format = "'([$state( $progress_current/$progress_total)]($style))' ";
-        style = "bright-black";
-      };
-
-      cmd_duration = {
-        format = "[$duration]($style) ";
-        style = "yellow";
-      };
-
-      python = {
-        format = "[$virtualenv]($style) ";
-        style = "bright-black";
-      };
-    };
-  };
-
-  home.file = {
-    helix-ferra = {
-      source = ./static/helix-wavez.toml;
-      target = ".config/helix/themes/wavez.toml";      
-    };
-  };
-
-  programs.helix = {
-    enable = true;
-    package = inputs.helix.packages."${pkgs.system}".helix;
-    defaultEditor = true;
-    languages = {
-      language = [
-        {
-          name = "python";
-          language-servers = [ "pyright" "ruff" ];
-          formatter = { command = "black"; args = ["--line-length" "88" "--quiet" "-"]; };
-          auto-format = true;
-        }
-        {
-          name = "elixir";
-          language-servers = [ "elixir-ls" ];
-          formatter = { command = "mix format"; };
-          auto-format = true;
-        }
-      ];
-      language-server.pyright.config.python.analysis = { typeCheckingMode = "basic"; };
-      language-server.ruff = { command = "ruff"; };
-      language-server.ruff.config.setting = { args = ["--ignore" "E501" ]; };
-      language-server.intelephense = with pkgs.nodePackages; {
-        command = "${intelephense}/bin/intelephense";
-      };
-    };
-    settings = { 
-      theme = "wavez";
-      keys.normal = {
-        space.F = "file_picker_in_current_buffer_directory";
-      };
-      editor = {
-        end-of-line-diagnostics = "hint";
-        line-number = "relative";
-        bufferline = "always";
-        auto-save = false;
-
-        inline-diagnostics = {
-          cursor-line = "error";
-        };
-
-        lsp = {
-          enable = true;
-          display-messages = true;
-        };
-
-        indent-guides = {
-          render = true;
-          skip-levels = 1;
-        };
-      };
-     };
-  };
-
-  services.ssh-agent.enable = true;
-  programs.ssh = {
-    enable = true;
-    package = "${pkgs.openssh}";
-    addKeysToAgent = "yes";
-  };
-
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      window = {
-        padding = { x = 5; y = 2; };
-      };
-      env = { TERM = "alacritty-direct"; };
-      terminal.shell = {
-        program = "${pkgs.zsh}/bin/zsh";
-        args = [ "-l" ];
-      };
-    } // builtins.fromJSON (builtins.readFile ./static/alacritty-wavez.json);
-  };
-
-  programs.taskwarrior = {
-    enable = true;
-    package = "${pkgs.taskwarrior3}";
-  };
-
-  xdg.mimeApps = {
-    enable = true;
-    defaultApplications = {
-      "x-scheme-handler/http" = "firefox.desktop";
-      "x-scheme-handler/https" = "firefox.desktop";
-      "x-scheme-handler/chrome" = "firefox.desktop";
-      "text/html" = "firefox.desktop";
-      "application/x-extension-htm" = "firefox.desktop";
-      "application/x-extension-html" = "firefox.desktop";
-      "application/x-extension-shtml" = "firefox.desktop";
-      "application/xhtml+xml" = "firefox.desktop";
-      "application/x-extension-xhtml" = "firefox.desktop";
-      "application/x-extension-xht" = "firefox.desktop";
-    };
-    associations.added = {
-      "x-scheme-handler/http" = "firefox.desktop";
-      "x-scheme-handler/https" = "firefox.desktop";
-      "x-scheme-handler/chrome" = "firefox.desktop";
-      "text/html" = "firefox.desktop";
-      "application/x-extension-htm" = "firefox.desktop";
-      "application/x-extension-html" = "firefox.desktop";
-      "application/x-extension-shtml" = "firefox.desktop";
-      "application/xhtml+xml" = "firefox.desktop";
-      "application/x-extension-xhtml" = "firefox.desktop";
-      "application/x-extension-xht" = "firefox.desktop";
-    };
-  };
-}
diff --git a/home-manager/entrypoints/personal.nix b/home-manager/entrypoints/personal.nix
deleted file mode 100644
index 66924c7..0000000
--- a/home-manager/entrypoints/personal.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ../common.nix
-  ];
-  home.username = "jras";
-  home.homeDirectory = "/home/jras";
-  home.stateVersion = "23.11";
-
-  home.packages = [
-    pkgs.hugo
-    pkgs.dart-sass
-    pkgs.tailwindcss
-    pkgs.tailwindcss-language-server
-    pkgs.vscode-langservers-extracted
-  ];
-
-  programs.git = {
-    userName = "Jasper Ras";
-    userEmail = "jaspert.ras@gmail.com";
-  };
-
-  programs.helix = {
-    languages = {
-      language = [
-        {
-          name = "html";
-          language-servers = [ "vscode-html-language-server" "tailwindcss-language-server" ];
-        }
-        {
-          name = "css";
-          language-servers = [ "vscode-css-language-server" "tailwindcss-language-server" ];
-        }
-      ];
-    };
-  };
-
-  home.file = {
-    gamestream-start = {
-      text = ''
-      #!${pkgs.zsh}/bin/zsh
-      ${pkgs.hyprland}/bin/hyprctl keyword monitor HDMI-A-1,1920x1080@59.94,auto,1
-      '';
-      target = "bin/gamestream-start";
-      executable = true;
-    };
-    gamestream-end = {
-      text = ''
-      #!${pkgs.zsh}/bin/zsh
-      ${pkgs.hyprland}/bin/hyprctl keyword monitor HDMI-A-1,preferred,auto,1
-      '';
-      target = "bin/gamestream-end";
-      executable = true;
-    };
-  };
-
-  programs.zsh.envExtra = "export PATH=$HOME/bin:$PATH";
-}
diff --git a/home-manager/entrypoints/work.nix b/home-manager/entrypoints/work.nix
deleted file mode 100644
index bbaf4cc..0000000
--- a/home-manager/entrypoints/work.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{ pkgs, ... }: {
-  imports = [
-    ../common.nix
-    # ../systemd/llama.nix
-    ../hostnet.nix
-    ../programming-languages/php.nix
-  ];
-
-  home.username = "jras";
-  home.homeDirectory = "/home/jras";
-  home.stateVersion = "22.11";
-  home.sessionPath = [ "$HOME/.local/bin" "$HOME/.plenv/bin" ];
-
-  programs.git = {
-    userName = "Jasper Ras";
-    userEmail = "jras@hostnet.nl";
-    extraConfig = { gitreview.username = "jrasper"; };
-    ignores = [
-      ".direnv"
-      ".envrc"
-      ".project"
-      ".settings/"
-      ".buildpath"
-      "tags"
-      ".hhconfig"
-      ".DS_Store"
-      ".idea/"
-      ".vagrant/"
-      "*.swp"
-      "clover.xml"
-      "yarn-error.log"
-      "gsuite-auth.json"
-      "venv/"
-      "shell.nix"
-
-      ".devenv*"
-      "devenv*"
-      ".pre-commit-config.yaml"
-    ];
-  };
-
-  programs.zsh.envExtra = "export PATH=$HOME/.plenv/bin:$PATH";
-  programs.zsh.initExtra = ''
-    eval "$(plenv init -)"
-    eval "$(dircolors)"
-  '';
-  programs.zsh.shellAliases = {
-    ssh = "TERM=xterm-256color ssh";
-  };
-
-  programs.pyenv.enable = true;
-  programs.pyenv.enableZshIntegration = true;
-  programs.ssh = {
-    controlMaster = "auto";
-    controlPersist = "12h";
-    serverAliveInterval = 11;
-    matchBlocks = {
-      "*.g1i.one".user = "jasras";
-      "*.os1.openstack.group.one".user = "jasras";
-      "*.one.com".user = "jasras";
-      "91.184.16.185".port = 12345;
-      "*.compute.prv.vps1-testpod-cph3.one.com".forwardAgent = true;
-      "access.*.one.com".forwardAgent = true;
-      "access.*.g1i.one".forwardAgent = true;
-    };
-  };
-
-  home.file = {
-    set-display  = {
-      text = ''
-        #!/usr/bin/env bash
-        prev="eDP-1"
-        displays="$(xrandr -q | rg ' connected' | rg -v eDP-1 | cut -d' ' -f1)"
-
-        if [[ -z "$displays" ]]
-        then
-          xrandr --auto
-        fi
-
-        echo "$displays" | while read -r display
-        do
-          xrandr --output "$display" --right-of "$prev" --auto
-          prev="$display"
-        done
-      '';
-      target = "bin/set-display";
-      executable = true;
-    };
-  };
-}
diff --git a/home-manager/home.nix b/home-manager/home.nix
deleted file mode 100644
index e69de29..0000000
--- a/home-manager/home.nix
+++ /dev/null
diff --git a/home-manager/hostnet.nix b/home-manager/hostnet.nix
deleted file mode 100644
index 0c86f1c..0000000
--- a/home-manager/hostnet.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }:
-let nodePkgs = pkgs.nodePackages;
-in {
-  home.packages = [
-    pkgs.pre-commit
-    nodePkgs.webpack
-    nodePkgs.webpack-cli
-
-    (pkgs.writeShellScriptBin "use-toolbox" ''
-      source ${config.home.homeDirectory}/projects/toolbox/var/bootstrap.zsh
-    '')
-  ];
-
-  programs = {
-    rbenv = {
-      enable = true;
-      enableZshIntegration = true;
-      plugins = [{
-        name = "ruby-build";
-        src = pkgs.fetchFromGitHub {
-          owner = "rbenv";
-          repo = "ruby-build";
-          rev = "v20230717";
-          hash = "sha256-kvdANiz9R5pQMTBRHvxC5bfBewIhXc+sgRbe7V2rVU8=";
-        };
-      }];
-    };
-  };
-}
diff --git a/home-manager/programming-languages/php.nix b/home-manager/programming-languages/php.nix
deleted file mode 100644
index 589d9bd..0000000
--- a/home-manager/programming-languages/php.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }: {
-  programs.git.ignores = [
-    ".phpactor.json"
-    ".phpcomplete_extended/"
-    ".phpunit.result.cache"
-    ".phpcs.xml"
-  ];
-}