From 6aed85b86d68b9922d073aa8207355f67d588825 Mon Sep 17 00:00:00 2001 From: Ethan Reece Date: Tue, 8 Jul 2025 15:35:22 -0500 Subject: [PATCH] Move packages from Guix Home --- home.nix | 164 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 141 insertions(+), 23 deletions(-) diff --git a/home.nix b/home.nix index 8e68057..7e6c900 100644 --- a/home.nix +++ b/home.nix @@ -1,11 +1,5 @@ { pkgs, nixgl, config, ... }: -# let -# nixglPkg = nixgl.lib.${pkgs.system}.makeNixGL { -# inherit pkgs; -# enable32bits = false; -# }; -# in let localFastModel = "qwen2.5-coder-num_ctx"; localReasoningModel = "deepseek-r1-num_ctx"; @@ -24,13 +18,6 @@ in vulkan.enable = true; }; home = { - # This value determines the Home Manager release that your configuration is - # compatible with. This helps avoid breakage when a new Home Manager release - # introduces backwards incompatible changes. - # - # You should not change this value, even if you update Home Manager. If you do - # want to update the value, then make sure to first check the Home Manager - # release notes. stateVersion = "24.11"; username = "sudoer777"; homeDirectory = "/home/sudoer777"; @@ -39,22 +26,57 @@ in pkgs.nixd pkgs.nil pkgs.nixfmt-rfc-style - pkgs.teams-for-linux + pkgs.teams-for-linux # TODO: Move to flake in UTD folder # pkgs.simplex-chat-desktop - not available on aarch64 pkgs.signal-desktop - pkgs.bitwarden-desktop - pkgs.element-desktop # switch to programs.element-desktop - pkgs.logseq + pkgs.bitwarden-desktop # TODO: switch to rbw + pkgs.element-desktop # TODO: switch to programs.element-desktop + pkgs.logseq # TODO: switch to joplin-desktop (config.lib.nixGL.wrap pkgs.kdePackages.audiotube) - pkgs.librewolf # switch to programs.librewolf + pkgs.librewolf # TODO: switch to programs.librewolf # pkgs.firefoxpwa - requires system access # pkgs.widevine-cdm - doesn't work # pkgs.firefox - pkgs.aider-chat-full - pkgs.codex # switch to programs.codex pkgs.lsp-ai - pkgs.zed-editor-fhs # switch to programs.zed-editor + pkgs.zed-editor-fhs # TODO: switch to programs.zed-editor + pkgs.uutils-coreutils-noprefix + pkgs.uutils-diffutils + pkgs.uutils-findutils + pkgs.util-linux # TODO: switch to uutils when available + pkgs.iputils + pkgs.procps # TODO: switch to uutils when available + pkgs.procs + # pkgs.sudo-rs - TODO: should be used on NixOS + pkgs.psmisc + pkgs.dino + pkgs.julia + pkgs.telegram-desktop + pkgs.gzip + pkgs.gnutar + pkgs.iproute2 + pkgs.ncurses + pkgs.bzip3 + pkgs.xz pkgs.ladybird + pkgs.kdePackages.falkon + pkgs.curl + pkgs.wget + pkgs.mailutils + pkgs.lsof + pkgs.strace + pkgs.tcpdump + pkgs.file + pkgs.e2fsprogs + pkgs.speedtest-cli + pkgs.pijul + pkgs.lm_sensors + pkgs.libreoffice-fresh + pkgs.kdePackages.dolphin + pkgs.mupdf + pkgs.acpi + # pkgs.cacert - TODO: should be used on NixOS + # pkgs.cups - TODO: should be used on NixOS + # pkgs.languagetool - TODO: should be used on NixOS # (config.lib.nixGL.wrap pkgs.firefox-devedition) # pkgs.slacky - doesn't work, requires update # pkgs.high-tide - doesn't work @@ -64,8 +86,12 @@ in sessionVariables = {}; }; programs = { - home-manager.enable = true; - chromium.enable = true; + home-manager = { + enable = true; + }; + chromium = { + enable = true; + }; freetube = { enable = true; package = (config.lib.nixGL.wrap pkgs.freetube); @@ -80,9 +106,101 @@ in useDeArrowThumbnails = true; }; }; + mpv = { + enable = true; + }; + feh = { + enable = true; + }; + # TODO: Disable Guix integration + # zathura = { + # enable = true; + # }; + man = { + enable = true; + }; + # TODO: Disable Guix integration + # password-store = { + # enable = true; + # }; + bat = { + enable = true; + }; nix-your-shell = { enable = true; }; + wezterm = { + enable = true; + }; + fzf = { + enable = true; + }; + vim = { + enable = true; + }; + yt-dlp = { + enable = true; + }; + # TODO: Disable Guix integration + # helix = { + # enable = true; + # defaultEditor = true; + # settings = { + # editor.soft-wrap = { + # enable = true; + # }; + # }; + # }; + # TODO: Disable Guix integration + # nushell = { + # enable = true; + # settings = { + # completions = { + # algorithm = "fuzzy"; + # external.enable = true; + # }; + # }; + # shellAliases = { + # aichat_reasoning_remote = "aichat --model openrouter:${remoteReasoningModel}"; + # aichat_reasoning_local = "aichat --model ollama:${localReasoningModel}"; + # aichat_fast_remote = "aichat --model openrouter:${remoteFastModel}"; + # aichat_fast_local = "aichat --model ollama:${localFastModel}"; + # codex_remote = "codex --provider openrouter --model ${remoteFastModel}"; + # codex_local = "codex --provider ollama --model ${localFastModel}"; + # }; + # }; + # TODO: Disable Guix integration + # starship = { + # enable = true; + # }; + # carapace = { + # enable = true; + # }; + # TODO: Disable Guix integration + # kitty = { + # enable = true; + # enableGitIntegration = true; + # font = { + # package = pkgs.nerd-fonts.jetbrains-mono; + # # Add name? + # }; + # settings = { + # clipboard_control = ["write-primary" "write-clipboard" "no-append"]; + # }; + # }; + # TODO: Disable Guix integration + # git = { + # enable = true; + # delta = { + # enable = true; + # }; + # signing = { + # format = "openpgp"; + # signByDefault = true; + # }; + # userEmail = "contact@ethanreece.com"; + # userName = "Ethan Reece"; + # }; gh = { enable = true; settings = {