matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: matt1432:1ae537b572b15efa8a005d8caf3420d76e1250b1
Branches Tags
matt1432:master
matt1432:wezterm
matt1432:no-flakes
matt1432:eww
matt1432:before-nix
matt1432:before-git
..
compare: matt1432:286211b5c51db38e230edda78ecf021c82b89fa3
Branches Tags
matt1432:master
matt1432:wezterm
matt1432:no-flakes
matt1432:eww
matt1432:before-nix
matt1432:before-git

2 commits
1ae537b572 ... 286211b5c5

Author SHA1 Message Date
matt1432
286211b5c5 chore: update sources
All checks were successful
Discord / discord commits (push) Has been skipped
Details 
Flake Inputs:
    • Updated input 'custom-sidebar-src':
        'github:elchininet/custom-sidebar' (2024-11-29) rev: 16d609cacba09038c348fbc55b7a5337e9e9f789
      → 'github:elchininet/custom-sidebar' (2024-11-30) rev: dbae5ac3288d00e11abcb7c0535adaf7369a4419

    • Updated input 'discord-overlay':
        'github:matt1432/discord-nightly-overlay' (2024-11-26) rev: 0ea4f4d291ffa32a16a9a82153a23d049f700372
      → 'github:matt1432/discord-nightly-overlay' (2024-11-30) rev: bc1e938628f7b3408473c1c3723e972cc01d7710

    • Updated input 'discord-overlay/Vencord-src':
        'github:Vendicated/vencord' (2024-11-25) rev: 60b776669bb2775e561b9a3a670d6e33eef72a48
      → 'github:Vendicated/vencord' (2024-11-29) rev: fcece6199511108f7f9eeec65a6d9120f720deb2

    • Updated input 'gpu-screen-recorder-src':
        'git+https://repo.dec05eba.com/gpu-screen-recorder' (2024-11-28) rev: 0ae3c1f82702b07e5356a8e271e617c7dfe7135c
      → 'git+https://repo.dec05eba.com/gpu-screen-recorder' (2024-11-30) rev: 508934b14a78f420174c1953ee8460384444e72b

    • Updated input 'hyprland':
        'github:hyprwm/Hyprland' (2024-11-28) rev: 8f83d29f00bfa89d1e8fe94b4dda98fe898b6b0e
      → 'github:hyprwm/Hyprland' (2024-11-30) rev: d26439a0fe5594fb26d5a3c01571f9490a9a2d2c

    • Updated input 'hyprland/aquamarine':
        'github:hyprwm/aquamarine' (2024-11-16) rev: b31a6a4da8199ae3489057db7d36069a70749a56
      → 'github:hyprwm/aquamarine' (2024-11-18) rev: 4468981c1c50999f315baa1508f0e53c4ee70c52

    • Updated input 'hyprland/pre-commit-hooks':
        'github:cachix/git-hooks.nix' (2024-11-11) rev: cd1af27aa85026ac759d5d3fccf650abe7e1bbf0
      → 'github:cachix/git-hooks.nix' (2024-11-19) rev: 3308484d1a443fc5bc92012435d79e80458fe43c

    • Updated input 'nix-gaming':
        'github:fufexan/nix-gaming' (2024-11-28) rev: effe1d54e23f430d3e803f63e9e47aba33acfb63
      → 'github:fufexan/nix-gaming' (2024-12-01) rev: 59363ec701ee3e994a6c8afc88b61d1fab40c66a

    • Updated input 'nixpkgs':
        'github:NixOS/nixpkgs' (2024-11-25) rev: 4633a7c72337ea8fd23a4f2ba3972865e3ec685d
      → 'github:NixOS/nixpkgs' (2024-11-28) rev: 970e93b9f82e2a0f3675757eb0bfc73297cc6370

    • Updated input 'nixpkgs-wayland':
        'github:nix-community/nixpkgs-wayland' (2024-11-30) rev: ebf97a67a38cd2a1026943b8b8e95664d86379a1
      → 'github:nix-community/nixpkgs-wayland' (2024-11-30) rev: 712cdbcfa5868076354ae62ed8beb3beb2d42df9

    • Updated input 'tuya-local-src':
        'github:make-all/tuya-local' (2024-11-29) rev: 30140964a0056887a5380062a13b1f0ab86a9dbe
      → 'github:make-all/tuya-local' (2024-12-01) rev: de6244161aee9a22f7132c2ebc7a9aa7c63d2b3e

Firefox Addons:
    floccus: 5.3.4 -> 5.4.0

Node modules:
    @eslint/js: 9.15.0 -> 9.16.0
    @types/node: 22.9.1 -> 22.10.1
    eslint: 9.15.0 -> 9.16.0
    eslint-plugin-jsdoc: 50.5.0 -> 50.6.0
    jiti: 2.4.0 -> 2.4.1
    typescript: 5.6.3 -> 5.7.2
    typescript-eslint: 8.15.0 -> 8.16.0
 2024-11-30 23:41:03 -05:00
