refactor!: use inputs directly instead of overlays
parent
6ceddb1f94
commit
a3289ee611
|
@ -21,8 +21,6 @@
|
|||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# Programs
|
||||
rofi-wayland.flake = false;
|
||||
rofi-wayland.url = "github:lbonn/rofi/wayland";
|
||||
nix-super.url = "github:privatevoid-net/nix-super";
|
||||
timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git";
|
||||
|
||||
|
@ -53,7 +51,6 @@
|
|||
# Hyprland
|
||||
hypr-contrib.url = "github:hyprwm/contrib";
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
hyprpaper.url = "github:hyprwm/hyprpaper";
|
||||
|
||||
# Laptop
|
||||
asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, inputs
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
|
@ -60,6 +61,7 @@ in
|
|||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
package = inputs.hyprland.packages.${pkgs.system}.default;
|
||||
};
|
||||
|
||||
home-manager.users.moritz = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
|
@ -21,7 +21,7 @@ in
|
|||
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
package = pkgs.neovim-nightly;
|
||||
package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
withNodeJs = true;
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ config
|
||||
, inputs
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
|
@ -12,7 +13,7 @@ in
|
|||
options.my.services.timers.enable = mkEnableOption "timers";
|
||||
options.my.services.timers.package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.timers;
|
||||
inherit (inputs.timers.packages.${pkgs.system}) default;
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
|
|
@ -1,17 +1,7 @@
|
|||
{ inputs, lib, ... }:
|
||||
_:
|
||||
|
||||
_: prev:
|
||||
{
|
||||
agenix = inputs.agenix.packages.${prev.system}.default;
|
||||
hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
|
||||
rofi-wayland = prev.rofi-wayland.overrideAttrs (_: {
|
||||
src = inputs.rofi-wayland;
|
||||
version = lib.my.mkVersionInput inputs.rofi-wayland;
|
||||
});
|
||||
timers = inputs.timers.packages.${prev.system}.default;
|
||||
hyprland = inputs.hyprland.packages.${prev.system}.default;
|
||||
neovim-nightly = inputs.neovim-nightly-overlay.packages.${prev.system}.default;
|
||||
|
||||
xorg = prev.xorg // {
|
||||
lndir = prev.xorg.lndir.overrideAttrs (_: {
|
||||
meta.mainProgram = "lndir";
|
||||
|
|
Loading…
Reference in New Issue