Add dodo

flake.lock

@@ -3,22 +3,18 @@
     "aquamarine": {
       "inputs": {
         "hyprutils": [
-          "system-flake",
           "hyprland",
           "hyprutils"
         ],
         "hyprwayland-scanner": [
-          "system-flake",
           "hyprland",
           "hyprwayland-scanner"
         ],
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -57,31 +53,9 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "system-flake",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1723986931,
-        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "hy3": {
       "inputs": {
         "hyprland": [
-          "system-flake",
           "hyprland"
         ]
       },
@@ -103,17 +77,14 @@
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
-          "system-flake",
           "hyprland",
           "hyprlang"
         ],
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -139,14 +110,13 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
         "lastModified": 1723058230,
         "narHash": "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=",
-        "ref": "refs/heads/main",
         "rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259",
         "revCount": 5069,
         "submodules": true,
@@ -163,13 +133,11 @@
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "xdph",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "xdph",
           "systems"
@@ -192,17 +160,14 @@
     "hyprlang": {
       "inputs": {
         "hyprutils": [
-          "system-flake",
           "hyprland",
           "hyprutils"
         ],
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -224,12 +189,10 @@
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -251,12 +214,10 @@
     "hyprwayland-scanner": {
       "inputs": {
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]
@@ -276,22 +237,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1723637854,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1722185531,
         "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
@@ -307,7 +252,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1723637854,
         "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
@@ -326,28 +271,9 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "system-flake": "system-flake"
-      }
-    },
-    "system-flake": {
-      "inputs": {
-        "home-manager": "home-manager_2",
         "hy3": "hy3",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "dirtyRev": "c11d973b4b80e9093469c2d631413400af2d0122-dirty",
-        "dirtyShortRev": "c11d973-dirty",
-        "lastModified": 1724450819,
-        "narHash": "sha256-m9w2HgDUvtXegSjuIPE3whTYOPnyEZuAdIRZLMtGQBc=",
-        "type": "git",
-        "url": "file:///etc/nixos"
-      },
-      "original": {
-        "type": "git",
-        "url": "file:///etc/nixos"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
@@ -369,17 +295,14 @@
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": [
-          "system-flake",
           "hyprland",
           "hyprlang"
         ],
         "nixpkgs": [
-          "system-flake",
           "hyprland",
           "nixpkgs"
         ],
         "systems": [
-          "system-flake",
           "hyprland",
           "systems"
         ]

flake.nix

@@ -10,13 +10,19 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    system-flake = {
+    hyprland = {
       type = "git";
-      url = "file:///etc/nixos";
+      url = "https://github.com/hyprwm/Hyprland";
+      submodules = true;
+      rev = "9a09eac79b85c846e3a865a9078a3f8ff65a9259";
+    };
+    hy3 = {
+      url = "github:outfoxxed/hy3?ref=hl0.42.0";
+      inputs.hyprland.follows = "hyprland";
     };
   };
 
-  outputs = { nixpkgs, home-manager, ... } @inputs :
+  outputs = { nixpkgs, home-manager, hyprland, hy3, ... }:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
@@ -27,17 +33,14 @@
         # Specify your home configuration modules here, for example,
         # the path to your home.nix.
         modules = [
-          inputs.system-flake.inputs.hyprland.homeManagerModules.default
+          hyprland.homeManagerModules.default
 
           ./home.nix
         ];
 
         # Optionally use extraSpecialArgs
         # to pass through arguments to home.nix
-        extraSpecialArgs = {
-          hy3 = inputs.system-flake.inputs.hy3;
-          hyprland = inputs.system-flake.inputs.hyprland;
-        };
+        extraSpecialArgs = { inherit hy3; inherit hyprland; };
       };
     };
 }

home-default.nix

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

modules/applications/networking/mailreaders/dodo/default.nix

@@ -0,0 +1,41 @@
+{ 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 ];
+  };
+}

modules/window_managers/hyprland/z790prors.nix

@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }:
 
 {
-  wayland.windowManager.hyprland.settings.monitor = ",preferred,3440x1440@164.90Hz,1.33333";
+  wayland.windowManager.hyprland.settings.monitor = "DP-1,3440x1440@164.90,0x0,1.33333,vrr,1,bitdepth,10";
 }