Myned/nixos
Myned/nixos
1
1
Fork 0
Code Issues Activity

Compare commits

base: Myned:0a769098513503d7758c44c34659eb0f6459054a
Branches Tags
Myned:master
..
compare: Myned:5ae4cbd0b2039c8be7a3fdaea6713f1fd52da40b
Branches Tags
Myned:master

No commits in common. "0a769098513503d7758c44c34659eb0f6459054a" and "5ae4cbd0b2039c8be7a3fdaea6713f1fd52da40b" have entirely different histories.
0a76909851 ... 5ae4cbd0b2

6 changed files with 13 additions and 149 deletions
Show stats Expand all files Collapse all files

7
flake.in.nix
View file

@ -33,7 +33,6 @@
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";
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";
### Unstable
@ -65,7 +64,6 @@
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";
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";
walker = flake "github:abenz1267/walker?ref=v0.12.8" // unstable "nixpkgs";
@ -141,11 +139,6 @@
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.walker.homeManagerModules.default
];
# Branch-specific overlays
nixpkgs.overlays = [
inputs."nixgl-${branch}".overlays.default
];
}
)
];

98
flake.lock generated
View file

@ -1046,27 +1046,6 @@
"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": {
"inputs": {
"systems": "systems_3"
@ -1159,12 +1138,18 @@
}
},
"flake-utils_7": {
"inputs": {
"systems": [
"stylix-stable",
"systems"
]
},
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -1174,24 +1159,9 @@
}
},
"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": {
"systems": [
"stylix-stable",
"stylix-unstable",
"systems"
]
},
@ -2748,48 +2718,6 @@
"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": {
"locked": {
"lastModified": 1738816619,
@ -3134,8 +3062,6 @@
"nix-index-database-unstable": "nix-index-database-unstable",
"nix-vscode-extensions": "nix-vscode-extensions",
"nixd": "nixd",
"nixgl-stable": "nixgl-stable",
"nixgl-unstable": "nixgl-unstable",
"nixos-hardware": "nixos-hardware",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable_5",
@ -3210,7 +3136,7 @@
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme_2",
"flake-compat": "flake-compat_11",
"flake-utils": "flake-utils_9",
"flake-utils": "flake-utils_7",
"git-hooks": "git-hooks_2",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
@ -3245,7 +3171,7 @@
"base16-vim": "base16-vim_2",
"firefox-gnome-theme": "firefox-gnome-theme_3",
"flake-compat": "flake-compat_12",
"flake-utils": "flake-utils_10",
"flake-utils": "flake-utils_8",
"git-hooks": "git-hooks_3",
"gnome-shell": "gnome-shell_2",
"home-manager": "home-manager_3",

8
flake.nix
View file

@ -128,14 +128,6 @@
inputs.nixpkgs.follows = "nixpkgs-unstable";
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";
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";

1
options/custom/programs/default.nix
View file

@ -18,7 +18,6 @@ with lib; {
nano.enable = true;
nh.enable = true;
nix-index.enable = true;
nixgl.enable = true;
nushell.enable = true;
polkit.enable = true;
ssh.enable = true;

41
options/custom/programs/nixgl.nix
View file

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

7
options/custom/settings/packages.nix
View file

@ -132,12 +132,7 @@ in {
icon-library # Icon viewer
identity # Compare media
impression # Image writer
# 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
keyguard # Bitwarden client
kooha # Screen recorder
logseq # Knowledge base
loupe # Image viewer