add nix-index-database

other bits of cleanup
This commit is contained in:
Gerg-L 2024-06-12 19:06:00 -04:00
parent be5dcf0554
commit 6432f7b69e
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
4 changed files with 46 additions and 13 deletions

21
flake.lock generated
View file

@ -323,6 +323,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1717919703,
"narHash": "sha256-4i/c31+dnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1712450863, "lastModified": 1712450863,
@ -495,6 +515,7 @@
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"master": "master", "master": "master",
"nix": "nix", "nix": "nix",
"nix-index-database": "nix-index-database",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nvim-flake": "nvim-flake", "nvim-flake": "nvim-flake",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

View file

@ -51,6 +51,12 @@
repo = "lanzaboote"; repo = "lanzaboote";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
nix-index-database = {
type = "github";
owner = "nix-community";
repo = "nix-index-database";
inputs.nixpkgs.follows = "unstable";
};
#my own packages #my own packages
spicetify-nix = { spicetify-nix = {
type = "github"; type = "github";

View file

@ -1,4 +1,5 @@
{ {
nix-index-database,
nvim-flake, nvim-flake,
self, self,
_file, _file,
@ -53,6 +54,11 @@
nix-direnv.package = pkgs.nix-direnv.override { nix = config.nix.package; }; nix-direnv.package = pkgs.nix-direnv.override { nix = config.nix.package; };
}; };
programs.nix-index = {
enable = true;
package = nix-index-database.packages.nix-index-with-db;
};
nix = { nix = {
settings.system-features = [ settings.system-features = [
"kvm" "kvm"
@ -77,18 +83,18 @@
ripgrep ripgrep
fd fd
jq jq
wget
xautoclick xautoclick
prismlauncher prismlauncher
deadnix deadnix
statix statix
nix-index
element-desktop element-desktop
webcord webcord
# QMK configuration
via
qmk
gh gh
nixfmt-rfc-style nixfmt-rfc-style
# QMK configuration
#via
#qmk
; ;
inherit (nvim-flake.packages) neovim; inherit (nvim-flake.packages) neovim;
inherit (self.packages) lint; inherit (self.packages) lint;
@ -102,12 +108,12 @@
}; };
}; };
services.udev.packages = [ #services.udev.packages = [
pkgs.android-udev-rules # pkgs.android-udev-rules
pkgs.via # pkgs.via
pkgs.qmk-udev-rules # pkgs.qmk-udev-rules
]; #];
programs.adb.enable = true; #programs.adb.enable = true;
networking = { networking = {
useNetworkd = false; useNetworkd = false;
@ -157,7 +163,7 @@
isNormalUser = true; isNormalUser = true;
extraGroups = [ extraGroups = [
"wheel" "wheel"
"adbusers" #"adbusers"
#"plugdev" #"plugdev"
]; ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [

View file

@ -137,7 +137,7 @@ in
if [ "$GUEST_NAME" != "Windows" ]; then if [ "$GUEST_NAME" != "Windows" ]; then
exit 0 exit 0
else if [ "$OPERATION" == "prepare" ]; then elif [ "$OPERATION" == "prepare" ]; then
# Stop display-manager # Stop display-manager
systemctl stop display-manager.service systemctl stop display-manager.service
@ -157,7 +157,7 @@ in
ln -fs /etc/Xorg/1_mon.conf /etc/X11/xorg.conf.d/99-custom.conf ln -fs /etc/Xorg/1_mon.conf /etc/X11/xorg.conf.d/99-custom.conf
touch /etc/Xorg/ONE_MONITOR touch /etc/Xorg/ONE_MONITOR
systemctl start display-manager.service systemctl start display-manager.service
else if [ "$OPERATION" == "release" ]; then elif [ "$OPERATION" == "release" ]; then
# Dual gpu/monitor stuff # Dual gpu/monitor stuff
systemctl stop display-manager.service systemctl stop display-manager.service