this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

NixOS settings for non-flake home-maanger to build

Minor other cleanups, still need to figure out the real deal with
/run/current-system being in PATH automatically or whatever

+38 -27
-1
.config/fish/conf.d/50-config.fish
··· 84 84 ~/.cargo/bin \ 85 85 ~/.local/share/rbenv/shims \ 86 86 ~/.local/bin \ 87 - /run/current-system/sw/bin \ 88 87 $GOPATH/bin \ 89 88 node_modules/.bin \ 90 89 /usr/local/sbin \
+22 -22
.config/home-manager/home.nix
··· 1 - { config, lib, pkgs, unstable, ... }: 1 + inputs @ { config, lib, pkgs, ... }: 2 2 let 3 3 stdenv = pkgs.stdenv; 4 + unstable = inputs.unstable or (import <nixos-unstable> { }); 4 5 in 5 6 { 7 + home.username = "ianchamberlain"; 8 + home.homeDirectory = "/home/${config.home.username}"; 9 + 6 10 programs = { 7 11 # Let Home Manager install and manage itself. 8 12 home-manager.enable = true; 9 13 10 14 bat.enable = true; 11 - fd.enable = true; 15 + # fd.enable = true; 12 16 fish.enable = true; 13 17 git.enable = true; 14 18 gpg.enable = true; 15 19 htop.enable = true; 16 - neovim.enable = true; 20 + neovim = { 21 + enable = true; 22 + # https://github.com/NixOS/nixpkgs/issues/137829 23 + package = unstable.neovim-unwrapped; 24 + }; 17 25 ripgrep.enable = true; 18 26 }; 19 27 ··· 42 50 enable = true; 43 51 defaultCacheTtl = 432000; # 5 days 44 52 maxCacheTtl = 432000; 45 - pinentryPackage = pkgs.pinentry-curses; 53 + # TODO: guess this got removed on nixos?? 54 + # pinentryPackage = pkgs.pinentry-curses; 46 55 }; 47 56 }; 48 57 49 58 # TODO: should try to convert these to flake inputs probably 50 59 nixpkgs.overlays = [ 51 60 (final: prev: { 52 - lnav = prev.lnav.overrideAttrs (_: rec { 53 - version = "0.12.2"; 54 - 55 - # Can't just use an override, since lnav doesn't use finalAttrs pattern: 56 - # https://github.com/NixOS/nixpkgs/issues/293452 57 - src = pkgs.fetchFromGitHub { 58 - owner = "tstack"; 59 - repo = "lnav"; 60 - rev = "v${version}"; 61 - sha256 = "grEW3J50osKJzulNQFN7Gir5+wk1qFPc/YaT+EZMAqs="; 62 - }; 63 - }); 64 - 61 + /* TODO 65 62 htop = prev.htop.overrideAttrs (_: { 66 63 src = pkgs.fetchFromGitHub { 67 64 owner = "ian-h-chamberlain"; ··· 70 67 sha256 = ""; 71 68 }; 72 69 }); 70 + #*/ 73 71 }) 74 72 ]; 75 73 76 74 home.packages = with pkgs; [ 77 - # Fish completions + path setup stuff, needed since I'm not letting 78 - # home-manager do all the shell setup for me. Most notably, this creates 79 - # ~/.nix-profile/etc/profile.d/nix.fish - don't remove without a replacement! 80 - config.nix.package 81 - 82 75 cacert 83 76 docker-compose 84 77 git-crypt 78 + git-lfs 85 79 unstable.lnav 86 80 nil 87 81 unstable.nixd 88 82 nixpkgs-fmt 83 + rustup 89 84 shellcheck 90 85 thefuck 91 86 tree ··· 93 88 tmux.terminfo 94 89 unzip 95 90 yadm 91 + ] ++ lib.optionals stdenv.isDarwin [ 92 + # Fish completions + path setup stuff, needed since I'm not letting 93 + # home-manager do all the shell setup for me. Most notably, this creates 94 + # ~/.nix-profile/etc/profile.d/nix.fish - don't remove without a replacement! 95 + config.nix.package 96 96 ]; 97 97 98 98 # TODO: https://github.com/nix-community/home-manager/issues/5602
+1
.config/nixos/prismo/configuration.nix
··· 168 168 brightnessctl 169 169 docker 170 170 git 171 + python3 171 172 hfsprogs 172 173 firefox 173 174 lm_sensors
+3
.config/yadm/.pre-commit-config.yaml
··· 4 4 - id: check-hooks-apply 5 5 - id: check-useless-excludes 6 6 7 + # NOTE: requires rustup to be preinstalled on NixOS, otherwise run into 8 + # some nix-ld type of issues when pre-commit attempts to download rustup 9 + # Also seems like it needs some kind of `cc` available for the build. 7 10 - repo: https://github.com/JohnnyMorganz/StyLua 8 11 rev: v0.20.0 9 12 hooks:
-1
.config/yadm/alt/.gnupg/gpg-agent.conf##os.Linux,distro.nixos
··· 1 - pinentry-program /home/ianchamberlain/.nix-profile/bin/pinentry
+10 -1
.config/yadm/bootstrap
··· 38 38 yadm submodule update --init 39 39 40 40 # Include "shared" git config in yadm repo 41 - yadm enter git config --local include.path ~/.config/yadm/.gitconfig 41 + yadm gitconfig --local include.path ~/.config/yadm/.gitconfig 42 + 43 + # Install pre-commit hook, and tell it to point at custom config location 44 + yadm enter \ 45 + ~/.config/yadm/hooks/pre-commit.pyz install \ 46 + --config ~/.config/yadm/.pre-commit-config.yaml 47 + 48 + # For flakes to work nicely, see flake.nix for details 49 + # TODO: maybe could be done as part of home-manager setup instead... 50 + ln -s "$(yadm rev-parse --git-dir)" ~/.config/.git 42 51 43 52 # Ensure yadm alt SSH config files are set with the right permissions 44 53 chmod go-rw ~/.config/yadm/alt/.ssh/*
+2 -2
.gitconfig
··· 11 11 hardreset = reset --hard @{u} 12 12 fpush = push --force-with-lease 13 13 ld = log --pretty=format:\"%C(yellow)%h\\ %ad%C(red)%d\\ %C(reset)%s%C(blue)\\ [%cn]\" --decorate --date=relative 14 - ls = !sh -c 'git log --reverse --no-merges --pretty=format:\"%C(yellow)%h %C(reset)%s\" --decorate \"$1\"..HEAD' - 14 + lg = !sh -c 'git log --reverse --no-merges --pretty=format:\"%C(yellow)%h %C(reset)%s\" --decorate \"$1\"..HEAD' - 15 15 sw = switch 16 16 softreset = reset --soft HEAD~ 17 17 default-branch = !git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@' ··· 37 37 su = submodule update 38 38 copy = !fish -c \"git diff $argv | fish_clipboard_copy\" - 39 39 paste = !fish -c \"fish_clipboard_paste | git apply\" 40 - env = "!sh -c 'echo \"GIT_DIR=$(git rev-parse --git-dir)\"; echo \"GIT_COMMON_DIR=$(git rev-parse --git-common-dir)\"; echo \"GIT_WORK_TREE=$(git rev-parse --show-toplevel)\"'" 40 + ls = ls-files 41 41 [core] 42 42 editor = vim 43 43 quotePath = true