From 2c86143857855a80f3b21a0aac110f164f4f84d9 Mon Sep 17 00:00:00 2001
From: Tristan <tristan@tristans.cloud>
Date: Mon, 12 Feb 2024 14:30:43 +0000
Subject: [PATCH] rename files to specific program names

move editor module to vscode program
update work settings
---
 home/default.nix                              |  4 +-
 home/modules/editor.nix                       | 49 -------------------
 home/programs/graphical.nix                   |  5 +-
 home/programs/{fileman.nix => pcmanfm.nix}    |  0
 .../programs/{browser.nix => qutebrowser.nix} |  0
 home/programs/vscode.nix                      | 38 ++++++++++++++
 home/programs/work.nix                        | 36 +++++++-------
 home/programs/{shell.nix => zsh.nix}          |  0
 8 files changed, 62 insertions(+), 70 deletions(-)
 delete mode 100644 home/modules/editor.nix
 rename home/programs/{fileman.nix => pcmanfm.nix} (100%)
 rename home/programs/{browser.nix => qutebrowser.nix} (100%)
 create mode 100644 home/programs/vscode.nix
 rename home/programs/{shell.nix => zsh.nix} (100%)

diff --git a/home/default.nix b/home/default.nix
index 228ceb5..6730cce 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -10,18 +10,18 @@
     ./modules/terminal.nix
     ./modules/scripts.nix
     ./modules/email.nix
-    ./modules/editor.nix
     ./modules/mpd.nix
     ./modules/menu.nix
     ./modules/scripts.nix
 
+    ./programs/vscode.nix
     ./programs/graphical.nix
     ./programs/scripts.nix
     ./programs/neovim/.
     ./programs/helix.nix
     ./programs/git.nix
     ./programs/lf/.
-    ./programs/shell.nix
+    ./programs/zsh.nix
     {
       options.windowManager.modifierKey = lib.mkOption {default = "SUPER";};
     }
diff --git a/home/modules/editor.nix b/home/modules/editor.nix
deleted file mode 100644
index 73edbdb..0000000
--- a/home/modules/editor.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  editor = config.programs.editor;
-  pkg = editor.package;
-  menu = config.programs.menu.dmenuCommand;
-  editorCmd = "NIXOS_OZONE_WL= ${pkg}/bin/${pkg.executableName}";
-in {
-  options.programs = with lib; {
-    editor = {
-      package = mkPackageOption pkgs "vscodium" {
-        example = "pkgs.vscode";
-      };
-    };
-  };
-
-  config = {
-    programs.vscode = {
-      enable = true;
-      package = editor.package;
-      extensions = [];
-      userSettings = {
-        "keyboard.dispatch" = "keyCode";
-        "terminal.integrated.sendKeybindingsToShell" = true;
-        "aws.telemetry" = false;
-        "gitlens.telemetry.enabled" = false;
-        "redhat.telemetry.enabled" = false;
-        "cSpell.language" = "en,en-GB";
-      };
-    };
-
-    programs.scripts = [
-      {
-        name = "open-code";
-        text = ''
-          code_dir=~/Documents/code
-          cd $code_dir
-          repo=$(ls | ${menu})
-          [ -e "$repo" ] && ${editorCmd} $repo
-        '';
-        install = false;
-        hotkeys = [{key = "C";}];
-      }
-    ];
-  };
-}
diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix
index cd8c3fb..621906f 100644
--- a/home/programs/graphical.nix
+++ b/home/programs/graphical.nix
@@ -1,7 +1,7 @@
 {pkgs,lib, ...}: {
   imports = [
-    ./browser.nix
-    ./fileman.nix
+    ./qutebrowser.nix
+    ./pcmanfm.nix
     ./mpv.nix
   ];
 
@@ -28,6 +28,7 @@
     # other
     element-desktop
     brave
+    vieb
     bitwarden
     logseq
   ];
