moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor!: use inputs directly instead of overlays

nixos
Moritz Böhme 2024-01-16 12:37:50 +01:00
parent 6ceddb1f94
commit a3289ee611
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
5 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flake.nix
View File

@ -21,8 +21,6 @@
nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
# Programs # Programs
rofi-wayland.flake = false;
rofi-wayland.url = "github:lbonn/rofi/wayland";
nix-super.url = "github:privatevoid-net/nix-super"; nix-super.url = "github:privatevoid-net/nix-super";
timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git"; timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git";
@ -53,7 +51,6 @@
# Hyprland # Hyprland
hypr-contrib.url = "github:hyprwm/contrib"; hypr-contrib.url = "github:hyprwm/contrib";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
# Laptop # Laptop
asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout"; asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";

2
modules/programs/hyprland/default.nix
View File

@ -1,6 +1,7 @@
{ config { config
, lib , lib
, pkgs , pkgs
, inputs
, ... , ...
} @ args: } @ args:
@ -60,6 +61,7 @@ in
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
package = inputs.hyprland.packages.${pkgs.system}.default;
}; };
home-manager.users.moritz = { home-manager.users.moritz = {

4
modules/programs/nvim/default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, inputs, ... }:
with lib; with lib;
let let
@ -21,7 +21,7 @@ in
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgs.neovim-nightly; package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
vimAlias = true; vimAlias = true;
vimdiffAlias = true; vimdiffAlias = true;
withNodeJs = true; withNodeJs = true;

3
modules/services/timers.nix
View File

@ -1,4 +1,5 @@
{ config { config
, inputs
, lib , lib
, pkgs , pkgs
, ... , ...
@ -12,7 +13,7 @@ in
options.my.services.timers.enable = mkEnableOption "timers"; options.my.services.timers.enable = mkEnableOption "timers";
options.my.services.timers.package = mkOption { options.my.services.timers.package = mkOption {
type = types.package; type = types.package;
default = pkgs.timers; inherit (inputs.timers.packages.${pkgs.system}) default;
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {

12
overlays/packages.nix
View File

@ -1,17 +1,7 @@
{ inputs, lib, ... }: _:
_: prev: _: 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 // { xorg = prev.xorg // {
lndir = prev.xorg.lndir.overrideAttrs (_: { lndir = prev.xorg.lndir.overrideAttrs (_: {
meta.mainProgram = "lndir"; meta.mainProgram = "lndir";