From f43c558448121d6def9eb4bcf680f798aa680884 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Sun, 8 Jun 2025 01:06:42 +0200 Subject: [PATCH 1/2] Add lazy-apps --- flake.lock | 124 ++++++++++++++++++++++++++--- flake.nix | 4 + hosts/julius-framework/default.nix | 1 + modules/creativity.nix | 15 ++++ 4 files changed, 132 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index daadb14..000b4f1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746769778, - "narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=", + "lastModified": 1748372346, + "narHash": "sha256-7y7NZ6uW0GbT0h4gqfD2xvRuJj5IlPGw32oIc9Twga8=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad", + "rev": "becd5b89963fa54fef3566147f3fd2087f8a5842", "type": "github" }, "original": { @@ -20,6 +20,44 @@ "type": "github" } }, + "flake-compat": { + "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" + } + }, + "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": [ @@ -27,11 +65,11 @@ ] }, "locked": { - "lastModified": 1748226808, - "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { @@ -41,13 +79,34 @@ "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" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -59,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748162331, - "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", + "lastModified": 1749086602, + "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "rev": "4792576cb003c994bd7cc1edada3129def20b27d", "type": "github" }, "original": { @@ -73,10 +132,51 @@ "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" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "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": { "auto-cpufreq": "auto-cpufreq", "home-manager": "home-manager", + "lazy-apps": "lazy-apps", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "systems": "systems" diff --git a/flake.nix b/flake.nix index 038371d..558ac71 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,10 @@ url = "github:AdnanHodzic/auto-cpufreq"; inputs.nixpkgs.follows = "nixpkgs"; }; + lazy-apps = { + url = "sourcehut:~rycee/lazy-apps"; + inputs.nixpkgs.follows = "nixpkgs"; + }; systems.url = "github:nix-systems/default-linux"; }; diff --git a/hosts/julius-framework/default.nix b/hosts/julius-framework/default.nix index cef746d..a71af74 100644 --- a/hosts/julius-framework/default.nix +++ b/hosts/julius-framework/default.nix @@ -44,6 +44,7 @@ nixpkgs = { overlays = [ + inputs.lazy-apps.overlays.default outputs.overlays.additions ]; }; diff --git a/modules/creativity.nix b/modules/creativity.nix index 23eb9b8..6b6edac 100644 --- a/modules/creativity.nix +++ b/modules/creativity.nix @@ -14,6 +14,21 @@ obs-studio xcolor + + (pkgs.lazy-app.override { + pkg = pkgs.scribus; + desktopItem = pkgs.makeDesktopItem { + name = "Scribus"; + exec = "scribus %f"; + icon = "scribus"; + desktopName = "Scribus"; + comment = "Page Layout and Publication"; + categories = [ "Qt" "Graphics" "Publishing" ]; + mimeTypes = [ + "application/vnd.scribus" + ]; + }; + }) ]; } From f31b06f698c020247103460617e4ce0968ef0562 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Sun, 8 Jun 2025 01:09:25 +0200 Subject: [PATCH 2/2] Enable hardware.enableRedistributableFirmware --- hosts/julius-framework/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/julius-framework/default.nix b/hosts/julius-framework/default.nix index a71af74..a2910bd 100644 --- a/hosts/julius-framework/default.nix +++ b/hosts/julius-framework/default.nix @@ -49,6 +49,8 @@ ]; }; + hardware.enableRedistributableFirmware = true; + # Bootloader. boot = { loader = {