Compare commits

3 Commits

Author SHA1 Message Date
e758eaef20 Don't override hyprland package 2024-08-24 10:42:50 -07:00
8e7f1f1577 Add moonlight 2024-08-24 09:56:27 -07:00
4d34909b52 Just pass inputs around 2024-08-24 09:54:17 -07:00
4 changed files with 5 additions and 48 deletions

View File

@@ -22,7 +22,7 @@
}; };
}; };
outputs = { nixpkgs, home-manager, hyprland, hy3, ... }: outputs = { nixpkgs, home-manager, hyprland, ... } @inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@@ -40,7 +40,7 @@
# Optionally use extraSpecialArgs # Optionally use extraSpecialArgs
# to pass through arguments to home.nix # to pass through arguments to home.nix
extraSpecialArgs = { inherit hy3; inherit hyprland; }; extraSpecialArgs = { inherit inputs; };
}; };
}; };
} }

View File

@@ -3,7 +3,6 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
nextcloudTalkDesktop = pkgs.callPackage ./modules/applications/nextcloud-talk-desktop/package.nix {}; nextcloudTalkDesktop = pkgs.callPackage ./modules/applications/nextcloud-talk-desktop/package.nix {};
dodo = pkgs.callPackage ./modules/applications/networking/mailreaders/dodo/default.nix {};
in in
{ {
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
@@ -52,6 +51,7 @@ in
pkgs.killall pkgs.killall
pkgs.kitty pkgs.kitty
pkgs.less pkgs.less
pkgs.moonlight-qt
pkgs.ncdu pkgs.ncdu
pkgs.pandoc pkgs.pandoc
pkgs.pinentry-qt pkgs.pinentry-qt
@@ -62,7 +62,6 @@ in
pkgs.wofi pkgs.wofi
pkgs.vlc pkgs.vlc
dodo
nextcloudTalkDesktop nextcloudTalkDesktop
]; ];

View File

@@ -1,41 +0,0 @@
{ pkgs
, lib
, python3
, makeWrapper
, notmuch
, w3m
}:
python3.pkgs.buildPythonApplication rec {
pname = "dodo";
version = "unstable-2024-07-04";
format = "pyproject";
src = pkgs.fetchFromGitHub {
repo = pname;
owner = "akissinger";
rev = "503763c4d738af79ee0d761c47920e9a7b61855a";
sha256 = "sha256-Am1sFMRDlSNmVSQyuHtQj9weB90AT4d1dhnhsUlA6Zs=";
};
nativeBuildInputs = with python3.pkgs; [ setuptools-scm makeWrapper ];
propagatedBuildInputs = with python3.pkgs; [
bleach
pyqt6
pyqt6-sip
pyqt6-webengine
];
postInstall = ''
wrapProgram $out/bin/dodo --prefix PATH ":" \
${lib.makeBinPath [ notmuch w3m ]}
'';
meta = with lib; {
description = "A graphical, hackable email client based on notmuch";
homepage = "https://github.com/akissinger/dodo";
license = licenses.gpl3Only;
maintainers = with maintainers; [ matthiasbeyer ];
};
}

View File

@@ -1,4 +1,4 @@
{ hyprland, hy3, ... }: { inputs, ... }:
{ {
imports = [ imports = [
@@ -7,8 +7,7 @@
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = hyprland.packages.x86_64-linux.hyprland; plugins = [ inputs.hy3.packages.x86_64-linux.hy3 ];
plugins = [ hy3.packages.x86_64-linux.hy3 ];
settings = { settings = {
"$mod" = "SUPER"; "$mod" = "SUPER";
"$terminal" = "kitty"; "$terminal" = "kitty";