Skip to content

Commit

Permalink
octelly: too many smaller tweaks to list
Browse files Browse the repository at this point in the history
  • Loading branch information
@Octelly
Octelly committed Jan 19, 2025
1 parent bee2f99 commit 9e4199d
Showing 1 changed file with 143 additions and 101 deletions.
244 changes: 143 additions & 101 deletions users/octelly/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,99 +38,108 @@ let
cp -r Posy* $out/share/icons/
'';
});
klassy = with pkgs; (stdenv.mkDerivation rec {
pname = "klassy";
version = "6.2.breeze6.2.1";
klassy = pkgs.nur.repos.shadowrz.klassy-qt6;
#klassy = with pkgs; (stdenv.mkDerivation rec {
# pname = "klassy";
# #version = "6.2.breeze6.2.1";

# #src = fetchFromGitHub {
# # owner = "paulmcauley";
# # repo = "klassy";
# # rev = version;
# # hash = "sha256-tFqze3xN1XECY74Gj0nScis7DVNOZO4wcfeA7mNZT5M=";
# #};
# version = "6.3";

# src = fetchFromGitHub {
# owner = "ivan-cukic";
# repo = "wip-klassy";
# rev = "01b8a6c29008e1667d0d02a0d3069f70009a9185";
# hash = "sha256-9IZhO8a8URTYPv6/bf7r3incfN1o2jBd2+mLVptNRYo=";
# };

src = fetchFromGitHub {
owner = "paulmcauley";
repo = "klassy";
rev = version;
hash = "sha256-tFqze3xN1XECY74Gj0nScis7DVNOZO4wcfeA7mNZT5M=";
};
# nativeBuildInputs = with kdePackages; [
# cmake
# extra-cmake-modules
# wrapQtAppsHook
# ];

nativeBuildInputs = with kdePackages; [
cmake
extra-cmake-modules
wrapQtAppsHook
];
# buildInputs = with kdePackages; [
# qtbase
# qtdeclarative
# qttools

# frameworkintegration
# kcmutils
# kdecoration
# kiconthemes
# kwindowsystem

# qtsvg
# kcolorscheme
# kconfig
# kcoreaddons
# kdecoration
# kguiaddons
# ki18n
# kirigami
# kwidgetsaddons
# ];

buildInputs = with kdePackages; [
qtbase
qtdeclarative
qttools

frameworkintegration
kcmutils
kdecoration
kiconthemes
kwindowsystem

qtsvg
kcolorscheme
kconfig
kcoreaddons
kdecoration
kguiaddons
ki18n
kirigami
kwidgetsaddons
];
# cmakeFlags = [
# "-DCMAKE_INSTALL_PREFIX=$out"
# "-DBUILD_TESTING=OFF"
# "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
# "-DBUILD_QT5=OFF"
# "-DBUILD_QT6=ON"
# ];

cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=$out"
"-DBUILD_TESTING=OFF"
"-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
"-DBUILD_QT5=OFF"
"-DBUILD_QT6=ON"
];
# meta = {
# description = "Highly customizable binary Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop";
# homepage = "https://github.com/paulmcauley/klassy";
# platforms = lib.platforms.linux;
# license = with lib.licenses; [
# bsd3
# cc0
# gpl2Only
# gpl2Plus
# gpl3Only
# gpl3Plus # KDE-Accepted-GPL
# mit
# ];
# maintainers = with lib.maintainers; [ pluiedev ];
# mainProgram = "klassy-settings";
# };
#});
schildichat-desktop-appimage = with pkgs;
let
pname = "schildichat-desktop";
version = "1.11.86-sc.0.test.0";
src = fetchurl {
url = "https://github.com/SchildiChat/schildichat-desktop/releases/download/v${version}/SchildiChatAlpha-${version}.AppImage";
hash = "sha256-tRPRvMZ1sP2t1KiHVdNwGxfTr4JVC3fSmaHfkM9gKWg=";
};

meta = {
description = "Highly customizable binary Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop";
homepage = "https://github.com/paulmcauley/klassy";
platforms = lib.platforms.linux;
license = with lib.licenses; [
bsd3
cc0
gpl2Only
gpl2Plus
gpl3Only
gpl3Plus # KDE-Accepted-GPL
mit
];
maintainers = with lib.maintainers; [ pluiedev ];
mainProgram = "klassy-settings";
};
});
schildichat-desktop-appimage = with pkgs; let
pname = "schildichat-desktop";
version = "1.11.86-sc.0.test.0";
src = fetchurl {
url = "https://github.com/SchildiChat/schildichat-desktop/releases/download/v${version}/SchildiChatAlpha-${version}.AppImage";
hash = "sha256-tRPRvMZ1sP2t1KiHVdNwGxfTr4JVC3fSmaHfkM9gKWg=";
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 rec {
inherit pname version src;
nativeBuildInputs = [ makeWrapper ];

#FIXME: still uses xwayland for some reason
extraInstallCommands = ''
wrapProgram $out/bin/${pname} \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
install -Dm444 ${appimageContents}/*.desktop -t $out/share/applications
substituteInPlace $out/share/applications/*.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
};

appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 rec {
inherit pname version src;
nativeBuildInputs = [ makeWrapper ];

#FIXME: still uses xwayland for some reason
extraInstallCommands = ''
wrapProgram $out/bin/${pname} \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
install -Dm444 ${appimageContents}/*.desktop -t $out/share/applications
substituteInPlace $out/share/applications/*.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
};
videomass = with pkgs.python3Packages; let
in buildPythonPackage rec {
videomass = with pkgs.python3Packages; buildPythonPackage rec {
pname = "videomass";
version = "5.0.21";
pyproject = true;
Expand All @@ -147,14 +156,14 @@ let
];

dependencies = [
pkgs.ffmpeg
pkgs.ffmpeg-full
pypubsub
wxpython
yt-dlp
];
};
in
rec {
{
home = {
packages = with pkgs;
[
Expand All @@ -165,7 +174,7 @@ rec {
maple-mono-NF
#ranger

ffmpeg
ffmpeg-full
videomass

qalculate-qt
Expand Down Expand Up @@ -322,6 +331,7 @@ rec {

kdePackages.kclock
kdePackages.ktorrent
kdePackages.partitionmanager

# spelling stuff
# is also used by Plasma
Expand All @@ -346,6 +356,8 @@ rec {

planify
newsflash
eyedropper
junction

wezterm
];
Expand Down Expand Up @@ -624,17 +636,20 @@ rec {
pkief.material-icon-theme

# language support
bungcip.better-toml
#bungcip.better-toml
tamasfe.even-better-toml
ms-pyright.pyright
ms-python.python
ms-python.isort
jnoortheen.nix-ide
#ms-vscode.makefile-tools
wayou.vscode-todo-highlight
spgoding.datapack-language-server
]) ++ (with pkgs.vscode-marketplace; [
# language support
sumneko.lua
vgalaktionov.moonscript
lijin.yuescript
tnze.snbt
mrmlnc.vscode-json5
# this one broken somehow, bruh:
Expand All @@ -655,6 +670,10 @@ rec {
# "asvetliakov.vscode-neovim" = 1;
#};

"nix.enableLanguageServer" = true;
"nix.serverSettings".nil.formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
"nix.serverPath" = "${pkgs.nil}/bin/nil";

# theming
"workbench.preferredDarkColorTheme" = "Sonokai Shusia";
"workbench.colorTheme" = "Sonokai Shusia";
Expand Down Expand Up @@ -685,6 +704,9 @@ rec {
}
];

"editor.minimap.enabled" = false;
"workbench.startupEditor" = "none";

# terminal
"terminal.external.linuxExec" = "${pkgs.wezterm}/bin/wezterm";
"terminal.integrated.cursorBlinking" = true;
Expand All @@ -704,9 +726,11 @@ rec {
"editor.formatOnSave" = true;
"python.formatting.provider" = "black";

# brhuhe
"workbench.startupEditor" = "none";
"vim.userSystemClipboard" = true;
# Vim
"vim.useSystemClipboard" = true;
"vim.enableNeovim" = true;
"vim.neovimPath" = "${pkgs.neovim}/bin/nvim";
"vim.hlsearch" = true;
};
};

Expand Down Expand Up @@ -736,7 +760,12 @@ rec {
# enableZshIntegration = true;
#};

programs.btop.enable = true;
programs.btop = {
enable = true;
package = pkgs.btop.override {
rocmSupport = true;
};
};

dconf.settings =
let
Expand Down Expand Up @@ -794,19 +823,32 @@ rec {
xdg = {
enable = true;
mime.enable = true;
mimeApps = {
mimeApps = rec {
enable = true;
defaultApplications = {
"video" = [ "mpv.desktop" ];
"audio" = [ "mpv.desktop" ];
"text" = [ "nvim.desktop" ];

"default-web-browser" = [ "floorp.desktop" ];
"text/html" = [ "floorp.desktop" ];
"x-scheme-handler/http" = [ "floorp.desktop " ];
"x-scheme-handler/https" = [ "floorp.desktop " ];
"x-scheme-handler/unknown" = [ "floorp.desktop " ];
"default-web-browser" = [ "re.sonny.Junction.desktop" ];
"text/html" = [ "re.sonny.Junction.desktop" ];
"x-scheme-handler/http" = [ "re.sonny.Junction.desktop " ];
"x-scheme-handler/https" = [ "re.sonny.Junction.desktop " ];
"x-scheme-handler/unknown" = [ "re.sonny.Junction.desktop " ];
};
associations.added = defaultApplications;
};

portal = {
enable = true;
xdgOpenUsePortal = true;

config.plasma.default = [ "kde" "*" ];

# NOTE: "extra" is misleading here
# you need to set this if you set xdg.portal.enable to true
extraPortals = [ ]
++ lib.optional config.programs.plasma.enable pkgs.xdg-desktop-portal-kde;
};

userDirs =
Expand Down

0 comments on commit 9e4199d

Please sign in to comment.