emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updates

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-12-04 13:04:38 -05:00
parent 03a04136bd
commit 4d7d18c5e7
4 changed files with 57 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -107,11 +107,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1732867134, "lastModified": 1733228754,
"narHash": "sha256-YGtFJ/4SE37evvHX+OkS2klRdHlO7HvovaaxR/yWuWg=", "narHash": "sha256-Jbt4imHmz5Z0jdaW7RrwAO1HYCmPs3XCt4j86jkG0b4=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "01ca2cbd9fb5c29d73fac327f5a9a2a1a222e218", "rev": "2880dc44fc8c450b4ffe1609a4bccd19ef759f5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728031945, "lastModified": 1733143273,
"narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=", "narHash": "sha256-pVogdQb09YrbVyFrzadfF1fseT6W2We4lNKRvWPPHsY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-ld", "repo": "nix-ld",
"rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2", "rev": "1e17dfe486a0c4dc245f5177a7328930b8392b34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -142,11 +142,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1733066523, "lastModified": 1733217105,
"narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "fe01780d356d70fd119a19277bff71d3e78dad00", "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -172,29 +172,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732981179, "lastModified": 1733212471,
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1732981179, "lastModified": 1733261153,
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,7 +214,7 @@
"nix-ld": "nix-ld", "nix-ld": "nix-ld",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

6
flake.nix
View file

@ -5,7 +5,7 @@
inputs = { inputs = {
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; 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"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
home-manager = { home-manager = {
@ -34,7 +34,7 @@
nix-ld.inputs.nixpkgs.follows = "nixpkgs"; 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 = { nixosConfigurations = {
eddie = nixpkgs.lib.nixosSystem { eddie = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@ -57,7 +57,7 @@
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
pkgs-stable = nixpkgs-stable.legacyPackages.x86_64-linux; pkgs-unstable = nixpkgs-unstable.legacyPackages.x86_64-linux;
}; };
modules = [ modules = [

37
home/home.nix
View file

@ -1,4 +1,4 @@
{ nix-flatpak, lib, pkgs, inputs, pkgs-stable, ... }: { nix-flatpak, lib, pkgs, inputs, pkgs-unstable, ... }:
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -203,10 +203,29 @@
stirling-pdf stirling-pdf
trash-cli trash-cli
wineWowPackages.stagingFull (wineWowPackages.stagingFull.override {
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
})
wineWowPackages.fonts wineWowPackages.fonts
winetricks 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
spice-gtk spice-gtk
spice-protocol spice-protocol
@ -215,6 +234,9 @@
solaar solaar
logitech-udev-rules logitech-udev-rules
emojify
smile
gnomeExtensions.smile-complementary-extension
impression impression
zoom-us zoom-us
nyxt nyxt
@ -239,8 +261,6 @@
zotero_7 zotero_7
handbrake handbrake
renoise renoise
yabridge
yabridgectl
krita krita
rawtherapee rawtherapee
inkscape inkscape
@ -263,6 +283,7 @@
parinfer-rust-emacs parinfer-rust-emacs
dockfmt dockfmt
clap clap
batik
# Audio plugins (LV2, VST2, VST3, LADSPA) # Audio plugins (LV2, VST2, VST3, LADSPA)
eq10q eq10q
@ -302,6 +323,10 @@
fira-code-symbols fira-code-symbols
powerline-fonts powerline-fonts
nerdfonts nerdfonts
noto-fonts-color-emoji
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
]; ];
username = "emenel"; username = "emenel";
@ -320,7 +345,9 @@
stateVersion = "24.05"; stateVersion = "24.05";
}; };
fonts.fontconfig.enable = true; fonts.fontconfig = {
enable = true;
};
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;

5
system/eddie/configuration.nix
View file

@ -351,7 +351,10 @@
vial vial
]; ];
fonts.fontconfig.enable = true; fonts.fontconfig = {
enable = true;
useEmbeddedBitmaps = true;
};
powerManagement = { powerManagement = {
enable = true; enable = true;