From 9cb34f0e22421263f92383c9ee906c42c2b16cec Mon Sep 17 00:00:00 2001 From: tulg Date: Sat, 6 Jun 2026 18:44:46 +0300 Subject: [PATCH] whatever and 26.11 --- config/hypr/hyprland.conf | 16 +-- flake.lock | 116 +++++++++---------- hosts/overlord/configuration.nix | 1 + hosts/virgil/configuration.nix | 41 ------- modules/home-manager/desktop/default.nix | 1 + modules/home-manager/desktop/obs.nix | 25 ++++ modules/home-manager/home.nix | 2 +- modules/home-manager/pkgs.nix | 2 +- modules/servers/per-host/kittykat/xray.nix | 3 +- modules/servers/per-host/overlord/tunnel.nix | 1 + 10 files changed, 98 insertions(+), 110 deletions(-) create mode 100644 modules/home-manager/desktop/obs.nix diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index a8857fc..88240b0 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -17,7 +17,7 @@ monitor = Virtual-1, 1920x1080,0x0, 1 disable-output = DP-3 # #monitor = DP-1, 1920x1080@60, 0x0, 1 -#monitor = HDMI-A-1, 1920x1080@60.02000, 0x0, 1 +monitor = HDMI-A-1, 1920x1080@240, 0x0, 1 #monitor # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -100,11 +100,11 @@ animations { animation = workspaces, 1, 2, default } -dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # you probably want this -} +#dwindle { +# # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more +# pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below +# preserve_split = true # you probably want this +#} master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more @@ -141,7 +141,7 @@ bind = $mainMod SHIFT, O, togglefloating, bind = $mainMod, D, exec, wofi --show drun --allow-images -W 300 -H 500 -l 4 bind = $mainMod SHIFT, D, exec, nwg-drawer -mb 10 -mr 10 -ml 10 -mt 10 bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod SHIFT, P, togglesplit, # dwindle +##bind = $mainMod SHIFT, P, togglesplit, # dwindle # Mainmod + Function keys bind = $mainMod, F1, exec, firedragon @@ -312,7 +312,7 @@ env = HYPRCURSOR_SIZE,28 # Performance Tweaks (For less power consumption without sacrificing performance) # See : https://wiki.hyprland.org/Configuring/Performance/ -misc:vfr = true +#misc:vfr = true # enable G-Hyprland bind = $mainMod SHIFT, G, exec, footclient -e ~/.local/bin/bear/implement_gum.sh enable diff --git a/flake.lock b/flake.lock index 49b16ff..930ea72 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1778958912, - "narHash": "sha256-6pvS9rIF9mZRj1ENwu9fDLHeG1JFDTCpRyy6vJhXkTA=", + "lastModified": 1780290312, + "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", "owner": "nix-community", "repo": "disko", - "rev": "6e8dc7aa0e65fce67c76e18227a13a7d529f2cdf", + "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1776136500, - "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", + "lastModified": 1779670703, + "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", + "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", "type": "github" }, "original": { @@ -225,11 +225,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1779103424, - "narHash": "sha256-hBYJz5jnRDjACPrwdD064zwMW+s5bdNlG/lNQipLhgM=", + "lastModified": 1780593650, + "narHash": "sha256-CHo7k65YTL3HY+WQVedDTupji+LMgNlKCdrtRHZFAK4=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd71501fb7005264feb4de78444a2e1518cd4f66", + "rev": "447fd9ff62501dae7206dfe180ee89f8de27b7d5", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1778805320, - "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=", + "lastModified": 1780515920, + "narHash": "sha256-8KX2hEeOX6KP3hBBJJI8dGWVrzbOOf1rBPmg/GUG24U=", "owner": "nix-community", "repo": "home-manager", - "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92", + "rev": "4c5c1e8ba14f1c7475fa31ff11bc1c19cd220974", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "website-builder": "website-builder" }, "locked": { - "lastModified": 1778908661, - "narHash": "sha256-eeRN0ew1VfutaVNxoaYvua7CHoqc7gI5vLPxUL5ko7k=", + "lastModified": 1780503763, + "narHash": "sha256-e2PD1oowOjebEAaWsiQ9g0FQA9OYaUWj7vLwUvDE6EM=", "owner": "nix-media-server", "repo": "nixarr", - "rev": "3bde55fe657ee3ec1c2b2c05294ff381cb8f2d43", + "rev": "6c1eb23334e06bd3fd8d3d8782c64e5c3ac13097", "type": "github" }, "original": { @@ -490,11 +490,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-VdRy3A14M5vIE882DJcaaR+5wrss9Qsg4YNVbr7uj3k=", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "lastModified": 1779560665, + "narHash": "sha256-NpH8iEQ5JHv/BtUuzTEXUMDxPLetCDzIv4OxL8H7Kps=", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre998534.d233902339c0/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre1004030.64c08a7ca051/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -519,11 +519,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -541,11 +541,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1778985886, - "narHash": "sha256-eI7Vv6sWHxUnkOH3f7TBUzMhJIeVTi4A9tUk3+DfR08=", + "lastModified": 1780371321, + "narHash": "sha256-WCaU6npdMdjZSZHe3XATNDFijmzRnsV8V+iR80e5deg=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "aecc6c4db35bf4bee10ab63a4acee784ff21992a", + "rev": "3aab45a2f34fd47666b05892b95054952e788de1", "type": "github" }, "original": { @@ -564,11 +564,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1778983195, - "narHash": "sha256-hE3EFK5GoSdbO5WHZ8bZDUVYkofbDLQN/KK25z7IOOI=", + "lastModified": 1780194487, + "narHash": "sha256-M+YtjKCTkHrkplNaKVyaxfa8hAWjRF6wFOUBAZvxQ4U=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "4116b41cdc89e186be7cb8b24a9b6022af95d742", + "rev": "07398e12b54f194e3a2d47c87e3fd10b8eeaa27d", "type": "github" }, "original": { @@ -589,11 +589,11 @@ ] }, "locked": { - "lastModified": 1777598946, - "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", + "lastModified": 1780281641, + "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", "owner": "nix-community", "repo": "NUR", - "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", + "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", "type": "github" }, "original": { @@ -609,11 +609,11 @@ ] }, "locked": { - "lastModified": 1778488696, - "narHash": "sha256-QSWgYuZUCNUJ/cxmaq83WkcT7lHQDDfsPVgH+96kIl0=", + "lastModified": 1780303737, + "narHash": "sha256-7HgdJBG4BgAPDyHKKxWtxj7nziqsQo6zQCXtwy+L9fs=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "7d1c9a9c6721606b129829134d6f614f015621e2", + "rev": "b66495fcc5022681b56b61f928c7acbe910e722c", "type": "github" }, "original": { @@ -646,11 +646,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1779000518, - "narHash": "sha256-wdtytSnzMe85J/qeXJALMzSLRFTZ1gBHwn81l1PtT8k=", + "lastModified": 1780422259, + "narHash": "sha256-dWGk4SEdI189kQW5cE4Uo1Mc+P+kQEdgMcyMgTtmQOA=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "5dde76b38418892ccb3d99e99bed7f8a43ac294c", + "rev": "8414bbf2fcc7bc0a22c675e498e3c7365c1aec0a", "type": "github" }, "original": { @@ -679,11 +679,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1778776709, - "narHash": "sha256-YhnEcpiY6+l3RFA+cPmdTaeODGvNRuqE8B7VBjPVIxo=", + "lastModified": 1780584783, + "narHash": "sha256-b4o1AlQpGgpUfieaNz/3gsSzogjoiczmnlbDj0khImY=", "owner": "nix-community", "repo": "stylix", - "rev": "e8ea85b4f7dddda9603e0f1ac86cd92cee3b2819", + "rev": "6b6b874d082928aa9557e21516d4fe2f2bb305e1", "type": "github" }, "original": { @@ -786,11 +786,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777041405, - "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", + "lastModified": 1777806186, + "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", + "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", "type": "github" }, "original": { @@ -802,11 +802,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1777169200, - "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", + "lastModified": 1778379944, + "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", + "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", "type": "github" }, "original": { @@ -818,11 +818,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1777463218, - "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", + "lastModified": 1778378178, + "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", + "rev": "9cd816033ff969415b190722cddf134e78a5665f", "type": "github" }, "original": { @@ -954,11 +954,11 @@ ] }, "locked": { - "lastModified": 1779093899, - "narHash": "sha256-wzHbwUimm45J5r+d4VOi2rrRWwvYimP6OM8BJBIHbYc=", + "lastModified": 1780567926, + "narHash": "sha256-LVaiAnBwgr2YotaIlrcwCgmbwHsE2ccegRztLjur/d4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d21282d88c6bd4b3dc692566c5d84de39f7a96c0", + "rev": "eea9ae34eb9011aee9b8ce8ee2bc2dd111ee8285", "type": "github" }, "original": { diff --git a/hosts/overlord/configuration.nix b/hosts/overlord/configuration.nix index 6eb1554..1169930 100644 --- a/hosts/overlord/configuration.nix +++ b/hosts/overlord/configuration.nix @@ -20,6 +20,7 @@ ... ''; }; + networking.hostName = "overlord"; system.stateVersion = "25.05"; } diff --git a/hosts/virgil/configuration.nix b/hosts/virgil/configuration.nix index a9eb4ad..3686e71 100644 --- a/hosts/virgil/configuration.nix +++ b/hosts/virgil/configuration.nix @@ -23,47 +23,6 @@ enable = true; xwayland.enable = true; }; - virtualisation.docker.enable = true; - users.users.tulg.extraGroups = ["docker"]; - environment.systemPackages = with pkgs; [ - winboat - (pkgs.bottles.override { - # Intercept buildFHSEnv to modify target packages - buildFHSEnv = args: - pkgs.buildFHSEnv (args - // { - multiPkgs = envPkgs: let - # Fetch original package list - originalPkgs = args.multiPkgs envPkgs; - - # Disable tests for openldap - customLdap = envPkgs.openldap.overrideAttrs (_: {doCheck = false;}); - in - # Replace broken openldap with the custom one - builtins.filter (p: (p.pname or "") != "openldap") originalPkgs ++ [customLdap]; - }); - }) - ]; - - programs.obs-studio = { - enable = true; - - # optional Nvidia hardware acceleration - package = ( - pkgs.obs-studio.override { - cudaSupport = true; - } - ); - - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-backgroundremoval - obs-pipewire-audio-capture - obs-vaapi #optional AMD hardware acceleration - obs-gstreamer - obs-vkcapture - ]; - }; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix index 5c616f2..88e297d 100644 --- a/modules/home-manager/desktop/default.nix +++ b/modules/home-manager/desktop/default.nix @@ -6,5 +6,6 @@ ./spicetify.nix ./browsers/zen.nix ./vscode.nix + ./obs.nix ]; } diff --git a/modules/home-manager/desktop/obs.nix b/modules/home-manager/desktop/obs.nix new file mode 100644 index 0000000..0f38062 --- /dev/null +++ b/modules/home-manager/desktop/obs.nix @@ -0,0 +1,25 @@ +{ + config, + pkgs, + ... +}: { + programs.obs-studio = { + enable = true; + + # optional Nvidia hardware acceleration + package = ( + pkgs.obs-studio.override { + cudaSupport = true; + } + ); + + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + obs-vaapi #optional AMD hardware acceleration + obs-gstreamer + obs-vkcapture + ]; + }; +} diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index dbfb203..8c986ac 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -15,7 +15,7 @@ home.username = "tulg"; home.homeDirectory = "/home/tulg"; home.stateVersion = "25.05"; - gtk.gtk4.theme = config.gtk.theme; # sybau + #gtk.gtk4.theme = config.gtk.theme; # sybau programs.firefox.configPath = ".mozilla/firefox"; # sybau mozilla shitbox programs.vesktop.enable = true; diff --git a/modules/home-manager/pkgs.nix b/modules/home-manager/pkgs.nix index a9b3b84..447f923 100644 --- a/modules/home-manager/pkgs.nix +++ b/modules/home-manager/pkgs.nix @@ -40,7 +40,7 @@ mako feh librewolf - zellij + element-desktop piper libratbag diff --git a/modules/servers/per-host/kittykat/xray.nix b/modules/servers/per-host/kittykat/xray.nix index 7e6e887..a84e6f4 100644 --- a/modules/servers/per-host/kittykat/xray.nix +++ b/modules/servers/per-host/kittykat/xray.nix @@ -4,7 +4,8 @@ port = 2053; openFirewall = false; }; - networking.firewall.allowedTCPPorts = [45544 22]; + networking.firewall.allowedTCPPorts = [45544 22 25565 27036]; + networking.firewall.allowedUDPPorts = [27015 27031 27032 27033 27034 27035 27036]; services.traefik.dynamicConfigOptions.http = { routers.xray = { rule = "Host(`v2.kittykat.poggerer.xyz`)"; diff --git a/modules/servers/per-host/overlord/tunnel.nix b/modules/servers/per-host/overlord/tunnel.nix index ad49202..f1db805 100644 --- a/modules/servers/per-host/overlord/tunnel.nix +++ b/modules/servers/per-host/overlord/tunnel.nix @@ -50,6 +50,7 @@ in { enable = true; interfaces.tun0.allowedUDPPorts = zomboidUdpPorts; interfaces.tun0.allowedTCPPorts = minecraftTcpPorts; + allowedTCPPorts = [22 25565]; }; systemd.services.ssh-tun-kittykat = {