Compare commits
33 Commits
f80b6295ac
...
kde-x11-br
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a543c6e93 | |||
| 89e04df44a | |||
| d0546b20ea | |||
| a652234c7c | |||
| b867dd12c4 | |||
| 2fc09a965a | |||
| e3d7538fa3 | |||
| d64b2f8d6d | |||
| 093623dad7 | |||
| f6c2c48c7d | |||
| b7c6a2fce5 | |||
| a692c1353d | |||
| 589eefd527 | |||
| 981d351744 | |||
| 0fae6cfc06 | |||
| 0b47961483 | |||
| 01a512e3fd | |||
| 631b28d399 | |||
| 96045f57c4 | |||
| 86d717fad1 | |||
| a7392b3c30 | |||
| e72154ab65 | |||
| 47acfb12ff | |||
| 8a7229cea8 | |||
| 123b55cdf1 | |||
| e4cd967f06 | |||
| 715c3c07b5 | |||
| 64a464af49 | |||
| 5c710e0cb6 | |||
| 26554b8261 | |||
| 75cecb0386 | |||
| 3d8f717c7a | |||
| 5807e0076a |
128
flake.lock
generated
128
flake.lock
generated
@@ -9,11 +9,11 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772290697,
|
"lastModified": 1779903856,
|
||||||
"narHash": "sha256-MyLNx13P+pv1RszO1rMd3144NEeU/oU4iL+xOTpRoaU=",
|
"narHash": "sha256-uRShMtD6xW3ZKZbCQ6sDzKWEnbBXUg3IGfOARYogKhg=",
|
||||||
"owner": "ezKEa",
|
"owner": "ezKEa",
|
||||||
"repo": "aagl-gtk-on-nix",
|
"repo": "aagl-gtk-on-nix",
|
||||||
"rev": "dcb53a4cb4cb09ef7f08328428ba559be5b9f01b",
|
"rev": "50671fc7f29d686f63ef34b603320d44ad7f2d29",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -46,11 +46,11 @@
|
|||||||
"cachyos-kernel": {
|
"cachyos-kernel": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773425695,
|
"lastModified": 1779781360,
|
||||||
"narHash": "sha256-O5Fr6f+iS+IVKdB59yqkCaWfkr1SSHD5BLDDlZO7RwU=",
|
"narHash": "sha256-02SR7VL4wc57NCVMhyVgz6/SVfyGv7mc4h+SmgR2I8g=",
|
||||||
"owner": "CachyOS",
|
"owner": "CachyOS",
|
||||||
"repo": "linux-cachyos",
|
"repo": "linux-cachyos",
|
||||||
"rev": "3b9ae1ae5d4ee95e1509d350b65c0777dde97628",
|
"rev": "c7cb822e8ee91d993052becf2661b6f26f98eaa2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -62,11 +62,11 @@
|
|||||||
"cachyos-kernel-patches": {
|
"cachyos-kernel-patches": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773430072,
|
"lastModified": 1779618819,
|
||||||
"narHash": "sha256-0X47YCF1CUnLiQ1M6Lh4hc3ax9aV5DX/wCmMfuMyM1o=",
|
"narHash": "sha256-/cGZZCyJZS1QATHi+/2Q32NkjrYN2N2PpgFP8Ak4FJc=",
|
||||||
"owner": "CachyOS",
|
"owner": "CachyOS",
|
||||||
"repo": "kernel-patches",
|
"repo": "kernel-patches",
|
||||||
"rev": "ac70453c25200f0a30ad38b3caa63020869f0f8a",
|
"rev": "668b466fb461409329425b50c4a9d8d2c022a739",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -196,11 +196,11 @@
|
|||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772408722,
|
"lastModified": 1778716662,
|
||||||
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -313,11 +313,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773681856,
|
"lastModified": 1779969295,
|
||||||
"narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=",
|
"narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce",
|
"rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -334,11 +334,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773422513,
|
"lastModified": 1778805320,
|
||||||
"narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=",
|
"narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056",
|
"rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -379,14 +379,14 @@
|
|||||||
"cachyos-kernel-patches": "cachyos-kernel-patches",
|
"cachyos-kernel-patches": "cachyos-kernel-patches",
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_3",
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts_2",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773597464,
|
"lastModified": 1779910731,
|
||||||
"narHash": "sha256-3SVrc1AMkY1UE36MD4qvmTkY/ZToK2F55Afut5Qm5F8=",
|
"narHash": "sha256-BSu/X9EyAyAPOjXsuwED4j4IeduP/5KVjTwiQSLkdik=",
|
||||||
"owner": "xddxdd",
|
"owner": "xddxdd",
|
||||||
"repo": "nix-cachyos-kernel",
|
"repo": "nix-cachyos-kernel",
|
||||||
"rev": "30468236d5cdd9cb5dea6e757159e04816439146",
|
"rev": "a2cdbecf6abb1a1180bf9fe5c3028125416621f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -404,11 +404,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773603777,
|
"lastModified": 1777732699,
|
||||||
"narHash": "sha256-oXSEbMR/IuHYk9nvrbRhaYBxVK5s63DH2UGOZT2ok48=",
|
"narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "0efe7af73d6e4a8d447a22936c5526d73822b0a7",
|
"rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -420,27 +420,27 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744536153,
|
"lastModified": 1779894193,
|
||||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
"narHash": "sha256-2PixoQSj9hdtoXTu0ZxdI0cmAE6GUUjCODG+rtC1wDc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
"rev": "a09ffe51cfdc37950f14286593605ce64f76cc93",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixpkgs-unstable",
|
"ref": "nixos-unstable-small",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772328832,
|
"lastModified": 1777168982,
|
||||||
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
|
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
|
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -451,27 +451,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773563071,
|
"lastModified": 1779560665,
|
||||||
"narHash": "sha256-p4f6smYpck1hw6gYsT2omq01gnlZ1E7HTpssDQ0fP+g=",
|
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1c6f50e5b62030a50799682b6babc9dcc5a271ae",
|
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable-small",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773646010,
|
|
||||||
"narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -516,23 +500,25 @@
|
|||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"nix-cachyos-kernel": "nix-cachyos-kernel",
|
"nix-cachyos-kernel": "nix-cachyos-kernel",
|
||||||
"nixos-wsl": "nixos-wsl",
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"snowfall-lib": "snowfall-lib",
|
"snowfall-lib": "snowfall-lib",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"trilium-next-pr": "trilium-next-pr",
|
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": [
|
||||||
|
"aagl",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770952264,
|
"lastModified": 1777605393,
|
||||||
"narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
|
"narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
|
"rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -591,11 +577,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773698643,
|
"lastModified": 1777944972,
|
||||||
"narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=",
|
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
|
||||||
"owner": "mic92",
|
"owner": "mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "8237de83e8200d16fe0c4467b02a1c608ff28044",
|
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -634,22 +620,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"trilium-next-pr": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1736678965,
|
|
||||||
"narHash": "sha256-2A687i3Rq0/wqJVvpgaiRPWcfnBBuBhPjKaT8cnd7o0=",
|
|
||||||
"owner": "FliegendeWurst",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "4fcdf706929246476e52e960760b6643cb8395c4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "FliegendeWurst",
|
|
||||||
"ref": "trilium-next",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"zen-browser": {
|
"zen-browser": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
@@ -658,11 +628,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773695806,
|
"lastModified": 1779955179,
|
||||||
"narHash": "sha256-HYmp4Ym/dlkRIPap7GFznNUNuDTTW0iIcOtHmhRzl3w=",
|
"narHash": "sha256-cHrbJ8pZrsFWUTJVk7AxWiEg5eiZptPQxtT0YXMIENo=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "ced61240cc38dee9e659a7ced0cd9a839c6085d3",
|
"rev": "c341e3f6516fb1286d25b99d34b111f93028ae87",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -30,10 +30,6 @@
|
|||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
trilium-next-pr = {
|
|
||||||
url = "github:FliegendeWurst/nixpkgs/trilium-next";
|
|
||||||
# Don't follow nixpkgs as this repo has its own pinned nixpkgs
|
|
||||||
};
|
|
||||||
anikki = {
|
anikki = {
|
||||||
url = "github:Hion-V/Anikki-flake";
|
url = "github:Hion-V/Anikki-flake";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|||||||
@@ -57,6 +57,17 @@ in {
|
|||||||
3389
|
3389
|
||||||
3390
|
3390
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# users.users.andreas.extraGroups = [ "sambashare" ];
|
||||||
|
# Enable Avahi (mDNS/DNS-SD) for discovery
|
||||||
|
services.avahi = {
|
||||||
|
enable = true;
|
||||||
|
nssmdns4 = true;
|
||||||
|
openFirewall = true;
|
||||||
|
};
|
||||||
|
# Enable GNOME sharing services
|
||||||
|
services.gnome.gnome-user-share.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
gnome-tweaks
|
gnome-tweaks
|
||||||
gnome-software
|
gnome-software
|
||||||
@@ -85,6 +96,16 @@ in {
|
|||||||
(lib.mkIf cfg.kde.enable {
|
(lib.mkIf cfg.kde.enable {
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.desktopManager.plasma6.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
environment.sessionVariables = {
|
||||||
|
# Forces KWin to use the legacy DRM interface so "Allow Tearing" actually works
|
||||||
|
# KWIN_DRM_NO_AMS = "1";
|
||||||
|
# Disables the new triple buffering in Plasma 6.1+ to reduce latency
|
||||||
|
# KWIN_DRM_DISABLE_TRIPLE_BUFFERING = "1";
|
||||||
|
# KWIN_USE_HWCURSOR = "0";
|
||||||
|
# KWIN_DRM_USE_EGL_STREAMS = "0";
|
||||||
|
# MESA_VK_WSI_PRESENT_MODE = "immediate";
|
||||||
|
# vblank_mode = "0";
|
||||||
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
kdePackages.qtwebsockets
|
kdePackages.qtwebsockets
|
||||||
kdePackages.qtwebchannel
|
kdePackages.qtwebchannel
|
||||||
|
|||||||
@@ -33,11 +33,11 @@
|
|||||||
lutris
|
lutris
|
||||||
vkd3d
|
vkd3d
|
||||||
dxvk
|
dxvk
|
||||||
corefonts
|
|
||||||
protontricks
|
protontricks
|
||||||
mangohud
|
mangohud
|
||||||
vkbasalt
|
vkbasalt
|
||||||
gamescope
|
gamescope
|
||||||
|
corefonts
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.uinput.enable = true;
|
hardware.uinput.enable = true;
|
||||||
@@ -52,14 +52,15 @@
|
|||||||
"-r" "172"
|
"-r" "172"
|
||||||
"-e" # Enable steam integration
|
"-e" # Enable steam integration
|
||||||
"--steam"
|
"--steam"
|
||||||
|
"--prefer-outpout DP-4"
|
||||||
"--prefer-vk-device 8086:e20b" # lspci -nn | grep VGA
|
"--prefer-vk-device 8086:e20b" # lspci -nn | grep VGA
|
||||||
];
|
];
|
||||||
env = {
|
env = {
|
||||||
WLR_RENDERER = "vulkan";
|
# WLR_RENDERER = "vulkan";
|
||||||
DXVK_HDR = "0 ";
|
# DXVK_HDR = "0 ";
|
||||||
ENABLE_GAMESCOPE_WSI = "0";
|
# ENABLE_GAMESCOPE_WSI = "0";
|
||||||
WINE_FULLSCREEN_FSR = "1";
|
# WINE_FULLSCREEN_FSR = "1";
|
||||||
SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
|
# SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -68,10 +69,11 @@
|
|||||||
package = pkgs.steam.override {
|
package = pkgs.steam.override {
|
||||||
extraPkgs = pkgs: with pkgs; [
|
extraPkgs = pkgs: with pkgs; [
|
||||||
gamemode
|
gamemode
|
||||||
|
noto-fonts-color-emoji
|
||||||
];
|
];
|
||||||
extraEnv = {
|
extraEnv = {
|
||||||
# SDL_VIDEODRIVER = "wayland,x11";
|
# SDL_VIDEODRIVER = "wayland,x11";
|
||||||
SDL_VIDEODRIVER = "x11";
|
# SDL_VIDEODRIVER = "x11,wayland";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
|
|
||||||
final: prev:
|
|
||||||
let
|
|
||||||
python313ForCeph =
|
|
||||||
let
|
|
||||||
base = final.python313;
|
|
||||||
in
|
|
||||||
base
|
|
||||||
// {
|
|
||||||
override = args:
|
|
||||||
base.override (args // {
|
|
||||||
packageOverrides = self: super:
|
|
||||||
(if args ? packageOverrides then args.packageOverrides self super else { })
|
|
||||||
// {
|
|
||||||
# Ceph still references cython_0 in nixpkgs; map it to modern cython on py3.13.
|
|
||||||
cython_0 = super.cython;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
# Work around nixos-unstable eval failure:
|
|
||||||
# sphinx-9.1.0 not supported for interpreter python3.11
|
|
||||||
# (seen through libvirtd -> qemu_full -> ceph Python dependency chain).
|
|
||||||
ceph = prev.ceph.override {
|
|
||||||
python311 = python313ForCeph;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{ ... }:
|
|
||||||
|
|
||||||
final: prev: {
|
|
||||||
mbedtls_2 = prev.mbedtls_2.overrideAttrs (oldAttrs: {
|
|
||||||
doCheck = false; # Skip failing PSA crypto tests
|
|
||||||
});
|
|
||||||
|
|
||||||
haxe = prev.haxe.overrideAttrs (oldAttrs: {
|
|
||||||
buildInputs = (oldAttrs.buildInputs or []) ++ [ final.mbedtls_2 ];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
final: prev: {
|
final: prev: {
|
||||||
mesa = (prev.mesa.overrideAttrs (old: rec {
|
mesa = (prev.mesa.overrideAttrs (old: rec {
|
||||||
version = "git-unstable-2026-02-12";
|
version = "git-unstable-2026-05-07";
|
||||||
src = prev.fetchFromGitLab {
|
src = prev.fetchFromGitLab {
|
||||||
domain = "gitlab.freedesktop.org";
|
domain = "gitlab.freedesktop.org";
|
||||||
owner = "mesa";
|
owner = "mesa";
|
||||||
repo = "mesa";
|
repo = "mesa";
|
||||||
rev = "main";
|
rev = "0f75fa5bfd29770128a412f1fcf5c4121f95e1bb";
|
||||||
hash = "sha256-5gpLORvbV3skALrQa0VxTJJarYjuq+KyTxDm9HtZNbQ=";
|
hash = "sha256-9sqgro3Y+yctcueHEO0hNmySLNn9F1HP3lPqcIow0+k=";
|
||||||
};
|
};
|
||||||
patches = [];
|
patches = [];
|
||||||
buildInputs = old.buildInputs ++ (with prev.llvmPackages_21; [
|
buildInputs = old.buildInputs ++ (with prev.llvmPackages_21; [
|
||||||
@@ -33,8 +33,6 @@ final: prev: {
|
|||||||
) old.mesonFlags) ++ [
|
) old.mesonFlags) ++ [
|
||||||
"-Dsysconfdir=${placeholder "out"}/etc"
|
"-Dsysconfdir=${placeholder "out"}/etc"
|
||||||
] ++ (if prev.stdenv.hostPlatform.is64bit then [ "-Dintel-rt=enabled" ] else [ "-Dintel-rt=disabled" ]);
|
] ++ (if prev.stdenv.hostPlatform.is64bit then [ "-Dintel-rt=enabled" ] else [ "-Dintel-rt=disabled" ]);
|
||||||
})).override {
|
}));
|
||||||
stdenv = prev.gcc14Stdenv;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
7
overlays/openldap-testfailure-fix/default.nix
Normal file
7
overlays/openldap-testfailure-fix/default.nix
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{ ... }:
|
||||||
|
|
||||||
|
final: prev: {
|
||||||
|
openldap = prev.openldap.overrideAttrs {
|
||||||
|
doCheck = !prev.stdenv.hostPlatform.isi686;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -47,9 +47,9 @@
|
|||||||
|
|
||||||
services = {
|
services = {
|
||||||
# Enable Gnome Session
|
# Enable Gnome Session
|
||||||
displayManager.gdm.enable = true;
|
displayManager.gdm.enable = false;
|
||||||
displayManager.sddm.enable = false;
|
displayManager.sddm.enable = true;
|
||||||
displayManager.sddm.wayland.enable = false;
|
displayManager.sddm.wayland.enable = true;
|
||||||
displayManager.cosmic-greeter.enable = false;
|
displayManager.cosmic-greeter.enable = false;
|
||||||
displayManager.defaultSession = "gnome";
|
displayManager.defaultSession = "gnome";
|
||||||
|
|
||||||
@@ -139,7 +139,7 @@
|
|||||||
ntfs3g
|
ntfs3g
|
||||||
htop
|
htop
|
||||||
rivalcfg
|
rivalcfg
|
||||||
|
blender
|
||||||
reaper
|
reaper
|
||||||
discord
|
discord
|
||||||
betterdiscordctl
|
betterdiscordctl
|
||||||
@@ -171,9 +171,7 @@
|
|||||||
virtualisation.libvirtd = {
|
virtualisation.libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
qemu = {
|
qemu = {
|
||||||
package = pkgs.qemu_full.override {
|
package = pkgs.qemu;
|
||||||
cephSupport = false;
|
|
||||||
};
|
|
||||||
runAsRoot = true;
|
runAsRoot = true;
|
||||||
swtpm.enable = true;
|
swtpm.enable = true;
|
||||||
vhostUserPackages = [ pkgs.virtiofsd ];
|
vhostUserPackages = [ pkgs.virtiofsd ];
|
||||||
@@ -196,13 +194,14 @@
|
|||||||
# Enable the OpenSSH daemon.
|
# Enable the OpenSSH daemon.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the .
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
24800 #Synergy
|
24800 #Synergy
|
||||||
53317 #localsend
|
53317 #localsend
|
||||||
3390 #rdp
|
3390 #rdp
|
||||||
9090
|
9090
|
||||||
8000
|
8000
|
||||||
|
40122
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [
|
networking.firewall.allowedUDPPorts = [
|
||||||
24800 #Synergy
|
24800 #Synergy
|
||||||
@@ -210,6 +209,7 @@
|
|||||||
3390 #rdp
|
3390 #rdp
|
||||||
9090
|
9090
|
||||||
8000
|
8000
|
||||||
|
40122
|
||||||
];
|
];
|
||||||
networking.firewall.trustedInterfaces = [ "virbr0" ];
|
networking.firewall.trustedInterfaces = [ "virbr0" ];
|
||||||
networking.nat = {
|
networking.nat = {
|
||||||
@@ -233,10 +233,28 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
services.mullvad-vpn.enable = true;
|
||||||
|
services.mullvad-vpn.package = pkgs.mullvad-vpn;
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
# networking.firewall.enable = false;
|
||||||
|
|
||||||
|
fonts = {
|
||||||
|
packages = with pkgs; [
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-color-emoji
|
||||||
|
];
|
||||||
|
fontconfig = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
defaultFonts = {
|
||||||
|
sansSerif = [ "DejaVu Sans" "Noto Color Emoji" ];
|
||||||
|
serif = [ "DejaVu Serif" "Noto Color Emoji" ];
|
||||||
|
monospace = [ "DejaVu Sans Mono" "Noto Color Emoji" ];
|
||||||
|
emoji = [ "Noto Color Emoji" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ in
|
|||||||
my-namespace.desktop-environment.xfce.enable = true;
|
my-namespace.desktop-environment.xfce.enable = true;
|
||||||
my-namespace.desktop-environment.gnome.enable = true;
|
my-namespace.desktop-environment.gnome.enable = true;
|
||||||
my-namespace.desktop-environment.kde.enable = true;
|
my-namespace.desktop-environment.kde.enable = true;
|
||||||
|
my-namespace.desktop-environment.hyprland.enable = true;
|
||||||
my-namespace.desktop-environment.cosmic.enable = true;
|
my-namespace.desktop-environment.cosmic.enable = true;
|
||||||
my-namespace.performance-tuning.enable = true;
|
my-namespace.performance-tuning.enable = true;
|
||||||
my-namespace.file-organization.enable = true;
|
my-namespace.file-organization.enable = true;
|
||||||
@@ -68,7 +69,6 @@ in
|
|||||||
# Packages from inputsq
|
# Packages from inputsq
|
||||||
inputs.game-of-life.packages.x86_64-linux.default
|
inputs.game-of-life.packages.x86_64-linux.default
|
||||||
inputs.zen-browser.packages.x86_64-linux.default
|
inputs.zen-browser.packages.x86_64-linux.default
|
||||||
inputs.trilium-next-pr.legacyPackages.x86_64-linux.trilium-next-desktop
|
|
||||||
inputs.anikki.packages.x86_64-linux.default
|
inputs.anikki.packages.x86_64-linux.default
|
||||||
# We want flatpak support
|
# We want flatpak support
|
||||||
flatpak
|
flatpak
|
||||||
@@ -99,16 +99,20 @@ in
|
|||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
59010 #SoundWireServer
|
59010 #SoundWireServer
|
||||||
|
5001
|
||||||
|
11434
|
||||||
3389 #RDP
|
3389 #RDP
|
||||||
22 #ssh
|
22 #ssh
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [
|
networking.firewall.allowedUDPPorts = [
|
||||||
59010 #SoundWireServer
|
59010 #SoundWireServer
|
||||||
|
5001
|
||||||
|
11434
|
||||||
3389 #RDP
|
3389 #RDP
|
||||||
22 #ssh
|
22 #ssh
|
||||||
];
|
];
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
|
|
||||||
# Install firefox.
|
# Install firefox.
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
# boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid.bin,DP-2:edid/edid.bin,DP-3:edid/edid.bin,DP-4:edid/edid.bin" ];
|
# boot.kernelParams = [ "drm.edid_firmware=DP-1:edid/edid.bin,DP-2:edid/edid.bin,DP-3:edid/edid.bin,DP-4:edid/edid.bin" ];
|
||||||
boot.kernelParams = [ "drm.edid_firmware=DP-2:edid/edid.bin" ];
|
boot.kernelParams = [
|
||||||
|
"drm.edid_firmware=DP-2:edid/edid.bin,DP-4:edid/edid.bin"
|
||||||
|
];
|
||||||
|
|
||||||
|
|
||||||
hardware.firmware = [
|
hardware.firmware = [
|
||||||
|
|||||||
Binary file not shown.
@@ -27,7 +27,7 @@
|
|||||||
"module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
|
"module_blacklist=nouveau,nvidia,nvidia_drm,nvidia_modeset,nvidia_uvm"
|
||||||
];
|
];
|
||||||
services.switcherooControl.enable = true;
|
services.switcherooControl.enable = true;
|
||||||
environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
|
# environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/intel_icd.x86_64.json";
|
||||||
hardware.intel-gpu-tools.enable = true;
|
hardware.intel-gpu-tools.enable = true;
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -53,6 +53,13 @@
|
|||||||
"nvidia_uvm"
|
"nvidia_uvm"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Mark Arc B580 as a discrete Intel GPU for switcheroo-control and
|
||||||
|
# keep runtime PCI power management enabled for the device.
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
ACTION=="add|bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xe20b", TEST=="power/control", ATTR{power/control}="auto"
|
||||||
|
SUBSYSTEM=="drm", DRIVERS=="xe", ATTRS{vendor}=="0x8086", ATTRS{device}=="0xe20b", TAG+="switcheroo-discrete-gpu"
|
||||||
|
'';
|
||||||
|
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
# Force Intel GPU for all graphics operations
|
# Force Intel GPU for all graphics operations
|
||||||
KWIN_DRM_DEVICES = "/dev/dri/card0";
|
KWIN_DRM_DEVICES = "/dev/dri/card0";
|
||||||
@@ -120,4 +127,7 @@
|
|||||||
clinfo
|
clinfo
|
||||||
vulkan-tools
|
vulkan-tools
|
||||||
];
|
];
|
||||||
|
services.xserver.deviceSection = ''
|
||||||
|
Option "TearFree" "false"
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,9 +17,23 @@
|
|||||||
boot.extraModprobeConfig = ''
|
boot.extraModprobeConfig = ''
|
||||||
options vfio-pci ids=10de:1b81,10de:10f0
|
options vfio-pci ids=10de:1b81,10de:10f0
|
||||||
'';
|
'';
|
||||||
boot.initrd.preDeviceCommands = ''
|
boot.initrd.systemd = {
|
||||||
|
enable = true;
|
||||||
|
services.initrd-vfio-pci-nvidia = {
|
||||||
|
description = "vfio-pci predevice init";
|
||||||
|
wantedBy = [ "initrd.target" ];
|
||||||
|
# Match 'preDeviceCommands' by running early
|
||||||
|
before = [ "sysroot.mount" ];
|
||||||
|
|
||||||
|
unitConfig.DefaultDependencies = "no";
|
||||||
|
serviceConfig.Type = "oneshot";
|
||||||
|
|
||||||
|
# Place your original shell commands here
|
||||||
|
script = ''
|
||||||
modprobe vfio-pci
|
modprobe vfio-pci
|
||||||
'';
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
# # EARLY and deterministic binding
|
# # EARLY and deterministic binding
|
||||||
# boot.initrd.preDeviceCommands = ''
|
# boot.initrd.preDeviceCommands = ''
|
||||||
# echo 0000:05:00.0 > /sys/bus/pci/drivers/vfio-pci/bind
|
# echo 0000:05:00.0 > /sys/bus/pci/drivers/vfio-pci/bind
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = "${pkgs.ethtool}/bin/ethtool --set-eee enp75s0 eee off";
|
ExecStart = "${pkgs.ethtool}/bin/ethtool --set-eee enp10s0 eee off";
|
||||||
RemainAfterExit = true;
|
RemainAfterExit = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user