Reformat
This commit is contained in:
@ -4,7 +4,7 @@
|
|||||||
fetchurl,
|
fetchurl,
|
||||||
autoPatchelfHook,
|
autoPatchelfHook,
|
||||||
cups,
|
cups,
|
||||||
libusb1
|
libusb1,
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "B1160_B1160w_UnifiedLinuxDriver";
|
pname = "B1160_B1160w_UnifiedLinuxDriver";
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{ lib
|
{
|
||||||
, python310
|
lib,
|
||||||
, fetchFromGitHub
|
python310,
|
||||||
, ffmpeg
|
fetchFromGitHub,
|
||||||
|
ffmpeg,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python310.pkgs.buildPythonApplication rec {
|
python310.pkgs.buildPythonApplication rec {
|
||||||
pname = "spotdl";
|
pname = "spotdl";
|
||||||
version = "4.1.6";
|
version = "4.1.6";
|
||||||
@ -83,7 +83,10 @@ python310.pkgs.buildPythonApplication rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
makeWrapperArgs = [
|
makeWrapperArgs = [
|
||||||
"--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ])
|
"--prefix"
|
||||||
|
"PATH"
|
||||||
|
":"
|
||||||
|
(lib.makeBinPath [ffmpeg])
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -1,25 +1,25 @@
|
|||||||
# NOTE: Adapted from nixpkgs xdg-desktop-portal-wlr derivation
|
# NOTE: Adapted from nixpkgs xdg-desktop-portal-wlr derivation
|
||||||
{ lib
|
{
|
||||||
, stdenv
|
lib,
|
||||||
, fetchFromGitHub
|
stdenv,
|
||||||
, fetchpatch
|
fetchFromGitHub,
|
||||||
, makeWrapper
|
fetchpatch,
|
||||||
, meson
|
makeWrapper,
|
||||||
, ninja
|
meson,
|
||||||
, pkg-config
|
ninja,
|
||||||
, wayland-protocols
|
pkg-config,
|
||||||
, wayland-scanner
|
wayland-protocols,
|
||||||
|
wayland-scanner,
|
||||||
# , grim
|
# , grim
|
||||||
, inih
|
inih,
|
||||||
, libdrm
|
libdrm,
|
||||||
, mesa
|
mesa,
|
||||||
, pipewire
|
pipewire,
|
||||||
, scdoc
|
scdoc,
|
||||||
# , slurp
|
# , slurp
|
||||||
, systemd
|
systemd,
|
||||||
, wayland
|
wayland,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xdg-desktop-portal-termfilechooser";
|
pname = "xdg-desktop-portal-termfilechooser";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
@ -39,10 +39,12 @@ stdenv.mkDerivation rec {
|
|||||||
# })];
|
# })];
|
||||||
|
|
||||||
# Add hyprland to portal metainformation
|
# Add hyprland to portal metainformation
|
||||||
patches = [(fetchpatch {
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/GermainZ/xdg-desktop-portal-termfilechooser/pull/6.patch";
|
url = "https://patch-diff.githubusercontent.com/raw/GermainZ/xdg-desktop-portal-termfilechooser/pull/6.patch";
|
||||||
hash = "sha256-GjK6GL15liHYm5U0XBSIf5H8Cc4RIWBD0O47lLWcep0=";
|
hash = "sha256-GjK6GL15liHYm5U0XBSIf5H8Cc4RIWBD0O47lLWcep0=";
|
||||||
})];
|
})
|
||||||
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
depsBuildBuild = [pkg-config];
|
depsBuildBuild = [pkg-config];
|
||||||
|
1
env/latex.nix
vendored
1
env/latex.nix
vendored
@ -17,7 +17,6 @@
|
|||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
overlays = [devshell.overlays.default];
|
overlays = [devshell.overlays.default];
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: Custom LaTeX "distribution"? With curated packages?
|
# TODO: Custom LaTeX "distribution"? With curated packages?
|
||||||
in {
|
in {
|
||||||
devShell = pkgs.devshell.mkShell {
|
devShell = pkgs.devshell.mkShell {
|
||||||
|
@ -196,7 +196,8 @@ rec {
|
|||||||
home.file.".local/share/navi/cheats/christoph.cheat".source = ../../config/navi/christoph.cheat;
|
home.file.".local/share/navi/cheats/christoph.cheat".source = ../../config/navi/christoph.cheat;
|
||||||
|
|
||||||
home.activation = {
|
home.activation = {
|
||||||
linkObsidianLatexSnippets = lib.hm.dag.entryAfter ["writeBoundary"]
|
linkObsidianLatexSnippets =
|
||||||
|
lib.hm.dag.entryAfter ["writeBoundary"]
|
||||||
(mylib.modules.mkLink "~/NixFlake/config/obsidian/latex_snippets.json" "~/Notes/Obsidian/Chriphost/latex_snippets.json");
|
(mylib.modules.mkLink "~/NixFlake/config/obsidian/latex_snippets.json" "~/Notes/Obsidian/Chriphost/latex_snippets.json");
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -586,12 +587,14 @@ rec {
|
|||||||
v = "imgview";
|
v = "imgview";
|
||||||
};
|
};
|
||||||
|
|
||||||
src = (pkgs.fetchFromGitHub {
|
src =
|
||||||
|
(pkgs.fetchFromGitHub {
|
||||||
owner = "jarun";
|
owner = "jarun";
|
||||||
repo = "nnn";
|
repo = "nnn";
|
||||||
rev = "6a8d74a43a2135a186dc59c5a1f561444ca098e4";
|
rev = "6a8d74a43a2135a186dc59c5a1f561444ca098e4";
|
||||||
sha256 = "sha256-jxPfaHRPWy1L87YkK1G/9cBgUwjyJyPXM2jG4VE4+kQ=";
|
sha256 = "sha256-jxPfaHRPWy1L87YkK1G/9cBgUwjyJyPXM2jG4VE4+kQ=";
|
||||||
}) + "/plugins";
|
})
|
||||||
|
+ "/plugins";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -17,11 +17,9 @@ rec {
|
|||||||
|
|
||||||
config = {
|
config = {
|
||||||
modules = {
|
modules = {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Audio module";
|
enable = mkEnableOpt "Audio module";
|
||||||
|
|
||||||
# TODO: Group these in categories (like instruments/VSTs or sth)
|
# TODO: Group these in categories (like instruments/VSTs or sth)
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Emacs module";
|
enable = mkEnableOpt "Emacs module";
|
||||||
|
|
||||||
# TODO: Use an enum for this not individual options
|
# TODO: Use an enum for this not individual options
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Email";
|
enable = mkEnableOpt "Email";
|
||||||
autosync = mkEnableOpt "Automatically call \"notmuch new\" via systemd timer";
|
autosync = mkEnableOpt "Automatically call \"notmuch new\" via systemd timer";
|
||||||
imapnotify = mkEnableOpt "Use imapnotify to sync and index mail automatically";
|
imapnotify = mkEnableOpt "Use imapnotify to sync and index mail automatically";
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Firefox";
|
enable = mkEnableOpt "Firefox";
|
||||||
wayland = mkBoolOpt false "Enable firefox wayland support";
|
wayland = mkBoolOpt false "Enable firefox wayland support";
|
||||||
vaapi = mkBoolOpt false "Enable firefox vaapi support";
|
vaapi = mkBoolOpt false "Enable firefox vaapi support";
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Fish";
|
enable = mkEnableOpt "Fish";
|
||||||
}
|
}
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Flatpak module";
|
enable = mkEnableOpt "Flatpak module";
|
||||||
fontFix = mkBoolOpt true "Link fonts to ~/.local/share/fonts so flatpak apps can find them";
|
fontFix = mkBoolOpt true "Link fonts to ~/.local/share/fonts so flatpak apps can find them";
|
||||||
iconFix = mkBoolOpt true "Link icons to ~/.local/share/icons so flatpak apps can find them";
|
iconFix = mkBoolOpt true "Link icons to ~/.local/share/icons so flatpak apps can find them";
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Gaming module";
|
enable = mkEnableOpt "Gaming module";
|
||||||
|
|
||||||
# discordElectron.enable = mkEnableOpt "Discord (Electron) (nixpkgs)";
|
# discordElectron.enable = mkEnableOpt "Discord (Electron) (nixpkgs)";
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Gnome Desktop";
|
enable = mkEnableOpt "Gnome Desktop";
|
||||||
# TODO: Add option for dash-to-dock
|
# TODO: Add option for dash-to-dock
|
||||||
extensions = mkBoolOpt false "Enable Gnome shell-extensions";
|
extensions = mkBoolOpt false "Enable Gnome shell-extensions";
|
||||||
|
@ -40,7 +40,8 @@ in {
|
|||||||
mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
|
mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
|
||||||
patches = (oldAttrs.patches or []) ++ [workspaces-patch];
|
patches = (oldAttrs.patches or []) ++ [workspaces-patch];
|
||||||
});
|
});
|
||||||
in mkIf cfg.enable {
|
in
|
||||||
|
mkIf cfg.enable {
|
||||||
assertions = [
|
assertions = [
|
||||||
{
|
{
|
||||||
assertion = nixosConfig.programs.hyprland.enable;
|
assertion = nixosConfig.programs.hyprland.enable;
|
||||||
@ -96,7 +97,8 @@ in {
|
|||||||
# TODO: Don't symlink at all, why not just tell Hyprland where the config is? Much easier
|
# TODO: Don't symlink at all, why not just tell Hyprland where the config is? Much easier
|
||||||
# TODO: Use this approach for every program that supports it, makes things much easier,
|
# TODO: Use this approach for every program that supports it, makes things much easier,
|
||||||
# as everything can just stay in ~/NixFlake/config
|
# as everything can just stay in ~/NixFlake/config
|
||||||
linkHyprlandConfig = hm.dag.entryAfter ["writeBoundary"]
|
linkHyprlandConfig =
|
||||||
|
hm.dag.entryAfter ["writeBoundary"]
|
||||||
(mkLink "~/NixFlake/config/hyprland/hyprland.conf" "~/.config/hypr/hyprland.conf");
|
(mkLink "~/NixFlake/config/hyprland/hyprland.conf" "~/.config/hypr/hyprland.conf");
|
||||||
|
|
||||||
# linkWaybarConfig = hm.dag.entryAfter ["writeBoundary"]
|
# linkWaybarConfig = hm.dag.entryAfter ["writeBoundary"]
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Hyprland Window Manager + Compositor";
|
enable = mkEnableOpt "Hyprland Window Manager + Compositor";
|
||||||
|
|
||||||
theme = mkOption {
|
theme = mkOption {
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Kitty";
|
enable = mkEnableOpt "Kitty";
|
||||||
}
|
}
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Misc module";
|
enable = mkEnableOpt "Misc module";
|
||||||
|
|
||||||
keepass = {
|
keepass = {
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "NeoVim";
|
enable = mkEnableOpt "NeoVim";
|
||||||
alias = mkBoolOpt false "Link nvim to vim/vi";
|
alias = mkBoolOpt false "Link nvim to vim/vi";
|
||||||
}
|
}
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Nextcloud Client";
|
enable = mkEnableOpt "Nextcloud Client";
|
||||||
autostart = mkBoolOpt false "Autostart the Nextcloud client (systemd)";
|
autostart = mkBoolOpt false "Autostart the Nextcloud client (systemd)";
|
||||||
}
|
}
|
@ -1,9 +1,8 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Plasma Desktop";
|
enable = mkEnableOpt "Plasma Desktop";
|
||||||
}
|
}
|
@ -1,10 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mylib
|
mylib,
|
||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules;
|
with mylib.modules; {
|
||||||
{
|
|
||||||
enable = mkEnableOpt "Ranger";
|
enable = mkEnableOpt "Ranger";
|
||||||
preview = mkBoolOpt false "Enable Ranger image preview";
|
preview = mkBoolOpt false "Enable Ranger image preview";
|
||||||
}
|
}
|
Reference in New Issue
Block a user