diff --git a/homes/x86_64-linux/christopher@cobalt/config.nix b/homes/x86_64-linux/christopher@cobalt/config.nix index d0d809a..036fc0e 100644 --- a/homes/x86_64-linux/christopher@cobalt/config.nix +++ b/homes/x86_64-linux/christopher@cobalt/config.nix @@ -1,6 +1,5 @@ {lib, ...}: -with builtins; let - # Determines whether the given file name ends with ".nix" - endsWithNix = fileName: substring (lib.trivial.max 0 (stringLength fileName - 4)) 4 fileName == ".nix"; -in - map (name: ./config + "/${name}") (filter endsWithNix (attrNames (readDir ./config))) +with builtins; + map + (name: ./config + "/${name}") + (filter (lib.strings.hasSuffix ".nix") (attrNames (readDir ./config))) diff --git a/homes/x86_64-linux/christopher@cobalt/config/dev.nix b/homes/x86_64-linux/christopher@cobalt/config/dev.nix index 6847ea4..e12228f 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/dev.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/dev.nix @@ -1,24 +1,18 @@ {pkgs, ...}: { home.packages = with pkgs; [ - # Dev tools - direnv - silver-searcher # ag search tool zx # Tool for writing better scripts trurl # Parsing and manipulating URLs via CLI onefetch # Git information tool - cloc # Line-of-code calc for entire project tokei # Like cloc - delta # Diffing tool zeal # Offline documentation browser just # Just a command runner + claude-code # Build tools cargo glibc gcc - claude-code - php82 php82Packages.composer @@ -27,24 +21,8 @@ nodejs_20.pkgs.pnpm ]; - # `nix-shell` replacement for project development - # Most useful with `pkgs.direnv` - services.lorri.enable = true; programs.direnv.enable = true; programs.direnv.nix-direnv.enable = true; programs.go.enable = true; - - programs.neovim = { - enable = false; - # defaultEditor = true; - viAlias = true; - vimAlias = true; - - # extraConfig = lib.fileContents ../fixtures/neovim/init.vim; - - #plugins = with pkgs.vimPlugins; [ - # nvim-treesitter.withAllGrammars - #]; - }; } diff --git a/homes/x86_64-linux/christopher@cobalt/config/fonts.nix b/homes/x86_64-linux/christopher@cobalt/config/fonts.nix index 481d895..8071e3c 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/fonts.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/fonts.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { home.packages = with pkgs; [ + font-manager nerd-fonts.monaspace # Patched fonts google-fonts # Google fonts monaspace diff --git a/homes/x86_64-linux/christopher@cobalt/config/git.nix b/homes/x86_64-linux/christopher@cobalt/config/git.nix index e539885..911f9aa 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/git.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/git.nix @@ -4,7 +4,8 @@ git gh gitAndTools.git-absorb - delta + delta # Diffing tool + onefetch # neofetch for git repos pkgs._elements.git-delete-stale ]; diff --git a/homes/x86_64-linux/christopher@cobalt/default.nix b/homes/x86_64-linux/christopher@cobalt/default.nix index 0191fb4..a9fb104 100644 --- a/homes/x86_64-linux/christopher@cobalt/default.nix +++ b/homes/x86_64-linux/christopher@cobalt/default.nix @@ -1,7 +1,6 @@ { pkgs, config, - lib, ... } @ all: { imports = diff --git a/homes/x86_64-linux/christopher@cobalt/editors/nvim/config/.keep b/homes/x86_64-linux/christopher@cobalt/editors/nvim/config/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/homes/x86_64-linux/christopher@cobalt/editors/nvim/default.nix b/homes/x86_64-linux/christopher@cobalt/editors/nvim/default.nix deleted file mode 100644 index af74d53..0000000 --- a/homes/x86_64-linux/christopher@cobalt/editors/nvim/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - home.packages = with pkgs; [neovim ripgrep]; - - xdg.configFile.nvim.source = ./config; - - # Install the packer.nvim plugin manager - home.file = { - ".local/state/nix/profile/share/nvim/site/pack/packer/start/packer.nvim".source = pkgs.fetchFromGitHub { - owner = "wbthomason"; - repo = "packer.nvim"; - rev = "ea0cc3c"; - sha256 = "fLM+ptjMd1YNoJQEI0vvr4sjaay7dfpaGhvWUy91d1M="; - }; - }; -} diff --git a/homes/x86_64-linux/christopher@cobalt/global/terminal/default.nix b/homes/x86_64-linux/christopher@cobalt/global/terminal/default.nix index 07b5ff3..419d993 100644 --- a/homes/x86_64-linux/christopher@cobalt/global/terminal/default.nix +++ b/homes/x86_64-linux/christopher@cobalt/global/terminal/default.nix @@ -20,6 +20,7 @@ in { BROWSER = "firefox"; TERMINAL = "kitty"; EDITOR = "hx"; + TERM = "xterm-color"; # QT_QPA_PLATFORMTHEME = "qt5ct"; # auto-run programs using nix-index-database diff --git a/homes/x86_64-linux/christopher@cobalt/global/terminal/programs/cli.nix b/homes/x86_64-linux/christopher@cobalt/global/terminal/programs/cli.nix index e5e5ab9..11bb949 100644 --- a/homes/x86_64-linux/christopher@cobalt/global/terminal/programs/cli.nix +++ b/homes/x86_64-linux/christopher@cobalt/global/terminal/programs/cli.nix @@ -1,33 +1,17 @@ -{ - pkgs, - config, - ... -}: { +{pkgs, ...}: { home.packages = with pkgs; [ # Shell software fzf # Fuzzy finding - eza # ls alternative - httpie # HTTP client / CURL alternative + bat # cat alternative yazi # Terminal file manager - - # Little thingies - gum - - gh - gitAndTools.git-absorb - direnv - zellij # terminal workspace silver-searcher # ag search tool - zx # Tool for writing better scripts - trurl # Parsing and manipulating URLs via CLI - onefetch # Git information tool - cloc # Line-of-code calc for entire project - delta # Diffing tool + gum + + httpie # HTTP client / CURL alternative genact # Jibberish output ("I'm waiting for a compile.") cbonsai # Create bonsai trees - wtfutil ]; programs = { diff --git a/homes/x86_64-linux/christopher@cobalt/global/terminal/shell/aliases.nix b/homes/x86_64-linux/christopher@cobalt/global/terminal/shell/aliases.nix index 028a87f..d77b1bf 100644 --- a/homes/x86_64-linux/christopher@cobalt/global/terminal/shell/aliases.nix +++ b/homes/x86_64-linux/christopher@cobalt/global/terminal/shell/aliases.nix @@ -3,12 +3,12 @@ elements = "just -f ~/.dotfiles/Justfile -d ~/.dotfiles"; elem = "elements"; g = "git"; - copy = lib.mkDefault "xclip -sel clip"; + copy = lib.mkDefault "wl-copy"; inspect = "tmux -f ~/.tmux.inspect.conf new-session ssh inspect"; ansi = "sed -r \"s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]//g\""; - ssh = "TERM=xterm-color ssh"; calc = "numbat --pretty-print never -e"; pcalc = "numbat --pretty-print always -e"; + cat = "bat"; vim = "hx"; vi = "hx"; };