diff options
| -rw-r--r-- | hosts/mercury/config.nix | 3 | ||||
| -rw-r--r-- | hosts/mercury/hjem.nix | 46 | ||||
| -rw-r--r-- | hosts/mercury/nixos.nix | 5 | ||||
| -rw-r--r-- | modules/terminal/workflow.md | 8 |
4 files changed, 16 insertions, 46 deletions
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index 0fe641a..e5d8720 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -53,13 +53,12 @@ fzf.enable = true; bat.enable = true; eza.enable = true; + broot.enable = true; helix = { enable = true; hardMode = true; }; - tmux.enable = true; - lazygit.enable = true; git = { enable = true; diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix index 793ee2a..bb08a33 100644 --- a/hosts/mercury/hjem.nix +++ b/hosts/mercury/hjem.nix @@ -1,40 +1,28 @@ -{ - pkgs, - inputs, - ... -}: let - captiveBrowserDesktop = pkgs.makeDesktopItem { - name = "captive-browser"; - desktopName = "Captive Browser"; - exec = "${pkgs.captive-browser}/bin/captive-browser"; - icon = "web-browser"; - terminal = false; - categories = ["Application"]; - }; -in { +{pkgs, ...}: { packages = with pkgs; [ - tor-browser # don't ask - obsidian - kdePackages.kleopatra anki - musescore libreoffice-qt - mpv - bluetuith - + kdePackages.kleopatra prismlauncher + mpv + musescore vital - captive-browser # https://words.filippo.io/captive-browser - captiveBrowserDesktop - # inputs.glide-browser.packages."x86_64-linux".default - # inputs.vermilion.packages."x86_64-linux".default + bluetuith + (pkgs.callPackage ../../pkgs/yo {}) - # (pkgs.callPackage ../../pkgs/yoshi.nix {inherit inputs;}) - (pkgs.callPackage ../../pkgs/yo {inherit inputs;}) + captive-browser # https://words.filippo.io/captive-browser + (pkgs.makeDesktopItem { + name = "captive-browser"; + desktopName = "Captive Browser"; + exec = "${pkgs.captive-browser}/bin/captive-browser"; + icon = "web-browser"; + terminal = false; + categories = ["Application"]; + }) ]; files.".config/captive-browser.toml".text = '' @@ -51,8 +39,4 @@ in { socks5-addr = "localhost:1666" ''; - - files.".config/yo.conf".text = '' - sudo run0 --background= - ''; } diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 8c98245..21907e5 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -55,11 +55,6 @@ Host ganymede HostName williamsfam.us.com Port 22 - - Host gliese - HostName 20.251.8.247 - Port 22 - IdentityFile ~/Gliese_key_2.pem ''; programs.firefox.policies.ExtensionSettings = { diff --git a/modules/terminal/workflow.md b/modules/terminal/workflow.md deleted file mode 100644 index f7c80ac..0000000 --- a/modules/terminal/workflow.md +++ /dev/null @@ -1,8 +0,0 @@ -# Terminal Workflow - -Each project that I'm working on has its own tmux session. -Using a variation of ThePrimeagen's tmux-sessionizer, I can switch to any project with `C-f`. - -Within a session, I use multiple panes and windows to organize my commands. -To open an existing file, get to a shell (either a new window, new pane, or freeing up the current pane), and hit `br` to launch broot. -From there, I can fuzzy find to the file, and hit `enter` to open it in Helix. |