Compare commits

..

3 Commits

Author SHA1 Message Date
8c17b9cea1 Update tiny-dfr to 0.3.1 2024-09-16 14:23:32 +02:00
be6f87025b Add nixpkgs-unstable input 2024-09-16 14:23:21 +02:00
9e40e17e85 Move blender and gimp to home-manager 2024-09-16 14:23:06 +02:00
5 changed files with 31 additions and 7 deletions

View File

@ -101,9 +101,7 @@ in
spotify spotify
discord discord
audacity audacity
blender
ghidra ghidra
gimp
hexfiend hexfiend
inkscape inkscape

View File

@ -266,6 +266,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1726436956,
"narHash": "sha256-a3rP7uafX/qBFX0y4CGS8vvTPvxsLl9eZQ85DkIn3DI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "039b72d0c738c934e2e36d7fc5520d1b425287a6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agda": "agda", "agda": "agda",
@ -275,6 +291,7 @@
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-apple-silicon": "nixos-apple-silicon", "nixos-apple-silicon": "nixos-apple-silicon",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"unambig-path": "unambig-path", "unambig-path": "unambig-path",
"unispect": "unispect" "unispect": "unispect"
} }

View File

@ -9,6 +9,8 @@
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nix-darwin = { nix-darwin = {
url = "github:LnL7/nix-darwin"; url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -39,9 +41,10 @@
}; };
}; };
outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, agda, nixos-apple-silicon }: outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, agda, nixos-apple-silicon }:
let let
mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; }; mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
mkPkgsUnstable = system: import nixpkgs-unstable { system = system; config.allowUnfree = true; };
mkPkgsUnsupported = system: import nixpkgs { system = system; config.allowUnfree = true; config.allowUnsupportedSystem = true; }; mkPkgsUnsupported = system: import nixpkgs { system = system; config.allowUnfree = true; config.allowUnsupportedSystem = true; };
mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix { mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix {
inherit username home-dir prompt-color pkgs; inherit username home-dir prompt-color pkgs;
@ -166,6 +169,7 @@
let let
system = "aarch64-linux"; system = "aarch64-linux";
pkgs = mkPkgs system; pkgs = mkPkgs system;
pkgs-unstable = mkPkgsUnstable system;
base = mkNixOsBase { base = mkNixOsBase {
inherit system pkgs; inherit system pkgs;
hostname = "foxhut"; hostname = "foxhut";
@ -207,7 +211,7 @@
ref = "main"; ref = "main";
rev = "012d29d4b4d7148414bb649c39805479c7a4327b"; rev = "012d29d4b4d7148414bb649c39805479c7a4327b";
}; };
tiny-dfr = import ./nixos/tiny-dfr.nix { inherit pkgs; }; tiny-dfr = import ./nixos/tiny-dfr.nix { pkgs = pkgs-unstable; };
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;

View File

@ -49,6 +49,8 @@ in rec {
zulip-term zulip-term
ngspice ngspice
blender
gimp
# (extras.challtools python311Packages) # (extras.challtools python311Packages)
]); ]);

View File

@ -1,13 +1,16 @@
{ {
pkgs, pkgs,
tiny-dfr ? pkgs.tiny-dfr tiny-dfr ? pkgs.tiny-dfr
}: { }:
assert tiny-dfr.version == "0.3.1";
{
services.udev.packages = [ tiny-dfr ]; services.udev.packages = [ tiny-dfr ];
systemd.services.tiny-dfr = { systemd.services.tiny-dfr = {
enable = true; enable = true;
description = "tinydfr"; description = "tiny-dfr";
after = ["systemd-user-sessions.service" "getty@tty1.service" "plymouth-quit.service" "systemd-logind.service"]; after = ["systemd-user-sessions.service" "getty@tty1.service" "plymouth-quit.service" "systemd-logind.service" "dev-tiny_dfr_display.device" "dev-tiny_dfr_backlight.device" "dev-tiny_dfr_display_backlight.device"];
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
bindsTo = ["dev-tiny_dfr_display.device" "dev-tiny_dfr_backlight.device" "dev-tiny_dfr_display_backlight.device"];
startLimitIntervalSec = 30; startLimitIntervalSec = 30;
startLimitBurst = 2; startLimitBurst = 2;
serviceConfig = { serviceConfig = {