1
This commit is contained in:
2023-04-26 12:56:31 +02:00
parent 1b83c0131f
commit 9a457490d4
39 changed files with 308 additions and 316 deletions

View File

@ -4,7 +4,7 @@
fetchurl,
autoPatchelfHook,
cups,
libusb1
libusb1,
}:
stdenv.mkDerivation rec {
pname = "B1160_B1160w_UnifiedLinuxDriver";

View File

@ -1,9 +1,9 @@
{ lib
, python310
, fetchFromGitHub
, ffmpeg
{
lib,
python310,
fetchFromGitHub,
ffmpeg,
}:
python310.pkgs.buildPythonApplication rec {
pname = "spotdl";
version = "4.1.6";
@ -83,7 +83,10 @@ python310.pkgs.buildPythonApplication rec {
];
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ])
"--prefix"
"PATH"
":"
(lib.makeBinPath [ffmpeg])
];
meta = with lib; {

View File

@ -1,25 +1,25 @@
# NOTE: Adapted from nixpkgs xdg-desktop-portal-wlr derivation
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, makeWrapper
, meson
, ninja
, pkg-config
, wayland-protocols
, wayland-scanner
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
makeWrapper,
meson,
ninja,
pkg-config,
wayland-protocols,
wayland-scanner,
# , grim
, inih
, libdrm
, mesa
, pipewire
, scdoc
inih,
libdrm,
mesa,
pipewire,
scdoc,
# , slurp
, systemd
, wayland
systemd,
wayland,
}:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-termfilechooser";
version = "0.1.0";
@ -39,10 +39,12 @@ stdenv.mkDerivation rec {
# })];
# Add hyprland to portal metainformation
patches = [(fetchpatch {
patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/GermainZ/xdg-desktop-portal-termfilechooser/pull/6.patch";
hash = "sha256-GjK6GL15liHYm5U0XBSIf5H8Cc4RIWBD0O47lLWcep0=";
})];
})
];
strictDeps = true;
depsBuildBuild = [pkg-config];

1
env/latex.nix vendored
View File

@ -17,7 +17,6 @@
config.allowUnfree = true;
overlays = [devshell.overlays.default];
};
# TODO: Custom LaTeX "distribution"? With curated packages?
in {
devShell = pkgs.devshell.mkShell {

View File

@ -196,7 +196,8 @@ rec {
home.file.".local/share/navi/cheats/christoph.cheat".source = ../../config/navi/christoph.cheat;
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");
};
@ -586,12 +587,14 @@ rec {
v = "imgview";
};
src = (pkgs.fetchFromGitHub {
src =
(pkgs.fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "6a8d74a43a2135a186dc59c5a1f561444ca098e4";
sha256 = "sha256-jxPfaHRPWy1L87YkK1G/9cBgUwjyJyPXM2jG4VE4+kQ=";
}) + "/plugins";
})
+ "/plugins";
};
};

View File

@ -17,11 +17,9 @@ rec {
config = {
modules = {
};
home.packages = with pkgs; [
];
};
}

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Audio module";
# TODO: Group these in categories (like instruments/VSTs or sth)

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Emacs module";
# TODO: Use an enum for this not individual options

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Email";
autosync = mkEnableOpt "Automatically call \"notmuch new\" via systemd timer";
imapnotify = mkEnableOpt "Use imapnotify to sync and index mail automatically";

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Firefox";
wayland = mkBoolOpt false "Enable firefox wayland support";
vaapi = mkBoolOpt false "Enable firefox vaapi support";

View File

@ -1,9 +1,8 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Fish";
}

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Flatpak module";
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";

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Gaming module";
# discordElectron.enable = mkEnableOpt "Discord (Electron) (nixpkgs)";

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Gnome Desktop";
# TODO: Add option for dash-to-dock
extensions = mkBoolOpt false "Enable Gnome shell-extensions";

View File

@ -40,7 +40,8 @@ in {
mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
patches = (oldAttrs.patches or []) ++ [workspaces-patch];
});
in mkIf cfg.enable {
in
mkIf cfg.enable {
assertions = [
{
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: Use this approach for every program that supports it, makes things much easier,
# 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");
# linkWaybarConfig = hm.dag.entryAfter ["writeBoundary"]

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Hyprland Window Manager + Compositor";
theme = mkOption {

View File

@ -1,9 +1,8 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Kitty";
}

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Misc module";
keepass = {

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "NeoVim";
alias = mkBoolOpt false "Link nvim to vim/vi";
}

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Nextcloud Client";
autostart = mkBoolOpt false "Autostart the Nextcloud client (systemd)";
}

View File

@ -1,9 +1,8 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Plasma Desktop";
}

View File

@ -1,10 +1,9 @@
{
lib,
mylib
mylib,
}:
with lib;
with mylib.modules;
{
with mylib.modules; {
enable = mkEnableOpt "Ranger";
preview = mkBoolOpt false "Enable Ranger image preview";
}