Compare commits

..

No commits in common. "c2fc0d01f2b78e8ed89071914985b664aec63f77" and "bed80cefa00dc352e0d870086c5abe13561030d4" have entirely different histories.

5 changed files with 31 additions and 59 deletions

View File

@ -30,7 +30,6 @@
vulkan-utility-libraries vulkan-utility-libraries
vk-bootstrap vk-bootstrap
vulkan-memory-allocator vulkan-memory-allocator
vulkan-volk
# Wayland # Wayland
wayland wayland
wayland-protocols wayland-protocols
@ -42,7 +41,6 @@
# Other libraries # Other libraries
glfw3 glfw3
SDL2 SDL2
sdl3
fmt fmt
imgui imgui
tinyobjloader tinyobjloader
@ -66,7 +64,6 @@
pkgs.shaderc.lib pkgs.shaderc.lib
pkgs.SDL2 pkgs.SDL2
pkgs.vk-bootstrap pkgs.vk-bootstrap
#pkgs.sdl3
]; ];
VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d"; VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
VULKAN_SDK = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d"; VULKAN_SDK = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";

View File

@ -1,14 +0,0 @@
{ self, inputs, ... }:
{
flake = {
nixosModules = {
distrobox = { pkgs, lib, ... }: {
virtualisation.podman = {
enable = true;
dockerCompat = true;
};
environment.systemPackages = [ pkgs.distrobox ];
};
};
};
}

View File

@ -240,13 +240,28 @@
"lockScreenBlur": 0, "lockScreenBlur": 0,
"lockScreenTint": 0, "lockScreenTint": 0,
"keybinds": { "keybinds": {
"keyUp": ["Up"], "keyUp": [
"keyDown": ["Down"], "Up"
"keyLeft": ["Left"], ],
"keyRight": ["Right"], "keyDown": [
"keyEnter": ["Return", "Enter"], "Down"
"keyEscape": ["Esc"], ],
"keyRemove": ["Del"] "keyLeft": [
"Left"
],
"keyRight": [
"Right"
],
"keyEnter": [
"Return",
"Enter"
],
"keyEscape": [
"Esc"
],
"keyRemove": [
"Del"
]
}, },
"reverseScroll": false, "reverseScroll": false,
"smoothScrollEnabled": true "smoothScrollEnabled": true
@ -603,7 +618,11 @@
"autoHideMs": 2000, "autoHideMs": 2000,
"overlayLayer": true, "overlayLayer": true,
"backgroundOpacity": 1, "backgroundOpacity": 1,
"enabledTypes": [0, 1, 2], "enabledTypes": [
0,
1,
2
],
"monitors": [] "monitors": []
}, },
"audio": { "audio": {
@ -672,7 +691,7 @@
"enabled": true, "enabled": true,
"screenOffTimeout": 600, "screenOffTimeout": 600,
"lockTimeout": 600, "lockTimeout": 600,
"suspendTimeout": 1200, "suspendTimeout": 36000,
"fadeDuration": 5, "fadeDuration": 5,
"screenOffCommand": "", "screenOffCommand": "",
"lockCommand": "", "lockCommand": "",

View File

@ -3,11 +3,7 @@
perSystem = { pkgs, lib, ... }: { perSystem = { pkgs, lib, ... }: {
packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap { packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap {
inherit pkgs; inherit pkgs;
settings = settings = {
(builtins.fromJSON
(builtins.readFile ./noctalia.json)).settings;
/*
{
bar = { bar = {
barType = "floating"; barType = "floating";
position = "left"; position = "left";
@ -58,7 +54,8 @@
}; };
}; };
}; };
*/ #(builtins.fromJSON
# (builtins.readFile ./noctalia.json)).settings;
}; };
}; };
} }

View File

@ -16,7 +16,6 @@
self.nixosModules.commonConfig self.nixosModules.commonConfig
self.nixosModules.bootloader self.nixosModules.bootloader
self.nixosModules.niri self.nixosModules.niri
#self.nixosModules.distrobox
]; ];
networking = { networking = {
@ -24,32 +23,6 @@
networkmanager = { networkmanager = {
enable = true; enable = true;
}; };
/*
nftables = {
enable = true;
ruleset = ''
table inet filter {
chain input {
type filter hook input priority filter; policy drop;
iifname "enp*" accept
ct state { established, related } accept
tcp dport 22 accept
icmp type echo-request accept
}
chain forward {
type filter hook forward priority filter; policy accept;
}
chain output {
type filter hook output priority filter; policy accept;
}
}
'';
};
*/
}; };
services = { services = {