Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9c115a113f |
Generated
+6
-6
@@ -50,11 +50,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775087534,
|
"lastModified": 1772408722,
|
||||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -185,11 +185,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775423009,
|
"lastModified": 1774106199,
|
||||||
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
+9
-10
@@ -1,11 +1,10 @@
|
|||||||
{...}: {
|
{ inputs, ... }: {
|
||||||
flake.nixosModules.fonts = {pkgs, ...}: {
|
flake.nixosModules.fonts = {pkgs, ...}: {
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
nerd-fonts.iosevka-term-slab
|
nerd-fonts.iosevka-term-slab
|
||||||
nerd-fonts.iosevka
|
nerd-fonts.iosevka
|
||||||
nerd-fonts.fira-mono
|
nerd-fonts.fira-mono
|
||||||
nerd-fonts.fira-code
|
nerd-fonts.fira-code
|
||||||
nerd-fonts.proggy-clean-tt
|
];
|
||||||
];
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-45
@@ -32,18 +32,7 @@ in {
|
|||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
# Custom EDID override for Samsung 240Hz on DP-1
|
# Custom EDID override for Samsung 240Hz on DP-1
|
||||||
# Extreme mt7921e fallback: disable PCIe ASPM globally
|
boot.kernelParams = ["drm.edid_firmware=DP-1:edid/g80.bin"];
|
||||||
boot.kernelParams = [
|
|
||||||
"drm.edid_firmware=DP-1:edid/g80.bin"
|
|
||||||
"pcie_aspm=off"
|
|
||||||
];
|
|
||||||
|
|
||||||
# mt7921e stability tweaks
|
|
||||||
boot.extraModprobeConfig = ''
|
|
||||||
options mt7921e disable_aspm=Y
|
|
||||||
options mt7921e disable_clc=Y
|
|
||||||
'';
|
|
||||||
|
|
||||||
hardware.firmware = [
|
hardware.firmware = [
|
||||||
(pkgs.runCommand "g80-edid-firmware" {} ''
|
(pkgs.runCommand "g80-edid-firmware" {} ''
|
||||||
install -Dm444 ${../assets/edid/g80.bin} $out/lib/firmware/edid/g80.bin
|
install -Dm444 ${../assets/edid/g80.bin} $out/lib/firmware/edid/g80.bin
|
||||||
@@ -54,31 +43,7 @@ in {
|
|||||||
networking.hostName = "nixos";
|
networking.hostName = "nixos";
|
||||||
|
|
||||||
# Networking
|
# Networking
|
||||||
networking.networkmanager = {
|
networking.networkmanager.enable = true;
|
||||||
enable = true;
|
|
||||||
wifi.powersave = false;
|
|
||||||
settings.device."wifi.scan-rand-mac-address" = "no";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Work around mt7921e getting stuck after suspend/resume
|
|
||||||
environment.etc."systemd/system-sleep/99-mt7921e-reset" = {
|
|
||||||
text = ''
|
|
||||||
#!/bin/sh
|
|
||||||
case "$1" in
|
|
||||||
post)
|
|
||||||
${pkgs.kmod}/bin/modprobe -r mt7921e || true
|
|
||||||
${pkgs.kmod}/bin/modprobe mt7921e
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
'';
|
|
||||||
mode = "0755";
|
|
||||||
};
|
|
||||||
|
|
||||||
# LocalSend
|
|
||||||
networking.firewall = {
|
|
||||||
allowedTCPPorts = [53317];
|
|
||||||
allowedUDPPorts = [53317];
|
|
||||||
};
|
|
||||||
|
|
||||||
# WebHID/VIA access on Linux (VIA needs hidraw access)
|
# WebHID/VIA access on Linux (VIA needs hidraw access)
|
||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
@@ -161,14 +126,8 @@ in {
|
|||||||
# Allow unfree
|
# Allow unfree
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
# Use Lix as the system Nix implementation
|
# Enable flakes
|
||||||
nix.package = pkgs.lixPackageSets.stable.lix;
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
|
|
||||||
# Enable flakes + restrict who can submit builds to the daemon
|
|
||||||
nix.settings = {
|
|
||||||
experimental-features = ["nix-command" "flakes"];
|
|
||||||
allowed-users = ["root" flakeConfig.username];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Auto-unlock gnome-keyring on login
|
# Auto-unlock gnome-keyring on login
|
||||||
security.pam.services.login.enableGnomeKeyring = true;
|
security.pam.services.login.enableGnomeKeyring = true;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
nerdfetch
|
nerdfetch
|
||||||
libnotify
|
libnotify
|
||||||
alacritty
|
alacritty
|
||||||
foot
|
|
||||||
fzf
|
fzf
|
||||||
autojump
|
autojump
|
||||||
yazi
|
yazi
|
||||||
@@ -29,10 +28,6 @@
|
|||||||
obs-studio
|
obs-studio
|
||||||
jjui
|
jjui
|
||||||
bat
|
bat
|
||||||
localsend
|
|
||||||
# postman
|
|
||||||
bruno
|
|
||||||
bruno-cli
|
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.user.services.handy = {
|
systemd.user.services.handy = {
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
install -m 444 -D "$desktop_file" "$out/share/applications/${pname}.desktop"
|
install -m 444 -D "$desktop_file" "$out/share/applications/${pname}.desktop"
|
||||||
substituteInPlace "$out/share/applications/${pname}.desktop" \
|
substituteInPlace "$out/share/applications/${pname}.desktop" \
|
||||||
--replace 'Exec=AppRun' 'Exec=${pname}' || true
|
--replace 'Exec=AppRun' 'Exec=${pname}' || true
|
||||||
sed -i -E 's|^Exec=.*$|Exec=${pname}|g' "$out/share/applications/${pname}.desktop" || true
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d ${contents}/usr/share/icons ]; then
|
if [ -d ${contents}/usr/share/icons ]; then
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
perSystem = { pkgs, ... }: {
|
perSystem = { pkgs, ... }: {
|
||||||
packages.helium = pkgs.appimageTools.wrapType2 rec {
|
packages.helium = pkgs.appimageTools.wrapType2 rec {
|
||||||
pname = "helium";
|
pname = "helium";
|
||||||
version = "0.10.9.1";
|
version = "0.10.6.1";
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://github.com/imputnet/helium-linux/releases/download/${version}/${pname}-${version}-x86_64.AppImage";
|
url = "https://github.com/imputnet/helium-linux/releases/download/${version}/${pname}-${version}-x86_64.AppImage";
|
||||||
hash = "sha256-FMO4gB2zOjhgmjfE/T0XdDb0NMDKsQFuzy/Org1iD48=";
|
hash = "sha256-6xqNRaP3aqitEseexRVEEjKkJClC0j1HHZoRGQanhSk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraInstallCommands = let
|
extraInstallCommands = let
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{lib, ...}: {
|
{lib, ...}: {
|
||||||
perSystem = {pkgs, ...}: let
|
perSystem = {pkgs, ...}: let
|
||||||
pname = "zen-browser";
|
pname = "zen-browser";
|
||||||
version = "1.19.3b";
|
version = "1.19.5b";
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-x86_64.AppImage";
|
url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen-x86_64.AppImage";
|
||||||
hash = "sha256-p00Irv2z6brDXMx3cr0234lOZZ2a7FmJMDzN494nzMw=";
|
hash = "sha256-YSje6u0AmhFHaRSOSY6ifPUhwa9mSd0dN2aVO7DczQ4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = pkgs.appimageTools.extract {inherit pname version src;};
|
appimageContents = pkgs.appimageTools.extract {inherit pname version src;};
|
||||||
|
|||||||
Reference in New Issue
Block a user