Compare commits
3 Commits
c527b73d2c
...
5d30c3ba23
Author | SHA1 | Date | |
---|---|---|---|
5d30c3ba23 | |||
af0d1b13c1 | |||
b8ae03b3af |
@ -67,6 +67,8 @@
|
|||||||
overlays = [
|
overlays = [
|
||||||
inputs.agenix.overlays.default
|
inputs.agenix.overlays.default
|
||||||
inputs.neovim-nightly-overlay.overlay
|
inputs.neovim-nightly-overlay.overlay
|
||||||
|
self.overlays.modifications
|
||||||
|
self.overlays.additions
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@ -113,8 +115,8 @@
|
|||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
age
|
age
|
||||||
|
agenix
|
||||||
age-plugin-yubikey
|
age-plugin-yubikey
|
||||||
pkgs.agenix
|
|
||||||
nixos-rebuild
|
nixos-rebuild
|
||||||
nixos-install-tools
|
nixos-install-tools
|
||||||
pkgs.deploy-rs
|
pkgs.deploy-rs
|
||||||
|
@ -13,5 +13,13 @@
|
|||||||
opensnitch-ui = prev.opensnitch-ui.overrideAttrs (oldAttrs: {
|
opensnitch-ui = prev.opensnitch-ui.overrideAttrs (oldAttrs: {
|
||||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ prev.python311Packages.qt-material ];
|
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,11 +112,7 @@ fi
|
|||||||
local new_editor
|
local new_editor
|
||||||
local new_visual
|
local new_visual
|
||||||
local new_manpager
|
local new_manpager
|
||||||
if [[ -n "${XDG_CURRENT_DESKTOP}" ]] && command -v neovide >/dev/null 2>&1; then
|
if command -v nvim >/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_editor=nvim
|
||||||
new_visual=nvim
|
new_visual=nvim
|
||||||
new_manpager="nvim +Man!"
|
new_manpager="nvim +Man!"
|
||||||
|
@ -143,12 +143,6 @@ in
|
|||||||
TERMINFO_DIRS = "${config.home.homeDirectory}/.nix-profile/share/terminfo";
|
TERMINFO_DIRS = "${config.home.homeDirectory}/.nix-profile/share/terminfo";
|
||||||
WSLENV = "TERMINFO_DIRS";
|
WSLENV = "TERMINFO_DIRS";
|
||||||
GTK_PATH = "${pkgs.gtk-engine-murrine}/lib/gtk-2.0";
|
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" ];
|
sessionPath = [ "${config.xdg.dataHome}/bin" ];
|
||||||
};
|
};
|
||||||
|
@ -1,4 +1,9 @@
|
|||||||
{ pkgs, lib, ... }:
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
nixGLWrap =
|
nixGLWrap =
|
||||||
pkg:
|
pkg:
|
||||||
@ -16,7 +21,11 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ ../price/home.nix ];
|
imports = [ ../price/home.nix ];
|
||||||
xdg.systemDirs.data = [ "/usr/share" ];
|
xdg.systemDirs.data = [
|
||||||
|
"${config.home.homeDirectory}/.nix-profile/share"
|
||||||
|
"/usr/share"
|
||||||
|
"/usr/local/share"
|
||||||
|
];
|
||||||
home = {
|
home = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
(lib.hiPrio (nixGLWrap neovide))
|
(lib.hiPrio (nixGLWrap neovide))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user