This commit is contained in:
Matt Nish-Lapidus 2025-03-18 12:06:09 -04:00
parent 5e59a054e5
commit 5564d5cbd2
5 changed files with 35 additions and 45 deletions

23
flake.lock generated
View file

@ -70,11 +70,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1742307032,
"narHash": "sha256-Qt1yqpH4K1SJymFTrnFLr0woH8HopWDLcJ4Wx8FSO1s=",
"lastModified": 1742311820,
"narHash": "sha256-35Rkoka7A/UT5gJwQm/7+ojj2BFKZzybJEL9QAL72y8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "ecaf1d4d12cd4a6007bc73674d3398aa806c3993",
"rev": "91c89f41cb7c5a8804a7970cdfdaf9c401db6164",
"type": "github"
},
"original": {
@ -1027,6 +1027,22 @@
"type": "github"
}
},
"nixpkgs-zotero": {
"locked": {
"lastModified": 1742081323,
"narHash": "sha256-T+EABKOlmCBxrI38VYJsrcTcjYl2hFPpZfhRVOQHZdc=",
"owner": "Juul-Mc-Goa",
"repo": "nixpkgs",
"rev": "801c1a0d1669ae3d17e3719721fa19bf8bcdb951",
"type": "github"
},
"original": {
"owner": "Juul-Mc-Goa",
"ref": "fix-zotero-linux",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1725103162,
@ -1179,6 +1195,7 @@
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable_4",
"nixpkgs-zotero": "nixpkgs-zotero",
"sops-nix": "sops-nix",
"wezterm": "wezterm",
"xwayland-satellite": "xwayland-satellite",

View file

@ -94,6 +94,10 @@
emenel-templates.url = "git+ssh://git@gt.emenel.ca/emenel/nix-flake-templates";
nix-way-templates.url = "github:the-nix-way/dev-templates";
#pr's
nixpkgs-zotero.url = "github:Juul-Mc-Goa/nixpkgs/fix-zotero-linux";
# nixpkgs-openrazer.url = "github:emaryn/nixpkgs/openrazer-daemon";
};
outputs =

View file

@ -32,6 +32,12 @@
inputs.nh.overlays.default
inputs.emacs-lsp-booster.overlays.default
(final: prev: {
inherit (inputs.nixpkgs-zotero.legacyPackages.${prev.system}) zotero;
# inherit (inputs.nixpkgs-openrazer.legacyPackages.${prev.system}.python3Packages) openrazer;
# inherit (inputs.nixpkgs-openrazer.legacyPackages.${prev.system}) openrazer-daemon;
})
(final: prev: {
wineWowPackages.stagingFull = nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs
(old: {
@ -179,7 +185,11 @@
"xpadneo"
"amd_pstate=active"
];
extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver xpadneo openrazer ];
extraModulePackages = with config.boot.kernelPackages; [
ddcci-driver
xpadneo
openrazer
];
extraModprobeConfig = ''
options bluetooth disable_ertm=Y
'';
@ -224,7 +234,6 @@
enable = true;
users = [ "emenel" ];
};
graphics = {
enable = true;
enable32Bit = true;

View file

@ -1,21 +0,0 @@
self: super: {
openrazer-daemon = super.openrazer-daemon.overrideAttrs (old: {
version = "master";
src = super.fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
rev = "master";
hash = "sha256-F7lAWM/14texc1PVhch5R2oztcfkoub/9oGdjEmtTZ8=";
};
});
development.python-modules.openrazer = super.development.python-modules.openrazer.overrideAttrs (old: {
version = "master";
src = super.fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
rev = "master";
hash = "sha256-F7lAWM/14texc1PVhch5R2oztcfkoub/9oGdjEmtTZ8=";
};
});
}

View file

@ -1,19 +0,0 @@
self: super: {
tuigreet = super.greetd.tuigreet.overrideAttrs (final: old: {
version = "master";
src = self.fetchFromGitHub {
owner = "apognu";
repo = "tuigreet";
rev = "master";
hash = "sha256-6hVTU575tP+bPAUZlGhDwvBTVISyORC0wqljC7guZdA=";
};
cargoHash = "sha256-FrWDRsYhfq46wBm7F0Tifiw5oGXzSgwZC05ndNXcg8k=";
cargoDeps = super.pkgs.rustPlatform.fetchCargoVendor {
inherit (final) pname src version;
hash = final.cargoHash;
};
});
}