From 93390cb3702c9c92219c3889827e7c099dcd3b09 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sun, 11 May 2025 20:39:28 +0200 Subject: [PATCH] Install fastfetch, dust and brave as lazy-apps --- flake.lock | 100 +++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 5 +++ users/seb/home.nix | 34 +++++++++++---- 3 files changed, 132 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 1dfd576..d5186d5 100644 --- a/flake.lock +++ b/flake.lock @@ -96,6 +96,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -132,6 +148,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "lazy-apps", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -173,6 +211,27 @@ "type": "github" } }, + "lazy-apps": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1746906641, + "narHash": "sha256-b6few4tkqN2TWdrZTwWOjsWxA11rle7y9pcc0/ynuoE=", + "owner": "~rycee", + "repo": "lazy-apps", + "rev": "0b30a0bf524a661f9657c441d021aaa5724f12ff", + "type": "sourcehut" + }, + "original": { + "owner": "~rycee", + "repo": "lazy-apps", + "type": "sourcehut" + } + }, "nextcloud-side-menu": { "flake": false, "locked": { @@ -267,6 +326,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1746663147, @@ -283,6 +358,30 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "lazy-apps", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1733665616, + "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "betterfox": "betterfox", @@ -292,6 +391,7 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", + "lazy-apps": "lazy-apps", "nextcloud-side-menu": "nextcloud-side-menu", "nextcloud-twofactor-totp": "nextcloud-twofactor-totp", "nix-vscode-extensions": "nix-vscode-extensions", diff --git a/flake.nix b/flake.nix index b42708f..c02529b 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + lazy-apps = { + url = "sourcehut:~rycee/lazy-apps"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/users/seb/home.nix b/users/seb/home.nix index 0db9614..3b8f513 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -1,4 +1,24 @@ -{ pkgs, pkgs-unstable, ... }: +{ + inputs, + pkgs, + pkgs-unstable, + ... +}: +let + lazyApp = pkg: inputs.lazy-apps.packages.${pkgs.system}.lazy-app.override { inherit pkg; }; + lazyDesktopApp = + pkg: + inputs.lazy-apps.packages.${pkgs.system}.lazy-app.override { + inherit pkg; + desktopItem = pkgs.makeDesktopItem { + name = pkg.meta.mainProgram; + exec = "${pkg.meta.mainProgram} %U"; + icon = pkg.meta.mainProgram; + desktopName = pkg.meta.mainProgram; + comment = pkg.meta.description; + }; + }; +in { imports = [ ../shared-home.nix ]; @@ -16,22 +36,22 @@ home.packages = [ pkgs.bottom - pkgs.fastfetch + (lazyApp pkgs.fastfetch) + (lazyApp pkgs.dust) pkgs.nemo-with-extensions pkgs.celluloid pkgs-unstable.spotify + pkgs.obsidian + pkgs-unstable.anki + pkgs-unstable.discord + (lazyDesktopApp pkgs.brave) pkgs.jetbrains.idea-community pkgs.jetbrains.goland pkgs.qtcreator pkgs-unstable.logisim-evolution - pkgs.obsidian - pkgs-unstable.anki - - pkgs-unstable.discord - pkgs.libreoffice pkgs.hunspell pkgs.hunspellDicts.de_DE