diff options
| author | Collin Williams <96917990+bluedragon1221@users.noreply.github.com> | 2026-03-04 16:48:13 -0600 |
|---|---|---|
| committer | Collin Williams <96917990+bluedragon1221@users.noreply.github.com> | 2026-03-04 16:49:11 -0600 |
| commit | 3ccf3147edf663271960826c79a4213bc3b3eb8f (patch) | |
| tree | bc8f66053ea692cd97bcc733944eb4eff9d1f679 /hosts | |
| parent | 49d711586bfa523d5d1385373df6c422bf35b712 (diff) | |
refactor mercury config
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/mercury/config.nix | 3 | ||||
| -rw-r--r-- | hosts/mercury/hjem.nix | 46 | ||||
| -rw-r--r-- | hosts/mercury/nixos.nix | 5 |
3 files changed, 16 insertions, 38 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 = { |