matt1432
6e6b22c456 feat: take into account the rest of config.nixpkgs 2024-11-30 23:41:00 -05:00
15 changed files with 65 additions and 61 deletions
Show stats Expand all files Collapse all files

2
apps/extract-subs/default.nix
View file

@ -5,7 +5,7 @@
}: }:
buildApp { buildApp {
src = ./.; src = ./.;
npmDepsHash = "sha256-0NadIaeU2rU6xGR8eeWpEUZHE5qbuzE99/O1HNtW0ck="; npmDepsHash = "sha256-GiqSQv5yv6DVYoyc74HUPMhDkqi3mn8s8KxHOLNs/Rg=";
runtimeInputs = [ runtimeInputs = [
ffmpeg-full ffmpeg-full

BIN
apps/extract-subs/package-lock.json generated
View file

Binary file not shown.

14
apps/extract-subs/package.json
View file

@ -11,14 +11,14 @@
"fluent-ffmpeg": "2.1.3" "fluent-ffmpeg": "2.1.3"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "9.15.0", "@eslint/js": "9.16.0",
"@stylistic/eslint-plugin": "2.11.0", "@stylistic/eslint-plugin": "2.11.0",
"@types/node": "22.9.1", "@types/node": "22.10.1",
"esbuild": "0.24.0", "esbuild": "0.24.0",
"eslint": "9.15.0", "eslint": "9.16.0",
"eslint-plugin-jsdoc": "50.5.0", "eslint-plugin-jsdoc": "50.6.0",
"jiti": "2.4.0", "jiti": "2.4.1",
"typescript": "5.6.3", "typescript": "5.7.2",
"typescript-eslint": "8.15.0" "typescript-eslint": "8.16.0"
} }
} }

2
apps/update-sources/default.nix
View file

@ -7,7 +7,7 @@
}: }:
buildApp { buildApp {
src = ./.; src = ./.;
npmDepsHash = "sha256-XXc5wCGFGtr1e6URp2yXsWEKVrh5GrXQ/+Eud3W8ks4="; npmDepsHash = "sha256-orjmkJUATp2ppqHFNtrUg8PBPghYjQodEOI1/hhO3uU=";
runtimeInputs = [ runtimeInputs = [
nodejs_latest nodejs_latest

BIN
apps/update-sources/package-lock.json generated
View file

Binary file not shown.

14
apps/update-sources/package.json
View file

@ -7,15 +7,15 @@
"build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs" "build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "9.15.0", "@eslint/js": "9.16.0",
"@stylistic/eslint-plugin": "2.11.0", "@stylistic/eslint-plugin": "2.11.0",
"@types/node": "22.9.1", "@types/node": "22.10.1",
"esbuild": "0.24.0", "esbuild": "0.24.0",
"eslint": "9.15.0", "eslint": "9.16.0",
"eslint-plugin-jsdoc": "50.5.0", "eslint-plugin-jsdoc": "50.6.0",
"jiti": "2.4.0", "jiti": "2.4.1",
"pkg-types": "1.2.1", "pkg-types": "1.2.1",
"typescript": "5.6.3", "typescript": "5.7.2",
"typescript-eslint": "8.15.0" "typescript-eslint": "8.16.0"
} }
} }

BIN
flake.lock
View file

Binary file not shown.

14
lib/flake/default.nix
View file

@ -3,15 +3,18 @@ inputs: rec {
mkPkgs = { mkPkgs = {
system, system,
nixpkgs, nixpkgs,
cfg ? {},
cudaSupport ? false, cudaSupport ? false,
}: }:
import nixpkgs { import nixpkgs {
inherit system; inherit system;
overlays = [inputs.self.overlays.build-failures]; overlays = [inputs.self.overlays.build-failures] ++ (cfg.overlays or []);
config = { config =
{
inherit cudaSupport; inherit cudaSupport;
allowUnfree = true; allowUnfree = true;
}; }
// (cfg.config or {});
}; };
# Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid # Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid
@ -20,12 +23,13 @@ inputs: rec {
system, system,
}: ({config, ...}: let }: ({config, ...}: let
pkgs = mkPkgs { pkgs = mkPkgs {
cfg = config.nixpkgs;
inherit system cudaSupport; inherit system cudaSupport;
inherit (inputs) nixpkgs; inherit (inputs) nixpkgs;
}; };
inherit (pkgs.lib) composeManyExtensions mkForce; inherit (pkgs.lib) mkForce;
in { in {
_module.args.pkgs = mkForce (pkgs.extend (composeManyExtensions config.nixpkgs.overlays)); _module.args.pkgs = mkForce pkgs;
}); });
# Default system # Default system

