From c2ca05b11764c5510ad6908cd4eadfad01b7ac4c Mon Sep 17 00:00:00 2001 From: wer-zen Date: Tue, 26 Aug 2025 13:51:12 +0200 Subject: [PATCH] flake.nix update --- flake.lock | 6 ++-- flake.nix | 2 +- nix/default.nix | 84 ------------------------------------------------- 3 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 nix/default.nix diff --git a/flake.lock b/flake.lock index 2a54f7a..bff5156 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756125398, + "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 16e04e3..239cdf2 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,6 @@ } ); - defaultPackage = eachSystem (system: self.packages.${system}.default); + defaultPackage = eachSystem (system: self.packages.${system}); }; } diff --git a/nix/default.nix b/nix/default.nix deleted file mode 100644 index 7834f17..0000000 --- a/nix/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - rev, - lib, - stdenv, - makeWrapper, - makeFontsConf, - ddcutil, - brightnessctl, - cava, - networkmanager, - wl-clipboard, - libnotify, - bluez, - bash, - coreutils, - findutils, - file, - material-symbols, - roboto, - inter-nerdfont, - matugen, - cliphist, - swww, - gpu-screen-recorder, - gcc, - qt6, - quickshell, - xkeyboard-config, - extraRuntimeDeps ? [], -}: let - runtimeDeps = - [ - bash - bluez - brightnessctl - cava - cliphist - coreutils - ddcutil - file - findutils - gpu-screen-recorder - libnotify - matugen - networkmanager - swww - wl-clipboard - ] - ++ extraRuntimeDeps; - - fontconfig = makeFontsConf { - fontDirectories = [ - material-symbols - roboto - inter-nerdfont - ]; - }; -in - stdenv.mkDerivation { - pname = "noctalia-shell"; - version = "${rev}"; - src = ./..; - - nativeBuildInputs = [gcc makeWrapper qt6.wrapQtAppsHook]; - buildInputs = [quickshell xkeyboard-config qt6.qtbase]; - propagatedBuildInputs = runtimeDeps; - - installPhase = '' - mkdir -p $out/share/noctalia-shell - cp -r ./* $out/share/noctalia-shell - - makeWrapper ${quickshell}/bin/qs $out/bin/noctalia-shell \ - --prefix PATH : "${lib.makeBinPath runtimeDeps}" \ - --set FONTCONFIG_FILE "${fontconfig}" \ - --add-flags "-p $out/share/noctalia-shell" - ''; - - meta = { - description = "A sleek and minimal desktop shell thoughtfully crafted for Wayland, built with Quickshell."; - homepage = "https://github.com/noctalia-dev/noctalia-shell"; - license = lib.licenses.mit; - mainProgram = "noctalia-shell"; - }; - }