changed format

This commit is contained in:
elwrcl committed 2026-06-07 21:55:59 +03:00
1 parent 224b0e7388
commit 9c4c966d2a
34 files changed
+69 -157

No files matched your search

+1 -5
View File
@@ -1,8 +1,4 @@
{
pkgs,
system,
...
}:
{ pkgs, system, ... }:
let
packages = import ./packages.nix { inherit pkgs; };
+1 -3
View File
@@ -1,6 +1,4 @@
{
pkgs,
}:
{ pkgs }:
with pkgs;
{
+1 -6
View File
@@ -1,9 +1,4 @@
{
config,
lib,
modulesPath,
...
}:
{ config, lib, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+1 -6
View File
@@ -1,9 +1,4 @@
{
pkgs,
inputs,
system,
...
}:
{ pkgs, inputs, system, ... }:
let
packages = import ./packages.nix { inherit pkgs inputs system; };
+1 -5
View File
@@ -1,8 +1,4 @@
{
pkgs,
inputs,
system,
}:
{ pkgs, inputs, system, ... }:
let
uxplay-fixed = pkgs.uxplay.override {
-1
View File
@@ -1,5 +1,4 @@
{ ... }:
{
imports = [
../home/git.nix
+1 -7
View File
@@ -1,14 +1,8 @@
{
pkgs,
config,
lib,
...
}:
{ pkgs, config, lib, ... }:
let
inherit (lib) mkAfter;
in
{
nix.enable = false;
+1 -5
View File
@@ -1,8 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
system.primaryUser = "sohryu";
users.users.sohryu = {
+1 -5
View File
@@ -1,8 +1,4 @@
{
pkgs,
lib,
...
}:
{ pkgs, lib, ... }:
let
base = ''
+1 -5
View File
@@ -1,8 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
imports = [
./hyprland.nix
-1
View File
@@ -1,5 +1,4 @@
{ ... }:
{
imports = [
./hyprland/env.nix
-1
View File
@@ -1,5 +1,4 @@
{ ... }:
{
wayland.windowManager.hyprland.settings = {
env = [
-1
View File
@@ -1,5 +1,4 @@
{ ... }:
{
wayland.windowManager.hyprland.settings = {
exec-once = [
-2
View File
@@ -1,5 +1,4 @@
{ ... }:
{
wayland.windowManager.hyprland.settings = {
monitor = ",preferred,auto,1";
@@ -119,6 +118,5 @@
showEmptyWorkspace = 0;
};
};
};
}
-2
View File
@@ -1,5 +1,4 @@
{ ... }:
let
ipc = "noctalia-shell ipc call";
in
@@ -12,7 +11,6 @@ in
];
bind = [
# workspace
"CTRL $mainMod, right, workspace, r+1"
"CTRL $mainMod, left, workspace, r-1"
-1
View File
@@ -1,5 +1,4 @@
{ ... }:
{
wayland.windowManager.hyprland.settings = {
windowrule = [
+1 -6
View File
@@ -1,9 +1,4 @@
{
pkgs,
inputs,
...
}:
{ pkgs, inputs, ... }:
{
imports = [ ./hypr/default.nix ];
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
imports = [
-1
View File
@@ -1,5 +1,4 @@
{ ... }:
{
imports = [
../home/git.nix
+2 -6
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
imports = [
@@ -59,6 +56,5 @@
};
environment.etc."xdg/menus/applications.menu".text =
builtins.readFile
"${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
}
@@ -1,8 +1,4 @@
{
pkgs,
inputs,
...
}:
{ pkgs, inputs, ... }:
{
programs.hyprland = {
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
imports = [
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
programs.steam = {
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
hardware.graphics.extraPackages = with pkgs; [
+1 -6
View File
@@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
let
driver = config.elars.hardware.graphics.driver;
+3 -6
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
let
wayland-intel-vaapi-driver = pkgs.intel-vaapi-driver.overrideAttrs (oldAttrs: {
version = "2.4.4-wayland-fix";
@@ -22,8 +19,8 @@ let
};
});
hasvk14-layer = pkgs.callPackage ./vk {};
hasvk14-layer-32 = pkgs.pkgsi686Linux.callPackage ./vk {};
hasvk14-layer = pkgs.callPackage ./vk { };
hasvk14-layer-32 = pkgs.pkgsi686Linux.callPackage ./vk { };
in
{
+1 -4
View File
@@ -1,7 +1,4 @@
{
config,
...
}:
{ config, ... }:
{
services.xserver.videoDrivers = [ "nvidia" ];
@@ -2,7 +2,7 @@
pkgs.stdenv.mkDerivation {
name = "vulkan-layer-hasvk14";
src = ./.;
src = ./.;
buildInputs = [ pkgs.vulkan-headers ];
@@ -6,18 +6,16 @@
#include <vulkan/vk_layer.h>
#include <string.h>
static PFN_vkGetInstanceProcAddr g_next_gipa = NULL;
static PFN_vkGetPhysicalDeviceProperties g_next_gdp = NULL;
static PFN_vkGetPhysicalDeviceProperties2 g_next_gdp2 = NULL;
static PFN_vkGetInstanceProcAddr g_next_gipa = NULL;
static PFN_vkGetPhysicalDeviceProperties g_next_gdp = NULL;
static PFN_vkGetPhysicalDeviceProperties2 g_next_gdp2 = NULL;
#define HASVK14_API_VERSION VK_MAKE_API_VERSION(0, 1, 4, VK_HEADER_VERSION)
#define INTEL_VENDOR_ID 0x8086
#define INTEL_VENDOR_ID 0x8086
static int is_intel_below_14(uint32_t vendorID, uint32_t apiVersion)
{
return vendorID == INTEL_VENDOR_ID
&& VK_API_VERSION_MAJOR(apiVersion) == 1
&& VK_API_VERSION_MINOR(apiVersion) < 4;
return vendorID == INTEL_VENDOR_ID && VK_API_VERSION_MAJOR(apiVersion) == 1 && VK_API_VERSION_MINOR(apiVersion) < 4;
}
VKAPI_ATTR VkResult VKAPI_CALL
@@ -28,30 +26,33 @@ HaVK14_EnumerateInstanceVersion(uint32_t *pApiVersion)
}
VKAPI_ATTR VkResult VKAPI_CALL
HaVK14_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
HaVK14_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
VkInstance *pInstance)
VkInstance *pInstance)
{
VkLayerInstanceCreateInfo *link =
(VkLayerInstanceCreateInfo *)pCreateInfo->pNext;
while (link &&
!(link->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO &&
!(link->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO &&
link->function == VK_LAYER_LINK_INFO))
link = (VkLayerInstanceCreateInfo *)link->pNext;
if (!link) return VK_ERROR_INITIALIZATION_FAILED;
g_next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr;
if (!link)
return VK_ERROR_INITIALIZATION_FAILED;
g_next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr;
link->u.pLayerInfo = link->u.pLayerInfo->pNext;
PFN_vkCreateInstance next_ci =
(PFN_vkCreateInstance)g_next_gipa(NULL, "vkCreateInstance");
VkResult res = next_ci(pCreateInfo, pAllocator, pInstance);
if (res != VK_SUCCESS) return res;
g_next_gdp = (PFN_vkGetPhysicalDeviceProperties)
if (res != VK_SUCCESS)
return res;
g_next_gdp = (PFN_vkGetPhysicalDeviceProperties)
g_next_gipa(*pInstance, "vkGetPhysicalDeviceProperties");
g_next_gdp2 = (PFN_vkGetPhysicalDeviceProperties2)
g_next_gipa(*pInstance, "vkGetPhysicalDeviceProperties2");
if (!g_next_gdp2) {
if (!g_next_gdp2)
{
g_next_gdp2 = (PFN_vkGetPhysicalDeviceProperties2)
g_next_gipa(*pInstance, "vkGetPhysicalDeviceProperties2KHR");
}
@@ -60,36 +61,44 @@ HaVK14_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
}
VKAPI_ATTR void VKAPI_CALL
HaVK14_GetPhysicalDeviceProperties(VkPhysicalDevice device,
HaVK14_GetPhysicalDeviceProperties(VkPhysicalDevice device,
VkPhysicalDeviceProperties *props)
{
if (g_next_gdp) g_next_gdp(device, props);
if (props && is_intel_below_14(props->vendorID, props->apiVersion)) {
if (g_next_gdp)
g_next_gdp(device, props);
if (props && is_intel_below_14(props->vendorID, props->apiVersion))
{
props->apiVersion = HASVK14_API_VERSION;
}
}
VKAPI_ATTR void VKAPI_CALL
HaVK14_GetPhysicalDeviceProperties2(VkPhysicalDevice device,
HaVK14_GetPhysicalDeviceProperties2(VkPhysicalDevice device,
VkPhysicalDeviceProperties2 *props2)
{
if (g_next_gdp2) g_next_gdp2(device, props2);
if (!props2) return;
if (g_next_gdp2)
g_next_gdp2(device, props2);
if (!props2)
return;
VkPhysicalDeviceProperties *props = &props2->properties;
if (!is_intel_below_14(props->vendorID, props->apiVersion)) return;
if (!is_intel_below_14(props->vendorID, props->apiVersion))
return;
props->apiVersion = HASVK14_API_VERSION;
VkBaseOutStructure *s = (VkBaseOutStructure *)props2->pNext;
while (s) {
if (s->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES) {
while (s)
{
if (s->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_PROPERTIES)
{
VkPhysicalDeviceVulkan12Properties *p12 =
(VkPhysicalDeviceVulkan12Properties *)s;
p12->conformanceVersion = (VkConformanceVersion){ 1, 4, 1, 1 };
p12->conformanceVersion = (VkConformanceVersion){1, 4, 1, 1};
}
if (s->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES) {
if (s->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES)
{
VkPhysicalDeviceDriverProperties *drv =
(VkPhysicalDeviceDriverProperties *)s;
drv->conformanceVersion = (VkConformanceVersion){ 1, 4, 1, 1 };
drv->conformanceVersion = (VkConformanceVersion){1, 4, 1, 1};
}
s = s->pNext;
}
@@ -99,8 +108,9 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
HaVK14_GetInstanceProcAddr(VkInstance instance, const char *pName)
{
#define INTERCEPT(fn) \
if (strcmp(pName, "vk" #fn) == 0) return (PFN_vkVoidFunction)HaVK14_##fn;
#define INTERCEPT(fn) \
if (strcmp(pName, "vk" #fn) == 0) \
return (PFN_vkVoidFunction)HaVK14_##fn;
INTERCEPT(GetInstanceProcAddr)
INTERCEPT(EnumerateInstanceVersion)
@@ -108,7 +118,8 @@ HaVK14_GetInstanceProcAddr(VkInstance instance, const char *pName)
INTERCEPT(GetPhysicalDeviceProperties)
INTERCEPT(GetPhysicalDeviceProperties2)
if (strcmp(pName, "vkGetPhysicalDeviceProperties2KHR") == 0) {
if (strcmp(pName, "vkGetPhysicalDeviceProperties2KHR") == 0)
{
return (PFN_vkVoidFunction)HaVK14_GetPhysicalDeviceProperties2;
}
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
services.printing = {
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
programs.gnupg.agent = {
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
fonts = {
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
fonts.packages = [
+1 -4
View File
@@ -1,7 +1,4 @@
{
pkgs,
...
}:
{ pkgs, ... }:
{
users.users.elars = {