From d4f14743ef9c7906051bda0ef1c3195621080c3b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 5 Jul 2023 17:30:17 +0200 Subject: [PATCH] stuff --- README.md | 16 ++++++++++++++++ flake.nix | 17 ++++++++++++++++- profiles/podman.nix | 2 +- users/pbsds/home/profiles/mpv.nix | 3 ++- users/pbsds/home/profiles/shell.nix | 23 ++++++++++++----------- 5 files changed, 47 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index bed2f65..018d161 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,22 @@ * [x] Setup some remote-development and deploy flow * [ ] host older versions of nixpkgs documentation (like 20.09) * [x] add a hidpi profile? https://wiki.archlinux.org/title/HiDPI +* [ ] desktop entries + * https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/packages/hey/default.nix +* [ ] https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/packages/xdg-open-with-portal/default.nix + * [ ] extend it to work over ssh +* [ ] https://github.com/fufexan/nix-gaming/tree/b090e8b7e463d9c437536b25a0e9af3477a269e9#pipewire-low-latency +* [ ] https://search.nixos.org/packages?query=heroic +* [ ] [doukutsu-rs](https://github.com/jakehamilton/config/tree/579827c699d9c78bd42e73f543eafb05a0d6c374#doukutsu-rs) +* [ ] [doas](https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/modules/security/doas/default.nix) +* [ ] [gpg](https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/modules/security/gpg/default.nix) +* [ ] [keyring](https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/modules/security/keyring/default.nix) +* [ ] [avahi](https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/modules/services/avahi/default.nix) +* [ ] [kvm](https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/modules/virtualisation/kvm/default.nix) +* [ ] shares + * [ ] [samba](https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/modules/services/samba/default.nix) + * [ ] nfs + * [ ] [zfs](https://github.com/jakehamilton/config/blob/579827c699d9c78bd42e73f543eafb05a0d6c374/modules/system/zfs/default.nix) * [ ] rocm * [ ] cuda * [ ] xclip diff --git a/flake.nix b/flake.nix index 54bae0a..b336403 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,21 @@ pr-polaris14.url = "github:pbsds/nixpkgs/polaris-14"; }; + nixConfig.extra-substituters = [ + "https://cuda-maintainers.cachix.org" + "https://nix-community.cachix.org" + "https://nixos-rocm.cachix.org" + "https://nixpkgs-unfree.cachix.org" + "https://numtide.cachix.org" + ]; + nixConfig.extra-trusted-public-keys = [ + "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" + ]; + outputs = { self, nixpkgs, @@ -148,7 +163,7 @@ }); devShells = forAllSystems ({ pkgs, flakes, ... }: let - mkShell = packages: pkgs.mkShell.override (old: { stdenv = pkgs.stdenvNoCC; }) { inherit packages; }; + mkShell = packages: pkgs.mkShellNoCC { inherit packages; }; envrc-pkgs = [ flakes.self.pkgs.nixos-rebuild-nom pkgs.home-manager diff --git a/profiles/podman.nix b/profiles/podman.nix index dd1bc87..d9fa014 100644 --- a/profiles/podman.nix +++ b/profiles/podman.nix @@ -9,7 +9,7 @@ #virtualisation.podman.autoPrune.flags = [ "--all" ]; environment.systemPackages = with pkgs; [ - #podman-compose + #podman-compose # TODO: docker-compose alias to this podman-tui ]; diff --git a/users/pbsds/home/profiles/mpv.nix b/users/pbsds/home/profiles/mpv.nix index 898047e..48f491a 100644 --- a/users/pbsds/home/profiles/mpv.nix +++ b/users/pbsds/home/profiles/mpv.nix @@ -9,7 +9,8 @@ programs.mpv.scripts = with pkgs.mpvScripts; [ #thumbnail # TOO SLOW - #mpris + thumbfast + mpris # TODO: thumbfast flakes.self.pkgs.mpv-webm # activate with SHIFT+W # from https://github.com/mpv-player/mpv/issues/9767#issuecomment-1024831645 diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index c4f3130..c97a5d9 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -15,6 +15,17 @@ # Warn if closing shell with running jobs. "checkjobs" ]; + programs.bash.initExtra = '' + parse_git_branch() { + git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' + } + export PS1='\[\033[01;32m\]\u@\h\[\033[01;37m\] \[\033[01;34m\]\W\[\033[33m\]$(parse_git_branch)\[\033[01;32m\]\$\[\033[00m\] ' + + # tldr + if command -v tldr >/dev/null; then + complete -F _command tldr + fi + ''; imports = [ ../modules/jump.nix ]; programs.jump.enableBash = true; # TODO: upstream? @@ -29,6 +40,7 @@ home.shellAliases.dc = "cd"; programs.direnv.enable = true; + programs.direnv.nix-direnv.enable = true; programs.tealdeer.enable = true; @@ -77,15 +89,4 @@ aha ]; - programs.bash.initExtra = '' - parse_git_branch() { - git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' - } - export PS1='\[\033[01;32m\]\u@\h\[\033[01;37m\] \[\033[01;34m\]\W\[\033[33m\]$(parse_git_branch)\[\033[01;32m\]\$\[\033[00m\] ' - - # tldr - if command -v tldr >/dev/null; then - complete -F _command tldr - fi - ''; }