diff options
| author | Tim Keller <tjk@tjkeller.xyz> | 2025-05-27 18:43:39 -0500 |
|---|---|---|
| committer | Tim Keller <tjk@tjkeller.xyz> | 2025-05-27 18:43:39 -0500 |
| commit | 28595adedbd8b2def8cc6b6fc012eb115ca9e4f2 (patch) | |
| tree | 06ab423b72fce5b8b3c3b8bc91ac72bb5f1a65d2 | |
| parent | 487f937dcf8cdbf6f1e67a0270d70fab6e09a245 (diff) | |
| download | nixos-28595adedbd8b2def8cc6b6fc012eb115ca9e4f2.tar.xz nixos-28595adedbd8b2def8cc6b6fc012eb115ca9e4f2.zip | |
update to 25.05
| -rw-r--r-- | derivations/pavolctld/default.nix | 31 | ||||
| -rw-r--r-- | flake.lock | 16 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | modules/root/fonts.nix | 4 | ||||
| -rw-r--r-- | modules/root/software/desktop.nix | 2 | ||||
| -rw-r--r-- | modules/root/software/overlays.nix | 3 |
6 files changed, 13 insertions, 49 deletions
diff --git a/derivations/pavolctld/default.nix b/derivations/pavolctld/default.nix deleted file mode 100644 index 59f0919..0000000 --- a/derivations/pavolctld/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - libpulseaudio, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pavolctld"; - version = "1.0.2"; - - src = fetchgit { - url = "https://git.tjkeller.xyz/pavolctld"; - tag = "v${finalAttrs.version}"; - hash = "sha256-gNEXED+9BkCCLi8oW2GZi9Azd/zOWUvu/bY0a1WbE/A="; - }; - - buildInputs = [ libpulseaudio ]; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "Minimal volume control/monitoring daemon for PulseAudio and PipeWire"; - homepage = "https://tjkeller.xyz/projects/pavolctld"; - platforms = lib.platforms.linux; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.tjkeller ]; - mainProgram = "pavolctld"; - }; -}) - @@ -83,16 +83,16 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -115,16 +115,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744168086, - "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -2,14 +2,14 @@ rec { description = "TimmyOS System Config"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; arkenfox = { @@ -24,7 +24,7 @@ rec { pkgs = nixpkgs.legacyPackages.${system}; userDetails = { username = "timmy"; - email = "tjkeller.xyz"; + email = "tjk@tjkeller.xyz"; fullname = "Tim Keller"; home = "/home/${userDetails.username}"; userDirs = with userDetails; { diff --git a/modules/root/fonts.nix b/modules/root/fonts.nix index 3ae8eef..256e1ab 100644 --- a/modules/root/fonts.nix +++ b/modules/root/fonts.nix @@ -7,10 +7,8 @@ fonts.packages = with pkgs; [ commit-mono inter + nerd-fonts.jetbrains-mono tamzen - (nerdfonts.override { - fonts = [ "JetBrainsMono" ]; - }) ]; }; } diff --git a/modules/root/software/desktop.nix b/modules/root/software/desktop.nix index dfddab1..dbcce1e 100644 --- a/modules/root/software/desktop.nix +++ b/modules/root/software/desktop.nix @@ -53,8 +53,8 @@ inkscape ] ++ pkgs.lib.optionals config.software.desktop.office.enable [ # Office + kdePackages.okular libreoffice - okular pdfchain thunderbird ] ++ pkgs.lib.optionals config.software.desktop.utilities.enable [ diff --git a/modules/root/software/overlays.nix b/modules/root/software/overlays.nix index 670acfb..bd867d5 100644 --- a/modules/root/software/overlays.nix +++ b/modules/root/software/overlays.nix @@ -7,9 +7,6 @@ lowbat = (callPackage ./derivations/lowbat {}); }) (final: prev: { - pavolctld = (callPackage ./derivations/pavolctld {}); - }) - (final: prev: { st = (callPackage ./derivations/st {}); }) ]; |