Compare commits
No commits in common. "5d30c3ba23a5dee37b14be0b4b3611d0d55201cb" and "c527b73d2cf2a91b546e56e885719e4c00ccba70" have entirely different histories.
5d30c3ba23
...
c527b73d2c
@ -67,8 +67,6 @@
|
||||
overlays = [
|
||||
inputs.agenix.overlays.default
|
||||
inputs.neovim-nightly-overlay.overlay
|
||||
self.overlays.modifications
|
||||
self.overlays.additions
|
||||
];
|
||||
}
|
||||
)
|
||||
@ -115,8 +113,8 @@
|
||||
default = pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
age
|
||||
agenix
|
||||
age-plugin-yubikey
|
||||
pkgs.agenix
|
||||
nixos-rebuild
|
||||
nixos-install-tools
|
||||
pkgs.deploy-rs
|
||||
|
@ -13,13 +13,5 @@
|
||||
opensnitch-ui = prev.opensnitch-ui.overrideAttrs (oldAttrs: {
|
||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ prev.python311Packages.qt-material ];
|
||||
});
|
||||
age-plugin-yubikey = prev.age-plugin-yubikey.overrideAttrs (oldAttrs: {
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ final.makeWrapper ];
|
||||
postInstall =
|
||||
oldAttrs.postInstall or ""
|
||||
+ ''
|
||||
wrapProgram $out/bin/age-plugin-yubikey --prefix LD_LIBRARY_PATH : ${final.pcsclite.lib}/lib
|
||||
'';
|
||||
});
|
||||
};
|
||||
}
|
||||
|
@ -112,7 +112,11 @@ fi
|
||||
local new_editor
|
||||
local new_visual
|
||||
local new_manpager
|
||||
if command -v nvim >/dev/null 2>&1; then
|
||||
if [[ -n "${XDG_CURRENT_DESKTOP}" ]] && command -v neovide >/dev/null 2>&1; then
|
||||
new_editor="neovide --no-fork"
|
||||
new_visual="neovide --no-fork"
|
||||
new_manpager="${XDG_CONFIG_HOME}/zsh/config/profile/profile/manpager_wrapper_func.bash"
|
||||
elif command -v nvim >/dev/null 2>&1; then
|
||||
new_editor=nvim
|
||||
new_visual=nvim
|
||||
new_manpager="nvim +Man!"
|
||||
@ -173,4 +177,4 @@ export POWERSHELL_TELEMETRY_OPTOUT=true
|
||||
|
||||
### NPM ###
|
||||
export NPM_CONFIG_PREFIX="${HOME}/.npm-global"
|
||||
export PATH="${PATH}:${NPM_CONFIG_PREFIX}/bin"
|
||||
export PATH="${PATH}:${NPM_CONFIG_PREFIX}/bin"
|
||||
|
@ -143,6 +143,12 @@ in
|
||||
TERMINFO_DIRS = "${config.home.homeDirectory}/.nix-profile/share/terminfo";
|
||||
WSLENV = "TERMINFO_DIRS";
|
||||
GTK_PATH = "${pkgs.gtk-engine-murrine}/lib/gtk-2.0";
|
||||
# PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig:${pkgs.sqlite.dev}/lib/pkgconfig";
|
||||
# LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
|
||||
# openssl
|
||||
# curl
|
||||
# sqlite
|
||||
# ];
|
||||
};
|
||||
sessionPath = [ "${config.xdg.dataHome}/bin" ];
|
||||
};
|
||||
|
@ -1,9 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
nixGLWrap =
|
||||
pkg:
|
||||
@ -21,11 +16,7 @@ let
|
||||
in
|
||||
{
|
||||
imports = [ ../price/home.nix ];
|
||||
xdg.systemDirs.data = [
|
||||
"${config.home.homeDirectory}/.nix-profile/share"
|
||||
"/usr/share"
|
||||
"/usr/local/share"
|
||||
];
|
||||
xdg.systemDirs.data = [ "/usr/share" ];
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
(lib.hiPrio (nixGLWrap neovide))
|
||||
|
Loading…
x
Reference in New Issue
Block a user