updates
This commit is contained in:
parent
b6cf7dd347
commit
f20ff92ba8
7 changed files with 84 additions and 55 deletions
|
|
@ -24,6 +24,7 @@ in {
|
||||||
stdenv.cc.cc.lib
|
stdenv.cc.cc.lib
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
binutils
|
binutils
|
||||||
|
hashcat
|
||||||
cmake
|
cmake
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
@ -34,6 +35,7 @@ in {
|
||||||
obs-studio
|
obs-studio
|
||||||
lazygit
|
lazygit
|
||||||
jdk17
|
jdk17
|
||||||
|
bun
|
||||||
maven
|
maven
|
||||||
gradle
|
gradle
|
||||||
visualvm
|
visualvm
|
||||||
|
|
@ -62,7 +64,6 @@ in {
|
||||||
pyyaml
|
pyyaml
|
||||||
pytz
|
pytz
|
||||||
onnxruntime
|
onnxruntime
|
||||||
opencv4
|
|
||||||
pillow
|
pillow
|
||||||
timm
|
timm
|
||||||
]
|
]
|
||||||
|
|
@ -100,6 +101,7 @@ in {
|
||||||
haskell-language-server
|
haskell-language-server
|
||||||
postgresql
|
postgresql
|
||||||
sqlite
|
sqlite
|
||||||
|
spotify
|
||||||
git-lfs
|
git-lfs
|
||||||
gitAndTools.gh
|
gitAndTools.gh
|
||||||
gitAndTools.diff-so-fancy
|
gitAndTools.diff-so-fancy
|
||||||
|
|
@ -112,5 +114,15 @@ in {
|
||||||
starship
|
starship
|
||||||
flameshot
|
flameshot
|
||||||
yarn
|
yarn
|
||||||
|
nodePackages.typescript-language-server
|
||||||
|
nodePackages.eslint
|
||||||
|
nodePackages.prettier
|
||||||
|
nodePackages.vitest
|
||||||
|
nodePackages.pg
|
||||||
|
nodePackages.sqlite3
|
||||||
|
httpie
|
||||||
|
wrk
|
||||||
|
nodePackages.pnpm
|
||||||
|
zlib.dev
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,9 +29,13 @@ in {
|
||||||
];
|
];
|
||||||
extraSessionCommands = ''
|
extraSessionCommands = ''
|
||||||
${pkgs.feh}/bin/feh --randomize --bg-fill ~/wallpapers/* 2>/dev/null || ${pkgs.feh}/bin/feh --bg-fill ${pkgs.nixos-artwork.wallpapers.nineish-dark-gray}/share/backgrounds/nixos/nineish-dark-gray.png &
|
${pkgs.feh}/bin/feh --randomize --bg-fill ~/wallpapers/* 2>/dev/null || ${pkgs.feh}/bin/feh --bg-fill ${pkgs.nixos-artwork.wallpapers.nineish-dark-gray}/share/backgrounds/nixos/nineish-dark-gray.png &
|
||||||
export GSETTINGS_SCHEMA_DIR=${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas
|
|
||||||
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme "Tokyonight-Storm"
|
export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas"
|
||||||
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Vivid-Dark-Icons"
|
export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:${pkgs.tokyonight-gtk-theme}/share:${customPkgs.vivid-icons}/share:$XDG_DATA_DIRS"
|
||||||
|
|
||||||
|
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme "Tokyonight-Dark" || echo "Failed to set GTK theme" > /tmp/theme-debug.log
|
||||||
|
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Vivid-Icons-Dark" || ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Papirus-Dark" || echo "Failed to set icon theme" > /tmp/theme-debug.log
|
||||||
|
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface cursor-theme "capitaine-cursors" || echo "Failed to set cursor theme" > /tmp/theme-debug.log
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -48,11 +52,11 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = {
|
theme = {
|
||||||
package = pkgs.tokyonight-gtk-theme;
|
package = pkgs.tokyonight-gtk-theme;
|
||||||
name = "Tokyonight-Storm";
|
name = "Tokyonight-Dark";
|
||||||
};
|
};
|
||||||
iconTheme = {
|
iconTheme = {
|
||||||
package = customPkgs.vivid-icons;
|
package = customPkgs.vivid-icons;
|
||||||
name = "Vivid-Dark-Icons";
|
name = "Vivid-Icons-Dark";
|
||||||
};
|
};
|
||||||
cursorTheme = {
|
cursorTheme = {
|
||||||
package = pkgs.capitaine-cursors;
|
package = pkgs.capitaine-cursors;
|
||||||
|
|
@ -72,20 +76,42 @@ in {
|
||||||
user = "cobray";
|
user = "cobray";
|
||||||
};
|
};
|
||||||
|
|
||||||
qt.enable = true;
|
qt = {
|
||||||
qt.platformTheme = "qt5ct";
|
enable = true;
|
||||||
qt.style = "adwaita-dark";
|
platformTheme = "gtk2";
|
||||||
|
};
|
||||||
|
|
||||||
environment.etc."gtk-3.0/settings.ini".text = ''
|
environment.etc = {
|
||||||
|
"gtk-2.0/gtkrc".text = ''
|
||||||
|
gtk-theme-name="Tokyonight-Dark"
|
||||||
|
gtk-icon-theme-name="Vivid-Icons-Dark"
|
||||||
|
gtk-font-name="Clear Sans 10"
|
||||||
|
gtk-cursor-theme-name="capitaine-cursors"
|
||||||
|
gtk-cursor-theme-size=24
|
||||||
|
'';
|
||||||
|
"gtk-3.0/settings.ini".text = ''
|
||||||
[Settings]
|
[Settings]
|
||||||
gtk-application-prefer-dark-theme=1
|
gtk-application-prefer-dark-theme=1
|
||||||
gtk-theme-name=Tokyonight-Storm
|
gtk-theme-name=Tokyonight-Dark
|
||||||
gtk-icon-theme-name=Vivid-Dark-Icons
|
gtk-icon-theme-name=Vivid-Icons-Dark
|
||||||
gtk-font-name=Clear Sans 10
|
gtk-font-name=Clear Sans 10
|
||||||
|
gtk-cursor-theme-name=capitaine-cursors
|
||||||
|
gtk-cursor-theme-size=24
|
||||||
'';
|
'';
|
||||||
|
"gtk-4.0/settings.ini".text = ''
|
||||||
|
[Settings]
|
||||||
|
gtk-application-prefer-dark-theme=1
|
||||||
|
gtk-theme-name=Tokyonight-Dark
|
||||||
|
gtk-icon-theme-name=Vivid-Icons-Dark
|
||||||
|
gtk-font-name=Clear Sans 10
|
||||||
|
gtk-cursor-theme-name=capitaine-cursors
|
||||||
|
gtk-cursor-theme-size=24
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
GTK_THEME = "Tokyonight-Storm";
|
GTK_THEME = "Tokyonight-Dark";
|
||||||
|
ICON_THEME = "Vivid-Icons-Dark";
|
||||||
XCURSOR_THEME = "capitaine-cursors";
|
XCURSOR_THEME = "capitaine-cursors";
|
||||||
XCURSOR_SIZE = "24";
|
XCURSOR_SIZE = "24";
|
||||||
};
|
};
|
||||||
|
|
@ -95,7 +121,6 @@ in {
|
||||||
nitrogen
|
nitrogen
|
||||||
xclip
|
xclip
|
||||||
lxappearance
|
lxappearance
|
||||||
libsForQt5.qt5ct
|
|
||||||
gnome-themes-extra
|
gnome-themes-extra
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
adwaita-qt
|
adwaita-qt
|
||||||
|
|
@ -114,8 +139,20 @@ in {
|
||||||
services.xserver.desktopManager.session = [{
|
services.xserver.desktopManager.session = [{
|
||||||
name = "xfce+i3";
|
name = "xfce+i3";
|
||||||
start = ''
|
start = ''
|
||||||
|
export XDG_DATA_DIRS="${pkgs.tokyonight-gtk-theme}/share:${customPkgs.vivid-icons}/share:$XDG_DATA_DIRS"
|
||||||
${pkgs.xfce.xfce4-session}/bin/xfce4-session --with-ck-launch &
|
${pkgs.xfce.xfce4-session}/bin/xfce4-session --with-ck-launch &
|
||||||
${pkgs.i3-gaps}/bin/i3
|
${pkgs.i3-gaps}/bin/i3
|
||||||
'';
|
'';
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
programs.dconf.enable = true;
|
||||||
|
programs.dconf.profiles.user.databases = [{
|
||||||
|
settings = {
|
||||||
|
"org/gnome/desktop/interface" = {
|
||||||
|
icon-theme = "Vivid-Icons-Dark";
|
||||||
|
gtk-theme = "Tokyonight-Dark";
|
||||||
|
cursor-theme = "capitaine-cursors";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,9 @@
|
||||||
networkmanager_dmenu
|
networkmanager_dmenu
|
||||||
];
|
];
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = [ 57621 ];
|
||||||
|
networking.firewall.allowedUDPPorts = [ 5353 ];
|
||||||
|
|
||||||
networking.wireless.enable = false; # Enables wireless support via wpa_supplicant.
|
networking.wireless.enable = false; # Enables wireless support via wpa_supplicant.
|
||||||
networking.hostName = "nixos";
|
networking.hostName = "nixos";
|
||||||
# Configure network proxy if necessary
|
# Configure network proxy if necessary
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,6 @@ in {
|
||||||
python-opencv-headless = python-opencv-headless;
|
python-opencv-headless = python-opencv-headless;
|
||||||
python-rembg = python-rembg;
|
python-rembg = python-rembg;
|
||||||
|
|
||||||
# tokyo-night-gtk = pkgs.callPackage ./tokyo-night {
|
|
||||||
# inherit (pkgs) lib stdenv fetchFromGitHub gtk-engine-murrine;
|
|
||||||
# };
|
|
||||||
|
|
||||||
vivid-icons = pkgs.callPackage ./vivid-icons {
|
vivid-icons = pkgs.callPackage ./vivid-icons {
|
||||||
inherit (pkgs) lib stdenv fetchFromGitHub;
|
inherit (pkgs) lib stdenv fetchFromGitHub;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,13 @@
|
||||||
{ lib
|
{lib, python310Packages, fetchurl}:
|
||||||
, python310Packages
|
|
||||||
, fetchurl
|
|
||||||
}:
|
|
||||||
|
|
||||||
python310Packages.buildPythonPackage rec {
|
python310Packages.buildPythonPackage rec {
|
||||||
pname = "opencv-python-headless";
|
pname = "opencv-python-headless";
|
||||||
version = "4.11.0.86";
|
version = "4.9.0.80";
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://files.pythonhosted.org/packages/dd/5c/c139a7876099916879609372bfa513b7f1257f7f1a908b0bdc1c2328241b/opencv_python_headless-4.11.0.86-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
url = "https://files.pythonhosted.org/packages/71/19/3c65483a80a1d062d46ae20faf5404712d25cb1dfdcaf371efbd67c38544/opencv_python_headless-4.9.0.80-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||||
sha256 = "0yx58bpwl6bcsq3ikv5jzffvxyv663jcyxj9z7ghvx6ikp0jf2hf";
|
sha256 = "976656362d68d9f40a5c66f83901430538002465f7db59142784f3893918f3df";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python310Packages; [
|
propagatedBuildInputs = with python310Packages; [
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
{
|
{ lib,
|
||||||
lib,
|
|
||||||
python310Packages,
|
python310Packages,
|
||||||
fetchPypi,
|
fetchPypi,
|
||||||
python-pymatting,
|
python-pymatting,
|
||||||
python-opencv-headless,
|
python-opencv-headless
|
||||||
}:
|
}:
|
||||||
python310Packages.buildPythonPackage rec {
|
python310Packages.buildPythonPackage rec {
|
||||||
pname = "rembg";
|
pname = "rembg";
|
||||||
|
|
@ -22,23 +21,15 @@ python310Packages.buildPythonPackage rec {
|
||||||
|
|
||||||
propagatedBuildInputs = with python310Packages; [
|
propagatedBuildInputs = with python310Packages; [
|
||||||
numpy
|
numpy
|
||||||
pillow
|
|
||||||
onnxruntime
|
onnxruntime
|
||||||
python-opencv-headless
|
python-opencv-headless
|
||||||
requests
|
pillow
|
||||||
aiohttp
|
|
||||||
asynctest
|
|
||||||
click
|
|
||||||
filetype
|
|
||||||
pooch
|
pooch
|
||||||
pympler
|
|
||||||
python-pymatting
|
python-pymatting
|
||||||
scikit-image
|
scikit-image
|
||||||
scipy
|
scipy
|
||||||
tqdm
|
tqdm
|
||||||
];
|
aiohttp
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
||||||
|
|
@ -7,25 +7,20 @@
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vivid-icons";
|
pname = "vivid-icons";
|
||||||
version = "unstable-${builtins.substring 0 7 "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"}";
|
version = "unstable-${builtins.substring 0 7 "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "L4ki";
|
owner = "L4ki";
|
||||||
repo = "Vivid-Plasma-Themes";
|
repo = "Vivid-Plasma-Themes";
|
||||||
rev = "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67";
|
rev = "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67";
|
||||||
sha256 ="X6NPEIhjYzf2mYOYnDADJ4A5nJ6T4HTRnF5Y9vKNIrw=";
|
sha256 = "UlZkxeWb2n5TexaQymeyEqAjKwDfonTXO2OYjICHl+U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [hicolor-icon-theme];
|
buildInputs = [hicolor-icon-theme];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/icons
|
mkdir -p $out/share/icons
|
||||||
|
|
||||||
for dir in Vivid-Icons-*; do
|
for dir in Vivid-Icons-*; do
|
||||||
if [ -d "$dir" ]; then
|
if [ -d "$dir" ]; then
|
||||||
theme_name=$(basename "$dir")
|
theme_name=$(basename "$dir")
|
||||||
dest_dir="$out/share/icons/$theme_name"
|
dest_dir="$out/share/icons/$theme_name"
|
||||||
cp -r "$dir" "$dest_dir"
|
cp -r "$dir" "$dest_dir"
|
||||||
|
|
||||||
echo "[Icon Theme]" > "$dest_dir/index.theme"
|
echo "[Icon Theme]" > "$dest_dir/index.theme"
|
||||||
echo "Name=$theme_name" >> "$dest_dir/index.theme"
|
echo "Name=$theme_name" >> "$dest_dir/index.theme"
|
||||||
echo "Comment=$theme_name icons" >> "$dest_dir/index.theme"
|
echo "Comment=$theme_name icons" >> "$dest_dir/index.theme"
|
||||||
|
|
@ -46,11 +41,9 @@ stdenv.mkDerivation rec {
|
||||||
echo "Directories=$directories" >> "$dest_dir/index.theme"
|
echo "Directories=$directories" >> "$dest_dir/index.theme"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Installed themes:"
|
echo "Installed themes:"
|
||||||
ls -la $out/share/icons/
|
ls -la $out/share/icons/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Vivid Icons Theme";
|
description = "Vivid Icons Theme";
|
||||||
homepage = "https://github.com/L4ki/Vivid-Plasma-Themes";
|
homepage = "https://github.com/L4ki/Vivid-Plasma-Themes";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue