Compare commits

..

No commits in common. "2fe6f6ce97c48061338b40d4fd20af79a2bf034b" and "22acf5787ebaae82d8f04445df730769f1b0edb2" have entirely different histories.

6 changed files with 6 additions and 47 deletions

View File

@ -193,26 +193,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1673365945,
"narHash": "sha256-/duo8kCEbo62D5gn46m//jfvRtT56KS5dy+j6+Rl+4Y=",
"owner": "mic92",
"repo": "nix-index-database",
"rev": "0e51ff44d6bef0b6b2bbf9e34fdc029fc24820fc",
"type": "github"
},
"original": {
"owner": "mic92",
"repo": "nix-index-database",
"type": "github"
}
},
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
@ -231,11 +211,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1671983799, "lastModified": 1673466167,
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", "narHash": "sha256-1HzUCtWwHRGzTOHCIKGG0lVL6wvsyPSSyBuIqZWYowc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", "rev": "68e03abb2fd8db50eaee69ad58b208451143e005",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -299,7 +279,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"kpcli-py": "kpcli-py", "kpcli-py": "kpcli-py",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-index-database": "nix-index-database",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"

View File

@ -22,14 +22,7 @@
url = "github:rebkwok/kpcli"; url = "github:rebkwok/kpcli";
flake = false; flake = false;
}; };
neovim-nightly-overlay = { neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836";
};
nix-index-database = {
url = "github:mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@ -41,7 +34,6 @@
, rust-overlay , rust-overlay
, flake-compat , flake-compat
, neovim-nightly-overlay , neovim-nightly-overlay
, nix-index-database
, ... , ...
}@_inputs: }@_inputs:
let let

View File

@ -11,7 +11,7 @@ in
_enable = lib.mkOption { _enable = lib.mkOption {
type = types.bool; type = types.bool;
description = "Whether the graphics is implicitly enabled (final)"; description = "Whether the graphics is implicitly enabled (final)";
# internal = true; internal = true;
default = false; default = false;
}; };
useNixGL = { useNixGL = {
@ -35,7 +35,7 @@ in
# they will also need to do `config.base.shells.enable` # they will also need to do `config.base.shells.enable`
# generally, we want the behavior: import means enable # generally, we want the behavior: import means enable
config = lib.mkIf cfgEnable { config = lib.mkIf cfgEnable {
base.graphics._enable = lib.mkForce true; base.graphics._enable = cfgEnable;
base.shells = { base.shells = {
shellAliases = lib.mkIf (cfg.useNixGL.defaultPackage != null) { shellAliases = lib.mkIf (cfg.useNixGL.defaultPackage != null) {
nixGL = cfg.useNixGL.defaultPackage; nixGL = cfg.useNixGL.defaultPackage;

View File

@ -1,5 +1,3 @@
# Turns given inputs into the standardized shape of the inputs to configure
# custom base modules in this directory.
{ pkgs { pkgs
, lib ? pkgs.lib , lib ? pkgs.lib
, ... , ...

View File

@ -23,10 +23,6 @@
# Pin to a nixpkgs revision that doesn't have NixOS/nixpkgs#208103 yet # Pin to a nixpkgs revision that doesn't have NixOS/nixpkgs#208103 yet
inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836"; inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836";
}; };
nix-index-database = {
url = "github:mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@ -112,8 +108,6 @@
# defaults to a bad value (on purpose), we should configure a # defaults to a bad value (on purpose), we should configure a
# it to be the proper path # it to be the proper path
base.keepass.path = "/perso/garden/keepass.kdbx"; base.keepass.path = "/perso/garden/keepass.kdbx";
base.graphics.useNixGL.defaultPackage = "nixGLNvidia";
base.graphics.useNixGL.enable = true;
} }
]; ];
# optionally pass inarguments to module # optionally pass inarguments to module

View File

@ -1,4 +0,0 @@
[cargo-new]
# since we already have a root .git
vcs = "none" # enum["git", "hg", "pijul", "fossil", "none"]