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
|
||||
nix-prefetch-git
|
||||
binutils
|
||||
hashcat
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
@ -34,6 +35,7 @@ in {
|
|||
obs-studio
|
||||
lazygit
|
||||
jdk17
|
||||
bun
|
||||
maven
|
||||
gradle
|
||||
visualvm
|
||||
|
|
@ -62,7 +64,6 @@ in {
|
|||
pyyaml
|
||||
pytz
|
||||
onnxruntime
|
||||
opencv4
|
||||
pillow
|
||||
timm
|
||||
]
|
||||
|
|
@ -100,6 +101,7 @@ in {
|
|||
haskell-language-server
|
||||
postgresql
|
||||
sqlite
|
||||
spotify
|
||||
git-lfs
|
||||
gitAndTools.gh
|
||||
gitAndTools.diff-so-fancy
|
||||
|
|
@ -112,5 +114,15 @@ in {
|
|||
starship
|
||||
flameshot
|
||||
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 = ''
|
||||
${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"
|
||||
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Vivid-Dark-Icons"
|
||||
|
||||
export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas"
|
||||
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;
|
||||
theme = {
|
||||
package = pkgs.tokyonight-gtk-theme;
|
||||
name = "Tokyonight-Storm";
|
||||
name = "Tokyonight-Dark";
|
||||
};
|
||||
iconTheme = {
|
||||
package = customPkgs.vivid-icons;
|
||||
name = "Vivid-Dark-Icons";
|
||||
name = "Vivid-Icons-Dark";
|
||||
};
|
||||
cursorTheme = {
|
||||
package = pkgs.capitaine-cursors;
|
||||
|
|
@ -72,20 +76,42 @@ in {
|
|||
user = "cobray";
|
||||
};
|
||||
|
||||
qt.enable = true;
|
||||
qt.platformTheme = "qt5ct";
|
||||
qt.style = "adwaita-dark";
|
||||
qt = {
|
||||
enable = true;
|
||||
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]
|
||||
gtk-application-prefer-dark-theme=1
|
||||
gtk-theme-name=Tokyonight-Storm
|
||||
gtk-icon-theme-name=Vivid-Dark-Icons
|
||||
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-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 = {
|
||||
GTK_THEME = "Tokyonight-Storm";
|
||||
GTK_THEME = "Tokyonight-Dark";
|
||||
ICON_THEME = "Vivid-Icons-Dark";
|
||||
XCURSOR_THEME = "capitaine-cursors";
|
||||
XCURSOR_SIZE = "24";
|
||||
};
|
||||
|
|
@ -95,7 +121,6 @@ in {
|
|||
nitrogen
|
||||
xclip
|
||||
lxappearance
|
||||
libsForQt5.qt5ct
|
||||
gnome-themes-extra
|
||||
gsettings-desktop-schemas
|
||||
adwaita-qt
|
||||
|
|
@ -114,8 +139,20 @@ in {
|
|||
services.xserver.desktopManager.session = [{
|
||||
name = "xfce+i3";
|
||||
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.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
|
||||
];
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 57621 ];
|
||||
networking.firewall.allowedUDPPorts = [ 5353 ];
|
||||
|
||||
networking.wireless.enable = false; # Enables wireless support via wpa_supplicant.
|
||||
networking.hostName = "nixos";
|
||||
# Configure network proxy if necessary
|
||||
|
|
|
|||
|
|
@ -23,10 +23,6 @@ in {
|
|||
python-opencv-headless = python-opencv-headless;
|
||||
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 {
|
||||
inherit (pkgs) lib stdenv fetchFromGitHub;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
{ lib
|
||||
, python310Packages
|
||||
, fetchurl
|
||||
}:
|
||||
{lib, python310Packages, fetchurl}:
|
||||
|
||||
python310Packages.buildPythonPackage rec {
|
||||
pname = "opencv-python-headless";
|
||||
version = "4.11.0.86";
|
||||
version = "4.9.0.80";
|
||||
format = "wheel";
|
||||
|
||||
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";
|
||||
sha256 = "0yx58bpwl6bcsq3ikv5jzffvxyv663jcyxj9z7ghvx6ikp0jf2hf";
|
||||
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 = "976656362d68d9f40a5c66f83901430538002465f7db59142784f3893918f3df";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python310Packages; [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{
|
||||
lib,
|
||||
python310Packages,
|
||||
fetchPypi,
|
||||
python-pymatting,
|
||||
python-opencv-headless,
|
||||
{ lib,
|
||||
python310Packages,
|
||||
fetchPypi,
|
||||
python-pymatting,
|
||||
python-opencv-headless
|
||||
}:
|
||||
python310Packages.buildPythonPackage rec {
|
||||
pname = "rembg";
|
||||
|
|
@ -22,23 +21,15 @@ python310Packages.buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = with python310Packages; [
|
||||
numpy
|
||||
pillow
|
||||
onnxruntime
|
||||
python-opencv-headless
|
||||
requests
|
||||
aiohttp
|
||||
asynctest
|
||||
click
|
||||
filetype
|
||||
pillow
|
||||
pooch
|
||||
pympler
|
||||
python-pymatting
|
||||
scikit-image
|
||||
scipy
|
||||
tqdm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -7,25 +7,20 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "vivid-icons";
|
||||
version = "unstable-${builtins.substring 0 7 "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "L4ki";
|
||||
repo = "Vivid-Plasma-Themes";
|
||||
rev = "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67";
|
||||
sha256 ="X6NPEIhjYzf2mYOYnDADJ4A5nJ6T4HTRnF5Y9vKNIrw=";
|
||||
sha256 = "UlZkxeWb2n5TexaQymeyEqAjKwDfonTXO2OYjICHl+U=";
|
||||
};
|
||||
|
||||
buildInputs = [ hicolor-icon-theme ];
|
||||
|
||||
buildInputs = [hicolor-icon-theme];
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/icons
|
||||
|
||||
for dir in Vivid-Icons-*; do
|
||||
if [ -d "$dir" ]; then
|
||||
theme_name=$(basename "$dir")
|
||||
dest_dir="$out/share/icons/$theme_name"
|
||||
cp -r "$dir" "$dest_dir"
|
||||
|
||||
echo "[Icon Theme]" > "$dest_dir/index.theme"
|
||||
echo "Name=$theme_name" >> "$dest_dir/index.theme"
|
||||
echo "Comment=$theme_name icons" >> "$dest_dir/index.theme"
|
||||
|
|
@ -46,16 +41,14 @@ stdenv.mkDerivation rec {
|
|||
echo "Directories=$directories" >> "$dest_dir/index.theme"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Installed themes:"
|
||||
ls -la $out/share/icons/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vivid Icons Theme";
|
||||
homepage = "https://github.com/L4ki/Vivid-Plasma-Themes";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ "Cobray" ];
|
||||
maintainers = with maintainers; ["Cobray"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue