From 5f86d0ec998ed52689bef07aa5a1a219dc24b5fd Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Wed, 29 Oct 2025 11:18:05 +0100 Subject: [PATCH] fmt: cleanup --- .forgejo/workflows/nightly-update.yaml | 6 ++---- flake.nix | 5 +---- modules/base/git.nix | 1 - modules/desktop/default.nix | 10 +++++++++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/nightly-update.yaml b/.forgejo/workflows/nightly-update.yaml index c834441..135df61 100644 --- a/.forgejo/workflows/nightly-update.yaml +++ b/.forgejo/workflows/nightly-update.yaml @@ -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 diff --git a/flake.nix b/flake.nix index ffbe81b..edbe3c9 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; diff --git a/modules/base/git.nix b/modules/base/git.nix index 4917fce..c1561dc 100644 --- a/modules/base/git.nix +++ b/modules/base/git.nix @@ -6,7 +6,6 @@ topLevel: { environment.systemPackages = with pkgs; [ git ]; - }; homeManager.cholli = diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 7e053f0..81a9868 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -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 = {