diff --git a/home/programs/fileman.nix b/home/programs/pcmanfm.nix
similarity index 100%
rename from home/programs/fileman.nix
rename to home/programs/pcmanfm.nix
diff --git a/home/programs/browser.nix b/home/programs/qutebrowser.nix
similarity index 100%
rename from home/programs/browser.nix
rename to home/programs/qutebrowser.nix
diff --git a/home/programs/vscode.nix b/home/programs/vscode.nix
new file mode 100644
index 0000000..86d8cfc
--- /dev/null
+++ b/home/programs/vscode.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  pkg = config.programs.vscode.package;
+  menu = config.programs.menu.dmenuCommand;
+  editorCmd = "NIXOS_OZONE_WL= ${pkg}/bin/${pkg.executableName}";
+in {
+  programs.vscode = {
+    enable = true;
+    package = lib.mkDefault pkgs.vscodium;
+    extensions = [];
+    userSettings = {
+      "keyboard.dispatch" = "keyCode";
+      "terminal.integrated.sendKeybindingsToShell" = true;
+      "aws.telemetry" = false;
+      "gitlens.telemetry.enabled" = false;
+      "redhat.telemetry.enabled" = false;
+      "cSpell.language" = "en,en-GB";
+    };
+  };
+
+  programs.scripts = [
+    {
+      name = "open-code";
+      text = ''
+        code_dir=~/Documents/code
+        cd $code_dir
+        repo=$(ls | ${menu})
+        [ -e "$repo" ] && ${editorCmd} $repo
+      '';
+      install = false;
+      hotkeys = [{key = "C";}];
+    }
+  ];
+}
diff --git a/home/programs/work.nix b/home/programs/work.nix
index 6f62a4f..5247e44 100644
--- a/home/programs/work.nix
+++ b/home/programs/work.nix
@@ -1,14 +1,18 @@
-{pkgs, ...}: {
+{config, pkgs, ...}:
+let
+  modifier = config.windowManager.modifierKey;
+  pwa = {
+    slack = "mpagibdhafmlkgpemeicgogjnhclenoc";
+    teams = "cifhbcnohmdccbgoicgdjpfamggdegmo";
+  };
+in
+{
   roles.email = {
     enable = true;
     email = "tristan.beedell@cryoserver.com";
     terminal = false;
   };
 
-  programs.editor = {
-    package = pkgs.vscode;
-  };
-
   home.packages = with pkgs; [
     onedrive
     kubectl
@@ -17,22 +21,19 @@
     minikube
     kubernetes-helm
     thunderbird
+    remmina
     (import ../../lib/mkapp.nix "slack" {
       inherit pkgs;
       desktopName = "Slack";
-      app-id = "mpagibdhafmlkgpemeicgogjnhclenoc";
+      app-id = pwa.slack;
       browser = "${brave}/opt/brave.com/brave/brave-browser";
     })
     (import ../../lib/mkapp.nix "teams" {
       inherit pkgs;
       browser = "${brave}/opt/brave.com/brave/brave-browser";
-      app-id = "cifhbcnohmdccbgoicgdjpfamggdegmo";
+      app-id = pwa.teams;
       desktopName = "Microsoft Teams";
     })
-    (pkgs.writeShellScriptBin "codex11" ''
-      NIXOS_OZONE_WL= ${pkgs.vscode}/bin/code $@
-    '')
-    remmina
   ];
 
   gtk.gtk3.bookmarks = [
@@ -40,6 +41,7 @@
   ];
 
   programs.vscode = {
+    package = pkgs.vscode;
     extensions = with pkgs; [
       vscode-extensions.ms-azuretools.vscode-docker
     ];
@@ -50,11 +52,11 @@
     };
   };
 
-  wayland.windowManager.hyprland = {
-    extraConfig = ''
-      # === WORK MODULE ===
-      bind = SUPER, E, focuswindow, thunderbird
-      bind = SUPER, t, focuswindow, brave-cifhbcnohmdccbgoicgdjpfamggdegmo-Profile_2
-    '';
+  wayland.windowManager.hyprland.settings = {
+    bind = [
+      "${modifier}, e, focuswindow, thunderbird"
+      "${modifier}, t, focuswindow, brave-${pwa.teams}-Profile_2"
+      "${modifier}, s, focuswindow, brave-${pwa.slack}-Profile_2"
+    ];
   };
 }
diff --git a/home/programs/shell.nix b/home/programs/zsh.nix
similarity index 100%
rename from home/programs/shell.nix
rename to home/programs/zsh.nix