forked from Shinonome/dots-hyprland
Update dist-nix
- Not use NixGL but let home-manager automatically handle it (since hm 25.11) - Add libqalculate
This commit is contained in:
@@ -3,23 +3,24 @@
|
||||
description = "illogical-impulse";
|
||||
|
||||
inputs = {
|
||||
# Qt 6.10 is not yet available from released version of nixpkgs.
|
||||
#nixpkgs.url = "nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "nixpkgs/nixos-25.11";
|
||||
#nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
#url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/master";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
#url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixgl.url = "github:nix-community/nixGL";
|
||||
#nixgl.url = "github:nix-community/nixGL";
|
||||
quickshell = {
|
||||
url = "github:quickshell-mirror/quickshell/db1777c20b936a86528c1095cbcb1ebd92801402";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, nixgl, quickshell, ... }:
|
||||
outputs = { nixpkgs, home-manager,
|
||||
#nixgl,
|
||||
quickshell, ... }:
|
||||
let
|
||||
home_attrs = rec {
|
||||
username = import ./username.nix;
|
||||
@@ -36,7 +37,9 @@
|
||||
homeConfigurations = {
|
||||
illogical_impulse = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
extraSpecialArgs = { inherit home_attrs nixgl quickshell; };
|
||||
extraSpecialArgs = { inherit home_attrs
|
||||
#nixgl
|
||||
quickshell; };
|
||||
modules = [
|
||||
./home.nix
|
||||
];
|
||||
|
||||
@@ -1,8 +1,13 @@
|
||||
{ config, lib, pkgs, nixgl, quickshell, home_attrs, ... }:
|
||||
{ config, lib, pkgs,
|
||||
#nixgl,
|
||||
quickshell, home_attrs, ... }:
|
||||
{
|
||||
programs.home-manager.enable = true;
|
||||
nixGL.packages = nixgl.packages;
|
||||
nixGL.defaultWrapper = "mesa";
|
||||
|
||||
# Necessary for non-NixOS to handle GPU (since home-manager version 25.11)
|
||||
targets.genericLinux.enable = true;
|
||||
#nixGL.packages = nixgl.packages;
|
||||
#nixGL.defaultWrapper = "mesa";
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
@@ -27,7 +32,8 @@
|
||||
systemd.enable = false; plugins = []; settings = {}; extraConfig = "";
|
||||
enable = true;
|
||||
## Use NixGL
|
||||
package = config.lib.nixGL.wrap pkgs.hyprland;
|
||||
#package = config.lib.nixGL.wrap pkgs.hyprland;
|
||||
package = pkgs.hyprland;
|
||||
};
|
||||
|
||||
home = {
|
||||
@@ -167,6 +173,7 @@
|
||||
songrec #songrec
|
||||
translate-shell #translate-shell
|
||||
wlogout #wlogout
|
||||
libqalculate #libqalculate
|
||||
|
||||
]
|
||||
++ [
|
||||
@@ -174,7 +181,9 @@
|
||||
|
||||
### illogical-impulse-quickshell-git
|
||||
#(config.lib.nixGL.wrap quickshell.packages.x86_64-linux.default)
|
||||
(import ./quickshell.nix { inherit pkgs quickshell; nixGLWrap = config.lib.nixGL.wrap; })
|
||||
(import ./quickshell.nix { inherit pkgs quickshell;
|
||||
#nixGLWrap = config.lib.nixGL.wrap;
|
||||
})
|
||||
];
|
||||
}//home_attrs;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
{ pkgs, quickshell, nixGLWrap, ... }:
|
||||
{ pkgs, quickshell,
|
||||
#nixGLWrap,
|
||||
... }:
|
||||
let
|
||||
qs = nixGLWrap quickshell.packages.x86_64-linux.default;
|
||||
#qs = nixGLWrap quickshell.packages.x86_64-linux.default;
|
||||
qs = quickshell.packages.x86_64-linux.default;
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
name = "illogical-impulse-quickshell-wrapper";
|
||||
meta = with pkgs.lib; {
|
||||
description = "Quickshell wrapped with NixGL + bundled Qt deps for home-manager usage";
|
||||
#description = "Quickshell wrapped with NixGL + bundled Qt deps for home-manager usage";
|
||||
description = "Quickshell bundled Qt deps for home-manager usage";
|
||||
license = licenses.gpl3Only;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user