begin to modularise

system/global/home.nix

@@ -62,18 +62,6 @@ let
       ${my-deps.notify-send} "Brightness" -h int:value:$(light) -a brightness-up -t 1000
     '');
 
-    open-code = (pkgs.writeShellScriptBin "open-code" ''
-      code_dir=~/Documents/code
-      cd $code_dir
-      repo=$({ ls && echo clone-repo; } | ${my-deps.menu})
-      case $repo in
-        clone-repo)
-          url=$(wl-paste)
-          ${my-deps.terminal} -e -- git clone "$url" ;;
-        *) [ -e "$repo" ] && my-editor $repo ;;
-      esac
-    '');
-
     switch-window = (pkgs.writeShellScriptBin "switch-window" ''
       ${my-deps.hyprctl} clients -j | \
         ${my-deps.jq} '.[] | .title' -r | \
@@ -187,7 +175,6 @@ in
       bind = SUPER, Z,       exec, ${pkgs.wlogout}/bin/wlogout
       bind = SUPER, M,       exec, ${ my-deps.terminal } -e ncmpcpp
       bind = SUPER, O,       exec, pcmanfm
-      bind = SUPER, C,       exec, ${ my-scripts.open-code }/bin/open-code
       bind = SUPER, TAB,     exec, ${ my-scripts.switch-window }/bin/switch-window
       bind = SUPER, G,       exec, ${ pkgs.hyprpicker }/bin/hyprpicker | wl-copy && notify-send "Copied Colour" "$(wl-paste)"
       bind = SUPER, EQUAL,   exec, hyprctl keyword misc:cursor_zoom_factor 2
@@ -441,8 +428,6 @@ in
   };
 
   programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
     extensions = with pkgs; [
       vscode-extensions.asvetliakov.vscode-neovim
       vscode-extensions.jnoortheen.nix-ide
@@ -915,7 +900,6 @@ color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-
           "${modifier}+SHIFT+P" = "exec ${ my-scripts.bwotpmenu }/bin/bwotpmenu";
           "${modifier}+SHIFT+S" = "exec ${ my-scripts.screenshot }/bin/screenshot";
           "${modifier}+M" = "exec ${ my-deps.terminal } -e ncmpcpp";
-          "${modifier}+C" = "exec ${ my-scripts.open-code }/bin/open-code";
           "${modifier}+Z" = "exec ${pkgs.swaylock-effects}/bin/swaylock -f";
         };
       bars = [ ];

system/work/home.nix

@@ -6,36 +6,13 @@
 
   home.packages = with pkgs; [
     sbctl
-    onedrive
-    kubectl
-    awscli2
-    docker-compose
-    minikube
-    kubernetes-helm
     gimp
     libreoffice
-    ansible
-    thunderbird
-    (pkgs.writeShellScriptBin "my-editor" ''
-      ${pkgs.vscode}/bin/code --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations $@
-    '')
-    (import ../../lib/mkapp.nix "slack" {
-      inherit pkgs;
-      desktopName = "Slack";
-      app-id = "mpagibdhafmlkgpemeicgogjnhclenoc";
-      browser = "${brave}/opt/brave.com/brave/brave-browser";
-    })
     (pkgs.makeDesktopItem {
       name = "logseq";
       desktopName = "Logseq";
       exec = "${logseq}/bin/logseq --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --disable-gpu";
     })
-    (import ../../lib/mkapp.nix "teams" {
-      inherit pkgs;
-      browser = "${brave}/opt/brave.com/brave/brave-browser";
-      app-id = "cifhbcnohmdccbgoicgdjpfamggdegmo";
-      desktopName = "Microsoft Teams";
-    })
   ];
 
   programs.git = {
@@ -48,13 +25,6 @@
       ## work laptop configuration
       exec-once = ${pkgs.swaybg}/bin/swaybg -o eDP-1 -i ~/Pictures/backgrounds/nix-soft.png &
 
-      monitor = eDP-1, preferred, 0x0, 1.2
-      monitor = HDMI-A-1, 1920x1080@144, auto, 1
-
-      input {
-        kb_variant = dvorak
-      }
-
       general {
         gaps_out = 10
         border_size = 3
@@ -64,25 +34,8 @@
     '';
   };
 
-  gtk = {
-    gtk3.bookmarks = [
-      "file:///home/tristan/OneDrive/Documents/ OneDrive"
-    ];
-  };
-
   programs.firefox.enable = true;
 
-  programs.vscode = {
-    package = lib.mkForce pkgs.vscode;
-    extensions = with pkgs; [
-      vscode-extensions.ms-azuretools.vscode-docker
-    ];
-    userSettings = {
-      "aws.telemetry" = false;
-      "gitlens.telemetry.enabled" = false;
-    };
-  };
-
   # wayland.windowManager.hyprland.enable = lib.mkForce false;
   # wayland.windowManager.sway.enable = true;
   # wayland.windowManager.sway.package = pkgs.swayfx;

system/work/system.nix

@@ -5,28 +5,6 @@
 
   networking.hostName = "FCS-Tristan-Nixbook";
 
-  services.xserver = {
-    layout = "gb";
-    xkbVariant = "dvorak";
-    xkbOptions = "caps:escape";
-  };
-
-  environment.systemPackages = with pkgs; [
-    openvpn
-    openvpn3
-  ];
-
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    # nonfree vscode required for dev containers
-    "vscode"
-  ];
-
-  networking = {
-    networkmanager = {
-      plugins = [ pkgs.networkmanager-openvpn ];
-    };
-  };
-
   boot.kernel.sysctl = {
     "net.ipv4.ip_unprivileged_port_start" = 53;
   };
@@ -79,11 +57,5 @@
     };
   };
 
-  services.greetd = {
-    settings = rec {
-      # default_session = lib.mkForce sway_session;
-    };
-  };
-
 }