From 7b463d06ff19357b4ae1864b218e9f1df3af0ba8 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Thu, 19 Jan 2023 15:17:15 +0100 Subject: [PATCH] Switch SDDM to greetd --- flake.lock | 252 ++++-------------- flake.nix | 10 +- hosts/miku.nix | 9 +- lib/baseSystem.nix | 3 + lib/mkSystem.nix | 4 - modules/desktop/plasma.nix | 63 ++--- .../applications/desktop/qtgreet/default.nix | 31 +++ packages/default.nix | 15 +- packages/development/cpp/dfl-app/default.nix | 22 ++ packages/development/cpp/dfl-ipc/default.nix | 21 ++ .../development/cpp/dfl-utils/default.nix | 21 ++ packages/development/cpp/wayqt/default.nix | 22 ++ packages/misc/video/animdl/default.nix | 19 ++ 13 files changed, 243 insertions(+), 249 deletions(-) create mode 100644 packages/applications/desktop/qtgreet/default.nix create mode 100644 packages/development/cpp/dfl-app/default.nix create mode 100644 packages/development/cpp/dfl-ipc/default.nix create mode 100644 packages/development/cpp/dfl-utils/default.nix create mode 100644 packages/development/cpp/wayqt/default.nix create mode 100644 packages/misc/video/animdl/default.nix diff --git a/flake.lock b/flake.lock index b70680a..ef7705c 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1671818956, - "narHash": "sha256-+jt1dHKfxrWWHN3cz4mAW0zA57AQOXDgoTyz3nX6TK0=", + "lastModified": 1673433023, + "narHash": "sha256-wF5qhT3UvGk1Ouog+wEvm21oeD6rvzXg+/wcfPJq0BI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d89f91c7c5ba124348e097c45f1bf8882f5c60be", + "rev": "d85438fe16bfef13004bc90a50661d0c74252970", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1671786159, - "narHash": "sha256-Aeh1ZlQoeRH1zXGHgNA1s/SoReRJeP9BEMvay23catk=", + "lastModified": 1673343300, + "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "eb9ff9556d60f9763aac88de7a50b1a1c7a1e235", + "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e", "type": "github" }, "original": { @@ -214,11 +214,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1669992734, - "narHash": "sha256-392j/25MF9IHssvGApM454fAkQ8sFCqaf+24cuCImD4=", + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f26dec249deb2ad2d53eb3f5a0d558620035642", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1665655007, - "narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=", + "lastModified": 1672780900, + "narHash": "sha256-DxuSn6BdkZapIbg76xzYx1KhVPEZeBexMkt1q/sMVPA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cbc6500dfca22d907054f68c564019b3b6cf295", + "rev": "54245e1820caabd8a0b53ce4d47e4d0fefe04cd4", "type": "github" }, "original": { @@ -251,98 +251,6 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": [ - "nixpkgs" - ], - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1671724331, - "narHash": "sha256-3LmSPx6/8xp06L/QaCwkxn804gJ3QaSsZKY3kiCIHNE=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "e6cbb6072ba0cfc2ec4ad22e6266caa5d134be26", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "flake": false, - "locked": { - "lastModified": 1670703428, - "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "flake": false, - "locked": { - "lastModified": 1670703428, - "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_3": { - "flake": false, - "locked": { - "lastModified": 1670703428, - "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-xdg": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671300042, - "narHash": "sha256-8zapwbbaC+5RtaXVDcqf9X5b/yd/gNg+clF/LZdt+y4=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "45bbf9a3b20b2c97819e2379a10fe351258e35b3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "impermanence": { "locked": { "lastModified": 1640808801, @@ -360,11 +268,11 @@ }, "impermanence_2": { "locked": { - "lastModified": 1646131459, - "narHash": "sha256-GPmgxvUFvQ1GmsGfWHy9+rcxWrczeDhS9XnAIPHi9XQ=", + "lastModified": 1668668915, + "narHash": "sha256-QjY4ZZbs9shwO4LaLpvlU2bO9J1juYhO9NtV3nrbnYQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4", + "rev": "5df9108b346f8a42021bf99e50de89c9caa251c3", "type": "github" }, "original": { @@ -377,11 +285,11 @@ "libwacom-surface": { "flake": false, "locked": { - "lastModified": 1655824681, - "narHash": "sha256-mXSvD7iyTK48oniIQGudNv67UVY1FCpF9LsSGJvN0xE=", + "lastModified": 1665772749, + "narHash": "sha256-UddKdTgEyz43ymr8O/CjT6aTnMtd1Q8OEHj49TGzN5k=", "owner": "linux-surface", "repo": "libwacom-surface", - "rev": "e029960464251fce0966207e7428f0b2ffb3dbf7", + "rev": "0f068fcaa16a6e0450a3324e50632cfdc6a4cf83", "type": "github" }, "original": { @@ -394,11 +302,11 @@ "linux-surface": { "flake": false, "locked": { - "lastModified": 1660144070, - "narHash": "sha256-nPdPtmnm/BjrwGvPy3OCeLXGPFRQxED9bo2W2GA5SKg=", + "lastModified": 1672934175, + "narHash": "sha256-HTIuRBZk0prhUPd2KnsXGo+ZyBsMwERN7P8WJH1RG3M=", "owner": "linux-surface", "repo": "linux-surface", - "rev": "42d9466dc7b6c433fbc80f88f0f68451fab017d9", + "rev": "487e64047ca047dde9a062909a87410e7bb86845", "type": "github" }, "original": { @@ -473,11 +381,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1671631481, - "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=", + "lastModified": 1673390851, + "narHash": "sha256-dAhsJUIxfg5gWE+uQ3e0ICssS0QPQZt7Pa+75NKtAEw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd", + "rev": "9335068481026234c1f41079ad54e28ad92453de", "type": "github" }, "original": { @@ -505,10 +413,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669791787, - "narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=", - "path": "/nix/store/8c75f43ms4brvphrgdy1a8vy5dy1j0si-source", - "rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1", + "lastModified": 1672617983, + "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=", + "path": "/nix/store/xaz5fk93mij8i1p7gpccq34mzpm73diq-source", + "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4", "type": "path" }, "original": { @@ -534,11 +442,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1671200928, - "narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=", + "lastModified": 1671983799, + "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", "owner": "nixos", "repo": "nixpkgs", - "rev": "757b82211463dd5ba1475b6851d3731dfe14d377", + "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", "type": "github" }, "original": { @@ -550,11 +458,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1671722432, - "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", + "lastModified": 1673226411, + "narHash": "sha256-b6cGb5Ln7Zy80YO66+cbTyGdjZKtkoqB/iIIhDX9gRA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", + "rev": "aa1d74709f5dac623adb4d48fdfb27cc2c92a4d4", "type": "github" }, "original": { @@ -656,11 +564,11 @@ }, "nur": { "locked": { - "lastModified": 1671811449, - "narHash": "sha256-x3lmyHkfaDapYaMgKV3olLAxsdF36xvQFxnEUMVdydM=", + "lastModified": 1673426865, + "narHash": "sha256-zNoCWLOqq2X9d188BlIDG46KcTkQ8AGaY9g4yozl2Zs=", "owner": "nix-community", "repo": "nur", - "rev": "e369ab33b7d8efc7821335b1e369ae0a7cfa62c5", + "rev": "a77112aa2598b741261a2af1383ac372e6f9c104", "type": "github" }, "original": { @@ -711,11 +619,11 @@ "rnix-lsp": "rnix-lsp_2" }, "locked": { - "lastModified": 1670704038, - "narHash": "sha256-zxvBi242NJQAQ5ygS5CykTub2QRM7qw6v0LTScPIhYQ=", + "lastModified": 1673210205, + "narHash": "sha256-3jpfVOwn1FXO6B+nETK0ZGdcCa503nNgEfd9WZPtcWI=", "ref": "refs/heads/master", - "rev": "980b762b6132d0b86bbac0f42ac87f552ec05650", - "revCount": 114, + "rev": "c96277766b091059468b63f1aaebbc32390b6431", + "revCount": 116, "type": "git", "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git" }, @@ -726,11 +634,11 @@ }, "pkg-compile": { "locked": { - "lastModified": 1659803779, - "narHash": "sha256-+5zkHlbcbFyN5f3buO1RAZ9pH1wXLxCesUJ0vFmLr9Y=", + "lastModified": 1672791794, + "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f44884060cb94240efbe55620f38a8ec8d9af601", + "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", "type": "github" }, "original": { @@ -742,11 +650,11 @@ }, "pkg-stable": { "locked": { - "lastModified": 1669834992, - "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=", + "lastModified": 1672844754, + "narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "rev": "e9ade2c8240e00a4784fac282a502efff2786bdc", "type": "github" }, "original": { @@ -758,11 +666,11 @@ }, "pkg-unstable": { "locked": { - "lastModified": 1665643254, - "narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=", + "lastModified": 1672791794, + "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7", + "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", "type": "github" }, "original": { @@ -803,11 +711,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1658963292, - "narHash": "sha256-4OIpATLdPQvryyhRQPELeqNYC0n6PCyjD6LCPdwOztc=", + "lastModified": 1669555118, + "narHash": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "ff18e04551a39ccdab0ff9c83926db3807b23478", + "rev": "95d40673fe43642e2e1144341e86d0036abd95d9", "type": "github" }, "original": { @@ -822,8 +730,6 @@ "emacs": "emacs", "flake-utils": "flake-utils_2", "home-manager": "home-manager", - "hyprland": "hyprland", - "hyprland-xdg": "hyprland-xdg", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nur": "nur", @@ -934,11 +840,11 @@ }, "utils_4": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -961,46 +867,6 @@ "repo": "flake-utils", "type": "github" } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1669925104, - "narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "c8eb24d30e18c165728b8788a10716611c3b633d", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1670892912, - "narHash": "sha256-HC1qHrGXivdzNlWuuWcxX/P7OkNrlLbhzaqLx0mslPA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "9fb4fae94b9bd80395c193dcaf6fdf740550cff1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e55a7be..84a8020 100644 --- a/flake.nix +++ b/flake.nix @@ -12,14 +12,6 @@ ostylk-home.url = "git+https://destiny.ostylk.de/gitea/NixDistro/Home.git"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; tablet-mode.url = "git+https://destiny.ostylk.de/gitea/NixDistro/tablet-mode.git"; - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprland-xdg = { - url = "github:hyprwm/xdg-desktop-portal-hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -64,7 +56,7 @@ ]; }; in { - inherit (pkgs) gamescope custom-apparmor-utils authelia; + inherit (pkgs) wayqt dfl-ipc dfl-applications dfl-utils qtgreet; }; }); } diff --git a/hosts/miku.nix b/hosts/miku.nix index 8888c8b..039bb2f 100644 --- a/hosts/miku.nix +++ b/hosts/miku.nix @@ -52,8 +52,6 @@ zoom-vm #lapce - - xdg-desktop-portal-hyprland ]; ptw = { @@ -118,8 +116,6 @@ adb.enable = true; gnupg.agent.pinentryFlavor = "qt"; evolution.enable = true; - - hyprland.enable = true; }; virtualisation = { @@ -127,7 +123,10 @@ # enable = true; # dockerCompat = true; #}; - docker.enable = true; + docker = { + enable = true; + storageDriver = "btrfs"; + }; }; boot = let diff --git a/lib/baseSystem.nix b/lib/baseSystem.nix index d1853ac..b5c501a 100644 --- a/lib/baseSystem.nix +++ b/lib/baseSystem.nix @@ -101,6 +101,9 @@ in { #nerdfonts ]; + # For home-manager + programs.dconf.enable = true; + # We don't tolerate non-free software, except for Steam and Linux firmware nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel" diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index 3a9dcec..7ad8f6d 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -35,9 +35,6 @@ in inputs.nixpkgs.lib.nixosSystem { home-manager.useGlobalPkgs = true; } - # Hyprland - inputs.hyprland.nixosModules.default - # Overlays (util.mkOverlayFromInput "stable" inputs.stable) (util.mkOverlayFromInput "unstable" inputs.nixpkgs) @@ -45,7 +42,6 @@ in inputs.nixpkgs.lib.nixosSystem { nixpkgs.overlays = [ nur.overlay emacs.overlay - inputs.hyprland-xdg.overlays.default (import ../packages) (import ../overlays/simple.nix) (import ../overlays/phosh.nix) diff --git a/modules/desktop/plasma.nix b/modules/desktop/plasma.nix index 8b5fbbf..bd92859 100644 --- a/modules/desktop/plasma.nix +++ b/modules/desktop/plasma.nix @@ -36,41 +36,6 @@ in { greetd.enableKwallet = true; }; services.xserver = { - displayManager.sddm = let - sddm-sugar-dark-configured = pkgs.sddm-sugar-dark.override { - config = { - General = { - Background = "${cfg.sddm.backgroundImage}"; - ScaleImageCropped = true; - ScreenWidth = builtins.toString cfg.sddm.screenWidth; - ScreenHeight = builtins.toString cfg.sddm.screenHeight; - - MainColor = "navajowhite"; - AccentColor = "white"; - RoundCorners = 20; - ScreenPadding = 0; - Font = "Noto Sans"; - FontSize = ""; - - Locale = ""; - HourFormat = "HH:mm"; - DataFormat = "dddd, d of MMMM"; - - ForceLastUser = true; - ForcePasswordFocus = true; - ForceHideCompletePassword = true; - ForceHideVirtualKeyboardButton = false; - - HeaderText = "Welcome!"; - }; - }; - }; - in { - enable = true; - autoNumlock = true; - - theme = "${sddm-sugar-dark-configured}/usr/share/sddm/themes/sugar-dark"; - }; desktopManager.plasma5 = { enable = true; runUsingSystemd = true; @@ -141,6 +106,34 @@ in { }; }; + users.users.greeter = { + home = "/var/lib/greeter"; + createHome = true; + isSystemUser = true; + }; + + services.greetd = { + enable = true; + settings = let + swayGreeterConfig = pkgs.writeText "sway-config" '' +exec "${pkgs.qtgreet}/bin/qtgreet -d ${config.users.users.greeter.home}/data; ${pkgs.sway}/bin/swaymsg exit" + +bindsym Mod4+shift+e exec ${pkgs.sway}/bin/swaynag \ +-t warning \ +-m 'What do you want to do?' \ +-b 'Poweroff' 'systemctl poweroff' \ +-b 'Reboot' 'systemctl reboot' + +input * { + xkb_layout de +} + ''; + in { + default_session = { + command = "${pkgs.sway}/bin/sway --config ${swayGreeterConfig}"; + }; + }; + }; xdg.portal = { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-kde ]; diff --git a/packages/applications/desktop/qtgreet/default.nix b/packages/applications/desktop/qtgreet/default.nix new file mode 100644 index 0000000..ed91c01 --- /dev/null +++ b/packages/applications/desktop/qtgreet/default.nix @@ -0,0 +1,31 @@ +{ + stdenv +, lib, fetchFromGitLab +, meson, ninja, pkg-config +, qtbase, wrapQtAppsHook +, wlroots_0_16, wayland, pixman +, dfl-applications, dfl-utils, dfl-ipc, wayqt +}: + +stdenv.mkDerivation { + pname = "qtgreet"; + version = "20230117"; + + src = fetchFromGitLab { + owner = "marcusbritanicus"; + repo = "QtGreet"; + rev = "666603c38bbc408fd56126f3c8508009edf8dc44"; + sha256 = "0gigmlg4a0ddzhfnkhbrh67m23g6vhzayfv4gbvqjmkky91qnz93"; + }; + + mesonFlags = [ + "-Dnodynpath=true" + ]; + + buildInputs = [ + qtbase meson ninja pkg-config + wlroots_0_16 wayland pixman + wayqt dfl-applications dfl-ipc dfl-utils + ]; + nativeBuildInputs = [ wrapQtAppsHook ]; +} diff --git a/packages/default.nix b/packages/default.nix index 65b115b..83b4634 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -37,8 +37,15 @@ let })).override { wf-config = wf-config_0_8; }; + + dfl-ipc = prev.libsForQt5.callPackage development/cpp/dfl-ipc {}; + wayqt = prev.libsForQt5.callPackage development/cpp/wayqt {}; + dfl-utils = prev.libsForQt5.callPackage development/cpp/dfl-utils {}; + dfl-applications = prev.libsForQt5.callPackage development/cpp/dfl-app { + inherit dfl-ipc; + }; in { - inherit discord-system-electron; + inherit discord-system-electron dfl-ipc dfl-applications dfl-utils wayqt; vfio-isolate = prev.callPackage ./tools/virtualisation/vfio-isolate {}; mopidy-funkwhale = prev.callPackage ./applications/audio/mopidy/funkwhale.nix {}; @@ -56,6 +63,7 @@ in { pySmartDL = pySmartDL; cfscrape = cfscrape; }; + animdl = prev.callPackage ./misc/video/animdl {}; surface-control = prev.callPackage ./tools/system/surface-control {}; @@ -71,7 +79,6 @@ in { psst = prev.callPackage tools/audio/psst {}; wlrootsqt = prev.libsForQt5.callPackage ./wlrootsqt.nix {}; - qtgreet = prev.libsForQt5.callPackage ./qtgreet.nix {}; #spice-gtk = prev.callPackage temp/spice-gtk/default.nix {}; @@ -91,5 +98,7 @@ in { custom-apparmor-utils = prev.callPackage temp/apparmor-utils.nix {}; - authelia = prev.callPackage temp/authelia.nix {}; + qtgreet = prev.libsForQt5.callPackage applications/desktop/qtgreet { + inherit dfl-applications dfl-utils dfl-ipc wayqt; + }; } diff --git a/packages/development/cpp/dfl-app/default.nix b/packages/development/cpp/dfl-app/default.nix new file mode 100644 index 0000000..64edab5 --- /dev/null +++ b/packages/development/cpp/dfl-app/default.nix @@ -0,0 +1,22 @@ +{ + stdenv +, lib, fetchFromGitLab +, meson, ninja, pkg-config +, qtbase, wrapQtAppsHook +, dfl-ipc +}: + +stdenv.mkDerivation { + pname = "dfl-applications"; + version = "20221012"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "Applications"; + rev = "08b6740379d596f40562b37b509705f5c8af0c42"; + sha256 = "1jiymrg6236572yk6rnbl183fisl4kqr5c2zji910n93zv7lqqiv"; + }; + + buildInputs = [ qtbase meson ninja pkg-config dfl-ipc ]; + nativeBuildInputs = [ wrapQtAppsHook ]; +} diff --git a/packages/development/cpp/dfl-ipc/default.nix b/packages/development/cpp/dfl-ipc/default.nix new file mode 100644 index 0000000..a3cc2c0 --- /dev/null +++ b/packages/development/cpp/dfl-ipc/default.nix @@ -0,0 +1,21 @@ +{ + stdenv +, lib, fetchFromGitLab +, meson, ninja, pkg-config +, qtbase, wrapQtAppsHook +}: + +stdenv.mkDerivation { + pname = "dfl-ipc"; + version = "20221012"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "IPC"; + rev = "7370f8da2601a57d85d0989339f6e2fe700f9813"; + sha256 = "1iv1kc9i75q56h0zi4fncf0hdf11wjzvjkik14n9nxgbz89w7cyh"; + }; + + buildInputs = [ qtbase meson ninja pkg-config ]; + nativeBuildInputs = [ wrapQtAppsHook ]; +} diff --git a/packages/development/cpp/dfl-utils/default.nix b/packages/development/cpp/dfl-utils/default.nix new file mode 100644 index 0000000..44fe2f5 --- /dev/null +++ b/packages/development/cpp/dfl-utils/default.nix @@ -0,0 +1,21 @@ +{ + stdenv +, lib, fetchFromGitLab +, meson, ninja, pkg-config +, qtbase, wrapQtAppsHook +}: + +stdenv.mkDerivation { + pname = "dfl-utils"; + version = "20221026"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "Utils"; + rev = "603f95cae18998e9ff8b205c3801699056549505"; + sha256 = "0wbiaw6d2n13cpnpnk7089c9jqbwxn0dp9qz4n9cp0ic3z5w0gq4"; + }; + + buildInputs = [ qtbase meson ninja pkg-config ]; + nativeBuildInputs = [ wrapQtAppsHook ]; +} diff --git a/packages/development/cpp/wayqt/default.nix b/packages/development/cpp/wayqt/default.nix new file mode 100644 index 0000000..f18f72f --- /dev/null +++ b/packages/development/cpp/wayqt/default.nix @@ -0,0 +1,22 @@ +{ + stdenv +, lib, fetchFromGitLab +, meson, ninja, pkg-config +, qtbase, wrapQtAppsHook +, wayland, wlroots_0_16 +}: + +stdenv.mkDerivation { + pname = "wayqt"; + version = "20230112"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "wayqt"; + rev = "8604391059da1acd5c5b67f44742af10919bb525"; + sha256 = "0smbvmgii7f6lsylwg06d7lf83nyiggz8iz7aw3dhf5b8xdhgbaw"; + }; + + buildInputs = [ qtbase wayland wlroots_0_16 meson ninja pkg-config ]; + nativeBuildInputs = [ wrapQtAppsHook ]; +} diff --git a/packages/misc/video/animdl/default.nix b/packages/misc/video/animdl/default.nix new file mode 100644 index 0000000..85b7e24 --- /dev/null +++ b/packages/misc/video/animdl/default.nix @@ -0,0 +1,19 @@ +{ fetchFromGitHub, python, lib, poetry2nix }: + +poetry2nix.mkPoetryApplication rec { + inherit python; + + src = fetchFromGitHub { + owner = "justfoolingaround"; + repo = "animdl"; + ref = "9167e03ecb60c21ae1ead90d1472cd7157e1d8b7"; + sha256 = "1v33kxlxc38awdpxqsb6bfdw0sc45dibg0b4c0qld0pddlppm0qh"; + }; + prijectDir = src; + + doCheck = false; + + meta = with lib; { + inherit (python.meta) platforms; + }; +};