From c2fc0d01f2b78e8ed89071914985b664aec63f77 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Thu, 6 Aug 2026 18:01:11 +0200 Subject: [PATCH] Tweaked some things --- dev-flakes/vulkan/flake.nix | 3 ++ .../features/desktop/rice/noctalia.json | 37 +++++-------------- .../features/desktop/rice/noctalia.nix | 9 +++-- .../hosts/framework16/configuration.nix | 28 +++++++++++++- 4 files changed, 45 insertions(+), 32 deletions(-) diff --git a/dev-flakes/vulkan/flake.nix b/dev-flakes/vulkan/flake.nix index 2ba587b..99d0f30 100644 --- a/dev-flakes/vulkan/flake.nix +++ b/dev-flakes/vulkan/flake.nix @@ -30,6 +30,7 @@ vulkan-utility-libraries vk-bootstrap vulkan-memory-allocator + vulkan-volk # Wayland wayland wayland-protocols @@ -41,6 +42,7 @@ # Other libraries glfw3 SDL2 + sdl3 fmt imgui tinyobjloader @@ -64,6 +66,7 @@ pkgs.shaderc.lib pkgs.SDL2 pkgs.vk-bootstrap + #pkgs.sdl3 ]; VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d"; VULKAN_SDK = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d"; diff --git a/modules_dentritic/features/desktop/rice/noctalia.json b/modules_dentritic/features/desktop/rice/noctalia.json index 04d8141..a48a7de 100644 --- a/modules_dentritic/features/desktop/rice/noctalia.json +++ b/modules_dentritic/features/desktop/rice/noctalia.json @@ -240,28 +240,13 @@ "lockScreenBlur": 0, "lockScreenTint": 0, "keybinds": { - "keyUp": [ - "Up" - ], - "keyDown": [ - "Down" - ], - "keyLeft": [ - "Left" - ], - "keyRight": [ - "Right" - ], - "keyEnter": [ - "Return", - "Enter" - ], - "keyEscape": [ - "Esc" - ], - "keyRemove": [ - "Del" - ] + "keyUp": ["Up"], + "keyDown": ["Down"], + "keyLeft": ["Left"], + "keyRight": ["Right"], + "keyEnter": ["Return", "Enter"], + "keyEscape": ["Esc"], + "keyRemove": ["Del"] }, "reverseScroll": false, "smoothScrollEnabled": true @@ -618,11 +603,7 @@ "autoHideMs": 2000, "overlayLayer": true, "backgroundOpacity": 1, - "enabledTypes": [ - 0, - 1, - 2 - ], + "enabledTypes": [0, 1, 2], "monitors": [] }, "audio": { @@ -691,7 +672,7 @@ "enabled": true, "screenOffTimeout": 600, "lockTimeout": 600, - "suspendTimeout": 36000, + "suspendTimeout": 1200, "fadeDuration": 5, "screenOffCommand": "", "lockCommand": "", diff --git a/modules_dentritic/features/desktop/rice/noctalia.nix b/modules_dentritic/features/desktop/rice/noctalia.nix index ae1867e..cc76a51 100644 --- a/modules_dentritic/features/desktop/rice/noctalia.nix +++ b/modules_dentritic/features/desktop/rice/noctalia.nix @@ -3,7 +3,11 @@ perSystem = { pkgs, lib, ... }: { packages.myNoctalia = inputs.wrapper-modules.wrappers.noctalia-shell.wrap { inherit pkgs; - settings = { + settings = + (builtins.fromJSON + (builtins.readFile ./noctalia.json)).settings; + /* + { bar = { barType = "floating"; position = "left"; @@ -54,8 +58,7 @@ }; }; }; - #(builtins.fromJSON - # (builtins.readFile ./noctalia.json)).settings; + */ }; }; } diff --git a/modules_dentritic/hosts/framework16/configuration.nix b/modules_dentritic/hosts/framework16/configuration.nix index 093639d..2045811 100644 --- a/modules_dentritic/hosts/framework16/configuration.nix +++ b/modules_dentritic/hosts/framework16/configuration.nix @@ -16,7 +16,7 @@ self.nixosModules.commonConfig self.nixosModules.bootloader self.nixosModules.niri - self.nixosModules.distrobox + #self.nixosModules.distrobox ]; networking = { @@ -24,6 +24,32 @@ networkmanager = { 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 = {