forked from Shinonome/dots-hyprland
Update dist-nix
This commit is contained in:
@@ -30,10 +30,12 @@
|
|||||||
## inetutils: provides hostname, ifconfig, ping, etc.
|
## inetutils: provides hostname, ifconfig, ping, etc.
|
||||||
## libnotify: provides notify-send
|
## libnotify: provides notify-send
|
||||||
inetutils libnotify
|
inetutils libnotify
|
||||||
foot # Used in Quickshell and Hyprland config; its config is also included
|
|
||||||
|
|
||||||
##### Other basic things #####
|
##### Other MISC #####
|
||||||
dbus xorg.xlsclients
|
dbus xorg.xlsclients # some basic things
|
||||||
|
foot # Used in Quickshell and Hyprland config; its config is also included
|
||||||
|
kdePackages.kconfig # provide kwriteconfig6, used in install script
|
||||||
|
|
||||||
|
|
||||||
##### Not work, to be solved #####
|
##### Not work, to be solved #####
|
||||||
# hyprlock pamtester
|
# hyprlock pamtester
|
||||||
@@ -133,7 +135,7 @@
|
|||||||
|
|
||||||
|
|
||||||
### illogical-impulse-python
|
### illogical-impulse-python
|
||||||
pkg-config clang #clang (Some python package may need this to be built, e.g. #1235; Also pkg-config is needed for Nix when running uv install)
|
#clang (Some python package may need this to be built, e.g. #1235; However when cmake is installed by Nix, then pkg-config, cairo etc will be used but they can only be accessible in Nix development environment for example nix-shell, nix develop, etc. See `sdata/uv/shell.nix`. )
|
||||||
uv #uv (Used for python venv)
|
uv #uv (Used for python venv)
|
||||||
gtk4 #gtk4 (Not explicitly used)
|
gtk4 #gtk4 (Not explicitly used)
|
||||||
libadwaita #libadwaita (Not explicitly used)
|
libadwaita #libadwaita (Not explicitly used)
|
||||||
|
|||||||
@@ -88,6 +88,10 @@ install-python-packages(){
|
|||||||
# we need python 3.12 https://github.com/python-pillow/Pillow/issues/8089
|
# we need python 3.12 https://github.com/python-pillow/Pillow/issues/8089
|
||||||
x uv venv --prompt .venv $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV) -p 3.12
|
x uv venv --prompt .venv $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV) -p 3.12
|
||||||
x source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate
|
x source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate
|
||||||
x uv pip install -r sdata/uv/requirements.txt
|
if [[ "$INSTALL_VIA_NIX" = true ]]; then
|
||||||
|
x nix-shell ${REPO_ROOT}/sdata/uv/shell.nix --run "uv pip install -r ${REPO_ROOT}/sdata/uv/requirements.txt"
|
||||||
|
else
|
||||||
|
x uv pip install -r ${REPO_ROOT}/sdata/uv/requirements.txt
|
||||||
|
fi
|
||||||
x deactivate
|
x deactivate
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
# TODO: When --via-nix is specified, use dots-extra/vianix/hypridle.conf instead
|
|
||||||
# In case some dirs does not exists
|
# In case some dirs does not exists
|
||||||
v mkdir -p $XDG_BIN_HOME $XDG_CACHE_HOME $XDG_CONFIG_HOME $XDG_DATA_HOME/icons
|
v mkdir -p $XDG_BIN_HOME $XDG_CACHE_HOME $XDG_CONFIG_HOME $XDG_DATA_HOME/icons
|
||||||
|
|
||||||
@@ -80,13 +79,18 @@ case $SKIP_HYPRLAND in
|
|||||||
v cp dots/.config/hypr/hyprland.conf $t
|
v cp dots/.config/hypr/hyprland.conf $t
|
||||||
fi
|
fi
|
||||||
t="$XDG_CONFIG_HOME/hypr/hypridle.conf"
|
t="$XDG_CONFIG_HOME/hypr/hypridle.conf"
|
||||||
|
if [[ "$INSTALL_VIA_NIX" = true ]]; then
|
||||||
|
s=dots/.config/hypr/hypridle.conf
|
||||||
|
else
|
||||||
|
s=dots-extra/vianix/hypridle.conf
|
||||||
|
fi
|
||||||
if [ -f $t ];then
|
if [ -f $t ];then
|
||||||
echo -e "${STY_BLUE}[$0]: \"$t\" already exists.${STY_RST}"
|
echo -e "${STY_BLUE}[$0]: \"$t\" already exists.${STY_RST}"
|
||||||
v cp -f dots/.config/hypr/hypridle.conf $t.new
|
v cp -f $s $t.new
|
||||||
existed_hypridle_conf=y
|
existed_hypridle_conf=y
|
||||||
else
|
else
|
||||||
echo -e "${STY_YELLOW}[$0]: \"$t\" does not exist yet.${STY_RST}"
|
echo -e "${STY_YELLOW}[$0]: \"$t\" does not exist yet.${STY_RST}"
|
||||||
v cp dots/.config/hypr/hypridle.conf $t
|
v cp $s $t
|
||||||
existed_hypridle_conf=n
|
existed_hypridle_conf=n
|
||||||
fi
|
fi
|
||||||
t="$XDG_CONFIG_HOME/hypr/hyprlock.conf"
|
t="$XDG_CONFIG_HOME/hypr/hyprlock.conf"
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
pkgs.mkShell {
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
pkg-config
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
cairo
|
||||||
|
dbus
|
||||||
|
dbus-glib
|
||||||
|
glib
|
||||||
|
];
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user