merge flake-parts rewrite into main #19

Manually merged
Daholli merged 62 commits from main-merge into main 2025-11-22 20:16:40 +01:00
4 changed files with 12 additions and 10 deletions
Showing only changes of commit 5f86d0ec99 - Show all commits

View file

@ -1,16 +1,14 @@
on:
on:
schedule:
- cron: 0 */6 * * *
jobs:
UpdateFlake:
runs-on: native
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Update flake
run: |
run: |
cd ${{ env.FORGEJO_WORKSPACE }}
nix flake update
- name: Commit new Flake.lock

View file

@ -1,10 +1,6 @@
{
description = "All encompassing flake";
nixConfig = {
allow-import-from-derivation = true;
};
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
inputs = {
@ -75,6 +71,7 @@
niri-flake = {
url = "github:sodiboo/niri-flake";
# url = "github:Daholli/niri-flake/1067d35dd18f6a55f79873c944f1427a9eb7caa7";
inputs = {
niri-stable.follows = "niri";
nixpkgs.follows = "nixpkgs";

View file

@ -6,7 +6,6 @@ topLevel: {
environment.systemPackages = with pkgs; [
git
];
};
homeManager.cholli =

View file

@ -13,9 +13,17 @@
in
{
security.pam.services.gdm.enableGnomeKeyring = true;
services.displayManager.gdm = {
enable = true;
wayland = true;
};
environment = {
systemPackages = [
systemPackages = with pkgs; [
zenbrowser
sourcegit
];
sessionVariables = {