Compare commits
3 commits
5ae4cbd0b2
...
0a76909851
Author | SHA1 | Date | |
---|---|---|---|
0a76909851 | |||
614d726dc5 | |||
b6fa1ee221 |
6 changed files with 149 additions and 13 deletions
|
@ -33,6 +33,7 @@
|
||||||
aagl-gtk-on-nix-stable = flake "github:ezKEa/aagl-gtk-on-nix/release-24.11" // stable "nixpkgs";
|
aagl-gtk-on-nix-stable = flake "github:ezKEa/aagl-gtk-on-nix/release-24.11" // stable "nixpkgs";
|
||||||
home-manager-stable = flake "github:nix-community/home-manager/release-24.11" // stable "nixpkgs";
|
home-manager-stable = flake "github:nix-community/home-manager/release-24.11" // stable "nixpkgs";
|
||||||
nix-index-database-stable = flake "github:nix-community/nix-index-database" // stable "nixpkgs";
|
nix-index-database-stable = flake "github:nix-community/nix-index-database" // stable "nixpkgs";
|
||||||
|
nixgl-stable = flake "github:nix-community/nixGL" // stable "nixpkgs";
|
||||||
stylix-stable = flake "github:danth/stylix/release-24.11" // stable "nixpkgs";
|
stylix-stable = flake "github:danth/stylix/release-24.11" // stable "nixpkgs";
|
||||||
|
|
||||||
### Unstable
|
### Unstable
|
||||||
|
@ -64,6 +65,7 @@
|
||||||
nix-index-database-unstable = flake "github:nix-community/nix-index-database" // unstable "nixpkgs";
|
nix-index-database-unstable = flake "github:nix-community/nix-index-database" // unstable "nixpkgs";
|
||||||
nix-vscode-extensions = flake "github:nix-community/nix-vscode-extensions" // unstable "nixpkgs";
|
nix-vscode-extensions = flake "github:nix-community/nix-vscode-extensions" // unstable "nixpkgs";
|
||||||
nixd = flake "github:nix-community/nixd" // unstable "nixpkgs";
|
nixd = flake "github:nix-community/nixd" // unstable "nixpkgs";
|
||||||
|
nixgl-unstable = flake "github:nix-community/nixGL" // unstable "nixpkgs";
|
||||||
stylix-unstable = flake "github:danth/stylix" // unstable "nixpkgs";
|
stylix-unstable = flake "github:danth/stylix" // unstable "nixpkgs";
|
||||||
walker = flake "github:abenz1267/walker?ref=v0.12.8" // unstable "nixpkgs";
|
walker = flake "github:abenz1267/walker?ref=v0.12.8" // unstable "nixpkgs";
|
||||||
|
|
||||||
|
@ -139,6 +141,11 @@
|
||||||
inputs.nix-flatpak.homeManagerModules.nix-flatpak
|
inputs.nix-flatpak.homeManagerModules.nix-flatpak
|
||||||
inputs.walker.homeManagerModules.default
|
inputs.walker.homeManagerModules.default
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Branch-specific overlays
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
inputs."nixgl-${branch}".overlays.default
|
||||||
|
];
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
];
|
];
|
||||||
|
|
98
flake.lock
generated
98
flake.lock
generated
|
@ -1046,6 +1046,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils_10": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": [
|
||||||
|
"stylix-unstable",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_3"
|
||||||
|
@ -1138,18 +1159,12 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_7": {
|
"flake-utils_7": {
|
||||||
"inputs": {
|
|
||||||
"systems": [
|
|
||||||
"stylix-stable",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1659877975,
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1159,9 +1174,24 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_8": {
|
"flake-utils_8": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1659877975,
|
||||||
|
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_9": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": [
|
"systems": [
|
||||||
"stylix-unstable",
|
"stylix-stable",
|
||||||
"systems"
|
"systems"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -2718,6 +2748,48 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixgl-stable": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_7",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-stable"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1713543440,
|
||||||
|
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixGL",
|
||||||
|
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixGL",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixgl-unstable": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_8",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-unstable"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1713543440,
|
||||||
|
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixGL",
|
||||||
|
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nixGL",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738816619,
|
"lastModified": 1738816619,
|
||||||
|
@ -3062,6 +3134,8 @@
|
||||||
"nix-index-database-unstable": "nix-index-database-unstable",
|
"nix-index-database-unstable": "nix-index-database-unstable",
|
||||||
"nix-vscode-extensions": "nix-vscode-extensions",
|
"nix-vscode-extensions": "nix-vscode-extensions",
|
||||||
"nixd": "nixd",
|
"nixd": "nixd",
|
||||||
|
"nixgl-stable": "nixgl-stable",
|
||||||
|
"nixgl-unstable": "nixgl-unstable",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs-master": "nixpkgs-master",
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
"nixpkgs-stable": "nixpkgs-stable_5",
|
"nixpkgs-stable": "nixpkgs-stable_5",
|
||||||
|
@ -3136,7 +3210,7 @@
|
||||||
"base16-vim": "base16-vim",
|
"base16-vim": "base16-vim",
|
||||||
"firefox-gnome-theme": "firefox-gnome-theme_2",
|
"firefox-gnome-theme": "firefox-gnome-theme_2",
|
||||||
"flake-compat": "flake-compat_11",
|
"flake-compat": "flake-compat_11",
|
||||||
"flake-utils": "flake-utils_7",
|
"flake-utils": "flake-utils_9",
|
||||||
"git-hooks": "git-hooks_2",
|
"git-hooks": "git-hooks_2",
|
||||||
"gnome-shell": "gnome-shell",
|
"gnome-shell": "gnome-shell",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
|
@ -3171,7 +3245,7 @@
|
||||||
"base16-vim": "base16-vim_2",
|
"base16-vim": "base16-vim_2",
|
||||||
"firefox-gnome-theme": "firefox-gnome-theme_3",
|
"firefox-gnome-theme": "firefox-gnome-theme_3",
|
||||||
"flake-compat": "flake-compat_12",
|
"flake-compat": "flake-compat_12",
|
||||||
"flake-utils": "flake-utils_8",
|
"flake-utils": "flake-utils_10",
|
||||||
"git-hooks": "git-hooks_3",
|
"git-hooks": "git-hooks_3",
|
||||||
"gnome-shell": "gnome-shell_2",
|
"gnome-shell": "gnome-shell_2",
|
||||||
"home-manager": "home-manager_3",
|
"home-manager": "home-manager_3",
|
||||||
|
|
|
@ -128,6 +128,14 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
url = "github:nix-community/nixd";
|
url = "github:nix-community/nixd";
|
||||||
};
|
};
|
||||||
|
nixgl-stable = {
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||||
|
url = "github:nix-community/nixGL";
|
||||||
|
};
|
||||||
|
nixgl-unstable = {
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
url = "github:nix-community/nixGL";
|
||||||
|
};
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
||||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
|
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||||
|
|
|
@ -18,6 +18,7 @@ with lib; {
|
||||||
nano.enable = true;
|
nano.enable = true;
|
||||||
nh.enable = true;
|
nh.enable = true;
|
||||||
nix-index.enable = true;
|
nix-index.enable = true;
|
||||||
|
nixgl.enable = true;
|
||||||
nushell.enable = true;
|
nushell.enable = true;
|
||||||
polkit.enable = true;
|
polkit.enable = true;
|
||||||
ssh.enable = true;
|
ssh.enable = true;
|
||||||
|
|
41
options/custom/programs/nixgl.nix
Normal file
41
options/custom/programs/nixgl.nix
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; let
|
||||||
|
cfg = config.custom.programs.nixgl;
|
||||||
|
in {
|
||||||
|
options.custom.programs.nixgl = {
|
||||||
|
enable = mkOption {default = false;};
|
||||||
|
wrapper = mkOption {default = "mesa";};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
# https://github.com/nix-community/nixGL
|
||||||
|
#?? nixGL PROGRAM
|
||||||
|
environment.systemPackages = with pkgs.nixgl;
|
||||||
|
optionals (cfg.wrapper == "auto") [
|
||||||
|
#!! Impure autodetection
|
||||||
|
auto.nixGLDefault
|
||||||
|
]
|
||||||
|
++ optionals (cfg.wrapper == "mesa") [
|
||||||
|
nixGLIntel
|
||||||
|
nixVulkanIntel
|
||||||
|
|
||||||
|
# Wrapper for the wrappers
|
||||||
|
#?? nixgl PROGRAM
|
||||||
|
(pkgs.writeShellApplication {
|
||||||
|
name = "nixgl";
|
||||||
|
runtimeInputs = [nixGLIntel nixVulkanIntel];
|
||||||
|
text = ''exec nixGLIntel nixVulkanIntel "$@"'';
|
||||||
|
})
|
||||||
|
]
|
||||||
|
++ optionals (cfg.wrapper == "nvidia") [
|
||||||
|
#!! Impure autodetection
|
||||||
|
auto.nixGLNvidia
|
||||||
|
auto.nixVulkanNvidia
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -132,7 +132,12 @@ in {
|
||||||
icon-library # Icon viewer
|
icon-library # Icon viewer
|
||||||
identity # Compare media
|
identity # Compare media
|
||||||
impression # Image writer
|
impression # Image writer
|
||||||
keyguard # Bitwarden client
|
|
||||||
|
# BUG: nixGL required to launch, imperative flatpak used as alternative
|
||||||
|
# https://github.com/AChep/keyguard-app/releases
|
||||||
|
# https://github.com/gmodena/nix-flatpak/issues/135
|
||||||
|
#// keyguard # Bitwarden client
|
||||||
|
|
||||||
kooha # Screen recorder
|
kooha # Screen recorder
|
||||||
logseq # Knowledge base
|
logseq # Knowledge base
|
||||||
loupe # Image viewer
|
loupe # Image viewer
|
||||||
|
|
Loading…
Add table
Reference in a new issue