2
nixosModules/ags/config/default.nix
View file

@ -1,3 +1,3 @@
{ {
npmDepsHash = "sha256-XNvj59XfO6f+04PatCOZ93tkkZ1K7jReZPqLGJL2Ojo="; npmDepsHash = "sha256-lWQHsDi5SyjbKKfkrfnPo4W1CjGZIhNcSXA7FTb3zn0=";
} }

BIN
nixosModules/ags/config/package-lock.json generated
View file

Binary file not shown.

12
nixosModules/ags/config/package.json
View file

@ -3,13 +3,13 @@
"version": "0.0.0", "version": "0.0.0",
"main": "app.ts", "main": "app.ts",
"dependencies": { "dependencies": {
"@eslint/js": "9.15.0", "@eslint/js": "9.16.0",
"@stylistic/eslint-plugin": "2.11.0", "@stylistic/eslint-plugin": "2.11.0",
"@types/node": "22.9.1", "@types/node": "22.10.1",
"eslint": "9.15.0", "eslint": "9.16.0",
"eslint-plugin-jsdoc": "50.5.0", "eslint-plugin-jsdoc": "50.6.0",
"fzf": "0.5.2", "fzf": "0.5.2",
"jiti": "2.4.0", "jiti": "2.4.1",
"typescript-eslint": "8.15.0" "typescript-eslint": "8.16.0"
} }
} }

31
nixosModules/base/locale/default.nix
View file

@ -4,7 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (lib) attrValues mkIf; inherit (lib) mkIf;
cfg = config.roles.base; cfg = config.roles.base;
in in
@ -20,23 +20,8 @@ in
}; };
}; };
packages = packages = with pkgs;
[ [
(pkgs.nerdfonts.override {
fonts = [
"JetBrainsMono"
"Go-Mono"
"Iosevka"
"NerdFontsSymbolsOnly"
"SpaceMono"
"Ubuntu"
"Noto"
];
})
]
++ (attrValues {
inherit
(pkgs)
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
@ -45,8 +30,16 @@ in
meslo-lgs-nf meslo-lgs-nf
jetbrains-mono jetbrains-mono
ubuntu_font_family ubuntu_font_family
; ]
}); ++ (with pkgs.nerd-fonts; [
jetbrains-mono
go-mono
iosevka
symbols-only
space-mono
ubuntu
noto
]);
}; };
# Select internationalisation properties. # Select internationalisation properties.

7
nixosModules/base/packages/default.nix
View file

@ -22,6 +22,13 @@ in {
; ;
}); });
# FIXME: Omnisharp uses dotnet6
nixpkgs.config.permittedInsecurePackages = [
"dotnet-core-combined"
"dotnet-sdk-6.0.428"
"dotnet-sdk-wrapped-6.0.428"
];
environment.systemPackages = environment.systemPackages =
(attrValues { (attrValues {
inherit inherit

4
packages/gpu-screen-recorder/generic.nix
View file

@ -1,7 +1,7 @@
{ {
lib, lib,
gpu-screen-recorder-src, gpu-screen-recorder-src,
addOpenGLRunpath, addDriverRunpath,
dbus, dbus,
ffmpeg, ffmpeg,
libdrm, libdrm,
@ -68,7 +68,7 @@ in
wrapProgram $out/bin/gpu-screen-recorder \ wrapProgram $out/bin/gpu-screen-recorder \
--prefix LD_LIBRARY_PATH : "${ --prefix LD_LIBRARY_PATH : "${
makeLibraryPath [ makeLibraryPath [
addOpenGLRunpath.driverLink addDriverRunpath.driverLink
libglvnd libglvnd
] ]
}" }"

6
scopedPackages/firefox-addons/generated-firefox-addons.nix
View file

@ -103,10 +103,10 @@
}; };
"floccus" = buildFirefoxXpiAddon { "floccus" = buildFirefoxXpiAddon {
pname = "floccus"; pname = "floccus";
version = "5.3.4"; version = "5.4.0";
addonId = "floccus@handmadeideas.org"; addonId = "floccus@handmadeideas.org";
url = "https://addons.mozilla.org/firefox/downloads/file/4389599/floccus-5.3.4.xpi"; url = "https://addons.mozilla.org/firefox/downloads/file/4397347/floccus-5.4.0.xpi";
sha256 = "8a7c9e3626e0ab0a017a887b379d0af20e0653ecc05a5fbada17d0244629ba47"; sha256 = "b0ce34be12a6e7906e10199f3a85481cb116ad39d4cb98b9b9a81c1a0a5ce35b";
meta = with lib; { meta = with lib; {
homepage = "https://floccus.org"; homepage = "https://floccus.org";
description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive."; description = "Sync your bookmarks and tabs across browsers via Nextcloud, any WebDAV service, any Git service, via a local file, via Google Drive.";