Compare commits
No commits in common. "2b06c59dd8438fbe18b528f1cf4d5a9cf8b610ea" and "4222e4ac66dad50111da7cfeb68a3dbfea70e50a" have entirely different histories.
2b06c59dd8
...
4222e4ac66
11 changed files with 156 additions and 191 deletions
|
|
@ -181,7 +181,7 @@ in
|
|||
|
||||
# Flatpak support
|
||||
services.flatpak.enable = true;
|
||||
xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
|
||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
|
||||
|
||||
# Define a user account. Don't forget to set a password with `passwd`.
|
||||
users.users.spiollinux = {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
exfat
|
||||
iotop
|
||||
cifs-utils
|
||||
dool
|
||||
dstat
|
||||
lsof
|
||||
macchanger
|
||||
borgbackup
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
# Enable sound.
|
||||
services.pulseaudio = {
|
||||
hardware.pulseaudio = {
|
||||
enable = true;
|
||||
package = pkgs.pulseaudioFull;
|
||||
# decouple pulseaudio application and sink volumes
|
||||
|
|
|
|||
54
flake.lock
generated
54
flake.lock
generated
|
|
@ -102,16 +102,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747556831,
|
||||
"narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
|
||||
"lastModified": 1747020534,
|
||||
"narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
|
||||
"rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-24.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -163,27 +163,27 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747752302,
|
||||
"narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=",
|
||||
"lastModified": 1743127615,
|
||||
"narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671",
|
||||
"rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "LnL7",
|
||||
"ref": "nix-darwin-25.05",
|
||||
"ref": "nix-darwin-24.11",
|
||||
"repo": "nix-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1747723695,
|
||||
"narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=",
|
||||
"lastModified": 1747129300,
|
||||
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282",
|
||||
"rev": "e81fd167b33121269149c57806599045fd33eeed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -195,11 +195,11 @@
|
|||
},
|
||||
"nixos-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1747542820,
|
||||
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
|
||||
"lastModified": 1746904237,
|
||||
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
|
||||
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -243,27 +243,27 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1747610100,
|
||||
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
|
||||
"lastModified": 1746957726,
|
||||
"narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
|
||||
"rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1747542820,
|
||||
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
|
||||
"lastModified": 1746904237,
|
||||
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
|
||||
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -280,11 +280,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747753144,
|
||||
"narHash": "sha256-yCkh/1/NMrvXP0Ddqo4kX7rqLrn6euLkmP2RTvyLims=",
|
||||
"lastModified": 1747261242,
|
||||
"narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "e52a85ce10a990ac6d7356f3a753fde0860426a8",
|
||||
"rev": "e29c558fa4174da179e2e7f9a41c34466a200fda",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -398,11 +398,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747469671,
|
||||
"narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=",
|
||||
"lastModified": 1746216483,
|
||||
"narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb",
|
||||
"rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
18
flake.nix
18
flake.nix
|
|
@ -2,11 +2,11 @@
|
|||
description = "NixOS system flake";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/release-24.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
lanzaboote = {
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-darwin = {
|
||||
url = "github:LnL7/nix-darwin/nix-darwin-25.05";
|
||||
url = "github:LnL7/nix-darwin/nix-darwin-24.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -46,16 +46,6 @@
|
|||
let
|
||||
# FIXME: allow different systems
|
||||
systems = utils.lib.system;
|
||||
|
||||
# ability to extend nixpkgs with patches, e.g. from PRs or staging. See https://ertt.ca/nix/patch-nixpkgs/
|
||||
mkNixpkgs-patched =
|
||||
system:
|
||||
(import nixpkgs { inherit system; }).applyPatches {
|
||||
name = "nixpkgs-patched";
|
||||
src = nixpkgs;
|
||||
patches = [ ];
|
||||
};
|
||||
|
||||
# necessary to make the top-level inputs available to system configuration
|
||||
# inspired by https://jade.fyi/blog/flakes-arent-real/
|
||||
inputInjection =
|
||||
|
|
@ -88,7 +78,7 @@
|
|||
mkHomeManager =
|
||||
confName: user: system: # unfortunately, home-manager configs are still system-specific
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = import (mkNixpkgs-patched system) { inherit system; };
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
modules = [
|
||||
{
|
||||
imports = [
|
||||
|
|
|
|||
|
|
@ -51,7 +51,9 @@
|
|||
merge.tool = "vimdiff";
|
||||
# provide `git mergetool -t nixfmt`
|
||||
mergetool.nixfmt = {
|
||||
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
|
||||
cmd = "${
|
||||
lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
|
||||
} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
|
||||
trustExitCode = true;
|
||||
};
|
||||
core.excludesfile = toString (
|
||||
|
|
@ -103,7 +105,7 @@
|
|||
enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
history.ignoreSpace = true;
|
||||
initContent = ''
|
||||
initExtra = ''
|
||||
# Uncomment following line if you want red dots to be displayed while waiting for completion
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
### Fix slowness of pastes with zsh-syntax-highlighting.zsh
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
services.gpg-agent = {
|
||||
enable = true;
|
||||
#enableSshSupport = true;
|
||||
pinentry.package = pkgs.pinentry-qt;
|
||||
pinentryPackage = pkgs.pinentry-qt;
|
||||
};
|
||||
|
||||
programs.ssh = {
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@ let
|
|||
inkscape
|
||||
darktable
|
||||
exiftool
|
||||
gimp3
|
||||
gimp
|
||||
]
|
||||
++ (with gimp3Plugins; [
|
||||
#fourier # broken
|
||||
#lqrPlugin # broken
|
||||
++ (with gimpPlugins; [
|
||||
fourier
|
||||
lqrPlugin
|
||||
])
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
hugin
|
||||
#luminanceHDR # FIXME, build failure
|
||||
xournalpp
|
||||
luminanceHDR
|
||||
xournal
|
||||
];
|
||||
|
||||
multimediaApps =
|
||||
|
|
@ -38,7 +38,7 @@ let
|
|||
vlc
|
||||
amarok
|
||||
clementine
|
||||
kdePackages.elisa
|
||||
elisa
|
||||
musescore
|
||||
tenacity
|
||||
soundkonverter
|
||||
|
|
@ -122,7 +122,7 @@ let
|
|||
];
|
||||
|
||||
pythonTools = with python3Packages; [
|
||||
python # to shadow old macOS python
|
||||
python3 # to shadow old macOS python
|
||||
ipython
|
||||
uv
|
||||
pip
|
||||
|
|
@ -148,7 +148,7 @@ let
|
|||
desktopLinux = [
|
||||
firefox
|
||||
chromium
|
||||
kdePackages.falkon
|
||||
falkon
|
||||
thunderbird
|
||||
calibre
|
||||
dino
|
||||
|
|
@ -172,6 +172,7 @@ let
|
|||
pulseaudioSupport = pkgs.stdenv.isLinux;
|
||||
})
|
||||
pdfpc
|
||||
quaternion
|
||||
nheko
|
||||
gpxsee
|
||||
subsurface
|
||||
|
|
@ -182,7 +183,7 @@ let
|
|||
#(pkgs.pidgin-with-plugins.override {
|
||||
# plugins = [ pkgs.pidginotr ];})
|
||||
|
||||
logseq
|
||||
unstable.logseq
|
||||
|
||||
# for Hibiscus banking software
|
||||
jameica
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
mutableExtensionsDir = true;
|
||||
profiles.default = {
|
||||
extensions =
|
||||
with pkgs.vscode-extensions;
|
||||
[
|
||||
|
|
@ -120,5 +119,4 @@
|
|||
"direnv.path.executable" = lib.getExe pkgs.direnv;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ in
|
|||
};
|
||||
|
||||
# some extra shell scripts
|
||||
programs.zsh.initContent = lib.mkAfter (
|
||||
programs.zsh.initExtra = lib.mkAfter (
|
||||
import ./scripts/reporsync.nix { inherit pkgs lib; }
|
||||
+ import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001
|
||||
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||
Date: Mon, 7 Apr 2025 21:03:09 -0400
|
||||
Subject: [PATCH] nodejs_20: fix test failure on darwin on latest MacOS 15.4
|
||||
|
||||
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||
(cherry picked from commit 9674c1f688d12b99fbde26e6068ab62609fef3b1)
|
||||
---
|
||||
pkgs/development/web/nodejs/v20.nix | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
|
||||
index b9c9345c441afa..20cceb5b5d1cda 100644
|
||||
--- a/pkgs/development/web/nodejs/v20.nix
|
||||
+++ b/pkgs/development/web/nodejs/v20.nix
|
||||
@@ -50,5 +50,10 @@ buildNodejs {
|
||||
stripLen = 1;
|
||||
hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg=";
|
||||
})
|
||||
+ # fix test failure on macos 15.4
|
||||
+ (fetchpatch2 {
|
||||
+ url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1";
|
||||
+ hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU=";
|
||||
+ })
|
||||
] ++ gypPatches;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue