schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Compare commits

base: schmittlauch:77bdc00e9581483e4db75988f2561c9ccf1c7f1d
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
..
compare: schmittlauch:10f78e86bf0d79e6ca53e739e1852c5cefcee6dd
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

No commits in common. "77bdc00e9581483e4db75988f2561c9ccf1c7f1d" and "10f78e86bf0d79e6ca53e739e1852c5cefcee6dd" have entirely different histories.
77bdc00e95 ... 10f78e86bf

4 changed files with 34 additions and 10 deletions
Show stats Expand all files Collapse all files

29
flake.lock
View file

@ -156,6 +156,22 @@
"type": "github" "type": "github"
} }
}, },
"logseq-fix-nixpkgs": {
"locked": {
"lastModified": 1707316439,
"narHash": "sha256-3dVL8Wk7ECMiQrHVO1ys7FawMLo7iyQJyKG+aie1eaE=",
"owner": "schmittlauch",
"repo": "nixpkgs",
"rev": "6f1431c8e2dfdfdfe25837c2cc94857900153cab",
"type": "github"
},
"original": {
"owner": "schmittlauch",
"ref": "backport2311-logseq-0.10.5",
"repo": "nixpkgs",
"type": "github"
}
},
"mysecrets": { "mysecrets": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -190,11 +206,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1708807242, "lastModified": 1707956935,
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,11 +254,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1708831307, "lastModified": 1707978831,
"narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", "narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", "rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -302,6 +318,7 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"logseq-fix-nixpkgs": "logseq-fix-nixpkgs",
"mysecrets": "mysecrets", "mysecrets": "mysecrets",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable", "nixos-unstable": "nixos-unstable",

1
flake.nix
View file

@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
logseq-fix-nixpkgs.url = "github:schmittlauch/nixpkgs/backport2311-logseq-0.10.5";
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {

2
home/home.nix
View file

@ -43,7 +43,7 @@ let
#(pkgs.pidgin-with-plugins.override { #(pkgs.pidgin-with-plugins.override {
# plugins = [ pkgs.pidginotr ];}) # plugins = [ pkgs.pidginotr ];})
logseq inputs.logseq-fix-nixpkgs.legacyPackages.${system}.logseq
# for Hibiscus banking software # for Hibiscus banking software

12
hosts/framenix/default.nix
View file

@ -24,10 +24,10 @@ in
argsOverride = rec { argsOverride = rec {
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
hash = "sha256-cC6UbYUFBkAiD70lBDE94aE4UQ2ryYQftIppJy48Pto="; hash = "sha256-sLypPyMhFhamhQOWDIkzZ5cVrWfoZDb3prJaESD6UU0=";
}; };
version = "6.8-rc5"; version = "6.8-rc4";
modDirVersion = "6.8.0-rc5"; modDirVersion = "6.8.0-rc4";
}; };
}); });
# revert some commits that introduced the clourful graphics artefacts flickering, # revert some commits that introduced the clourful graphics artefacts flickering,
@ -39,6 +39,12 @@ in
hash = "sha256-FeKIQ0eLP4yq1WcMaf8Dp0c+DuqOdeuBQU07dFswzD4="; hash = "sha256-FeKIQ0eLP4yq1WcMaf8Dp0c+DuqOdeuBQU07dFswzD4=";
}; };
} }
{name = "drm/buddy: Fix alloc_range() error handling code";
patch = pkgs.fetchpatch {
url = "https://cgit.freedesktop.org/drm/drm-misc/patch/?id=8746c6c9dfa31d269c65dd52ab42fde0720b7d91";
hash = "sha256-Ir7TDLspbYilTJr6aVVb8urIYI2N2vZwI5ayp7laaGw=";
};
}
]; ];
boot.kernelParams = [ boot.kernelParams = [