From 4d7d18c5e7ee98596e855e3eabaabc46c9f0d5bd Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 4 Dec 2024 13:04:38 -0500 Subject: [PATCH] updates --- flake.lock | 36 ++++++++++++++++----------------- flake.nix | 6 +++--- home/home.nix | 37 +++++++++++++++++++++++++++++----- system/eddie/configuration.nix | 5 ++++- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 31d5c78..fdef55e 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1732867134, - "narHash": "sha256-YGtFJ/4SE37evvHX+OkS2klRdHlO7HvovaaxR/yWuWg=", + "lastModified": 1733228754, + "narHash": "sha256-Jbt4imHmz5Z0jdaW7RrwAO1HYCmPs3XCt4j86jkG0b4=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "01ca2cbd9fb5c29d73fac327f5a9a2a1a222e218", + "rev": "2880dc44fc8c450b4ffe1609a4bccd19ef759f5c", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1728031945, - "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=", + "lastModified": 1733143273, + "narHash": "sha256-pVogdQb09YrbVyFrzadfF1fseT6W2We4lNKRvWPPHsY=", "owner": "Mic92", "repo": "nix-ld", - "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2", + "rev": "1e17dfe486a0c4dc245f5177a7328930b8392b34", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733066523, - "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -172,29 +172,29 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { @@ -214,7 +214,7 @@ "nix-ld": "nix-ld", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 5b7a04a..37ee4ce 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; home-manager = { @@ -34,7 +34,7 @@ nix-ld.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs @ {nixpkgs, nixpkgs-stable, home-manager, audio, nix-flatpak, kmonad, musnix, nix-ld, ... }: { + outputs = inputs @ {nixpkgs, nixpkgs-unstable, home-manager, audio, nix-flatpak, kmonad, musnix, nix-ld, ... }: { nixosConfigurations = { eddie = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -57,7 +57,7 @@ pkgs = nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = { inherit inputs; - pkgs-stable = nixpkgs-stable.legacyPackages.x86_64-linux; + pkgs-unstable = nixpkgs-unstable.legacyPackages.x86_64-linux; }; modules = [ diff --git a/home/home.nix b/home/home.nix index b900bc3..e237b42 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,4 @@ -{ nix-flatpak, lib, pkgs, inputs, pkgs-stable, ... }: +{ nix-flatpak, lib, pkgs, inputs, pkgs-unstable, ... }: { nixpkgs.config.allowUnfree = true; @@ -203,10 +203,29 @@ stirling-pdf trash-cli - wineWowPackages.stagingFull + (wineWowPackages.stagingFull.override { + waylandSupport = true; + fontconfigSupport = true; + vulkanSupport = true; + }) wineWowPackages.fonts winetricks + # yabridge + # yabridgectl + (pkgs-unstable.yabridge.override { wine = (wineWowPackages.stagingFull.override { + waylandSupport = true; + fontconfigSupport = true; + vulkanSupport = true; + }); + }) + (pkgs-unstable.yabridgectl.override { wine = (wineWowPackages.stagingFull.override { + fontconfigSupport = true; + vulkanSupport = true; + waylandSupport = true; + }); + }) + spice spice-gtk spice-protocol @@ -215,6 +234,9 @@ solaar logitech-udev-rules + emojify + smile + gnomeExtensions.smile-complementary-extension impression zoom-us nyxt @@ -239,8 +261,6 @@ zotero_7 handbrake renoise - yabridge - yabridgectl krita rawtherapee inkscape @@ -263,6 +283,7 @@ parinfer-rust-emacs dockfmt clap + batik # Audio plugins (LV2, VST2, VST3, LADSPA) eq10q @@ -302,6 +323,10 @@ fira-code-symbols powerline-fonts nerdfonts + noto-fonts-color-emoji + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji ]; username = "emenel"; @@ -320,7 +345,9 @@ stateVersion = "24.05"; }; - fonts.fontconfig.enable = true; + fonts.fontconfig = { + enable = true; + }; programs = { home-manager.enable = true; diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 18522b6..d9a0c30 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -351,7 +351,10 @@ vial ]; - fonts.fontconfig.enable = true; + fonts.fontconfig = { + enable = true; + useEmbeddedBitmaps = true; + }; powerManagement = { enable = true;