Merge remote-tracking branch 'origin/nixos' into nixos-work

This commit is contained in:
Moritz Böhme 2023-02-26 12:24:43 +01:00
commit 29731c75c0
35 changed files with 1531 additions and 408 deletions

View file

@ -12,21 +12,22 @@
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
flake-utils.url = "github:numtide/flake-utils";
utils = {
url = "github:gytis-ivaskevicius/flake-utils-plus";
inputs.flake-utils.follows = "flake-utils";
};
agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
};
# Zsh specific
@ -51,11 +52,37 @@
inputs.nixpkgs.follows = "nixpkgs";
};
emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
neovim.url = "github:neovim/neovim?dir=contrib";
nil = {
url = "github:oxalica/nil";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
# Hyprland
hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
hypr-contrib.url = "github:hyprwm/contrib";
nvim-treesitter-textsubjects = {
url = "github:RRethy/nvim-treesitter-textsubjects";
flake = false;
};
smartcolumn-nvim = {
url = "github:m4xshen/smartcolumn.nvim";
flake = false;
};
attic = {
url = "github:zhaofengli/attic";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "stable";
inputs.flake-utils.follows = "flake-utils";
};
};
outputs =
@ -74,12 +101,10 @@
overlay = import ./overlays { inherit inputs; };
channels.nixpkgs.overlaysBuilder = channels: [
inputs.agenix.overlay
inputs.emacs-overlay.overlay
inputs.emacs.overlays.default
inputs.howdy.overlays.default
inputs.hypr-contrib.overlays.default
inputs.hyprland.overlays.default
inputs.hyprpaper.overlays.default
inputs.utils.overlay
self.overlay
];
@ -158,6 +183,7 @@
nixpkgs-fmt.enable = true;
statix.enable = true;
shellcheck.enable = true;
stylua.enable = true;
};
};