From 8f7da696e5b5523492a9c7ee1885c54ddfbadaa6 Mon Sep 17 00:00:00 2001 From: waveringana Date: Sun, 15 Jun 2025 19:59:08 -0400 Subject: [PATCH 1/3] use swayfx --- common/desktop/sway.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/desktop/sway.nix b/common/desktop/sway.nix index 10c3505..f6514b4 100755 --- a/common/desktop/sway.nix +++ b/common/desktop/sway.nix @@ -20,6 +20,7 @@ in programs.sway = { enable = true; wrapperFeatures.gtk = true; + package = pkgs.swayfx; }; environment.sessionVariables = { From 397d3b06f1d4cf88b964f137c2e024f1b62bcf3f Mon Sep 17 00:00:00 2001 From: waveringana Date: Mon, 16 Jun 2025 00:33:29 -0400 Subject: [PATCH 2/3] why cant git pull just pull --- common/desktop/core.nix | 1 + common/desktop/sway.nix | 1 - home/regent/home.nix | 22 +++++++++++++++++++--- hosts/focalor/default.nix | 21 +++++---------------- hosts/focalor/scripts/vm-win11-hook.sh | 2 +- hosts/focalor/vfio.nix | 18 ------------------ 6 files changed, 26 insertions(+), 39 deletions(-) diff --git a/common/desktop/core.nix b/common/desktop/core.nix index d03941d..1589246 100755 --- a/common/desktop/core.nix +++ b/common/desktop/core.nix @@ -10,6 +10,7 @@ hyfetch sway-contrib.grimshot discord + pamixer ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/common/desktop/sway.nix b/common/desktop/sway.nix index f6514b4..10c3505 100755 --- a/common/desktop/sway.nix +++ b/common/desktop/sway.nix @@ -20,7 +20,6 @@ in programs.sway = { enable = true; wrapperFeatures.gtk = true; - package = pkgs.swayfx; }; environment.sessionVariables = { diff --git a/home/regent/home.nix b/home/regent/home.nix index 2902573..eec321a 100755 --- a/home/regent/home.nix +++ b/home/regent/home.nix @@ -13,6 +13,8 @@ };*/ ghostty.enable = true; ghostty.flavor = "mocha"; + nvim.enable = true; + nvim.flavor = "mocha"; }; programs.ghostty.enable = true; @@ -21,6 +23,20 @@ theme = "catppuccin-mocha"; }; + programs.neovim = { + enable = true; + defaultEditor = true; + viAlias = true; + vimAlias = true; + vimdiffAlias = true; + plugins = with pkgs.vimPlugins; [ + nvim-lspconfig + nvim-treesitter.withAllGrammars + plenary-nvim + mini-nvim + ]; + }; + home.pointerCursor = { gtk.enable = true; package = pkgs.phinger-cursors; @@ -71,7 +87,7 @@ window#waybar { margin: 0px; border: 0px; /*background-color:rgb(0, 0, 0);*/ - background-color: rgba(0, 0, 0, 0.9); + background-color: rgba(0, 0, 0, 0.8); color: @text; } @@ -130,7 +146,7 @@ window#waybar { height = 34; output = [ "HDMI-A-1" - "DP-2" + "DP-1" ]; modules-left = [ "sway/workspaces" ]; modules-center = [ "sway/window" ]; @@ -145,4 +161,4 @@ window#waybar { }; home.stateVersion = "25.05"; -} \ No newline at end of file +} diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix index 497f0f3..a76c701 100755 --- a/hosts/focalor/default.nix +++ b/hosts/focalor/default.nix @@ -36,6 +36,11 @@ networking.hostName = "focalor"; networking.hostId = "84bdc587"; + programs.steam.enable = true; + programs.steam.gamescopeSession.enable = true; + programs.appimage.enable = true; + programs.appimage.binfmt = true; + systemd.network = { enable = true; netdevs."br0" = { @@ -64,16 +69,6 @@ }; }; - /*networking = { - firewall.enable = false; - firewall.trustedInterfaces = [ - "tailscale0" - ]; - nameservers = [ "10.0.0.210" "1.1.1.1" ]; - useDHCP = true; - firewall.allowedTCPPorts = [22 80 443 2456 2457 9000 9001 9002]; - };*/ - services.resolved = { enable = true; dnssec = "true"; @@ -82,12 +77,6 @@ dnsovertls = "true"; }; - #boot.supportedFilesystems = [ "zfs" ]; - #boot.kernelModules = [ "nct6775" "coretemp" ]; - - #services.zfs.autoScrub.enable = true; - #services.zfs.trim.enable = true; - services.vscode-server.enable = true; services.vscode-server.nodejsPackage = pkgs.nodejs_20; diff --git a/hosts/focalor/scripts/vm-win11-hook.sh b/hosts/focalor/scripts/vm-win11-hook.sh index 6c9232e..ab8a870 100755 --- a/hosts/focalor/scripts/vm-win11-hook.sh +++ b/hosts/focalor/scripts/vm-win11-hook.sh @@ -55,7 +55,7 @@ if [[ "$GUEST_NAME" != "win11" ]]; then fi if [[ "$HOOK_NAME" == "prepare" && "$STATE_NAME" == "begin" ]]; then - start_hook + echo "do nothing" elif [[ "$HOOK_NAME" == "release" && "$STATE_NAME" == "end" ]]; then revert_hook fi diff --git a/hosts/focalor/vfio.nix b/hosts/focalor/vfio.nix index 07cac37..85b3b1c 100755 --- a/hosts/focalor/vfio.nix +++ b/hosts/focalor/vfio.nix @@ -37,24 +37,6 @@ }; in [ env ]; - - /*preStart = - '' - mkdir -p /var/lib/libvirt/hooks - mkdir -p /var/lib/libvirt/hooks/qemu.d/win10/prepare/begin - mkdir -p /var/lib/libvirt/hooks/qemu.d/win10/release/end - mkdir -p /var/lib/libvirt/vgabios - - ln -sf /home/regent/symlinks/qemu /var/lib/libvirt/hooks/qemu - ln -sf /home/regent/symlinks/kvm.conf /var/lib/libvirt/hooks/kvm.conf - ln -sf /home/regent/symlinks/start.sh /var/lib/libvirt/hooks/qemu.d/win11/prepare/begin/start.sh - ln -sf /home/regent/symlinks/stop.sh /var/lib/libvirt/hooks/qemu.d/win11/release/end/stop.sh - - chmod +x /var/lib/libvirt/hooks/qemu - chmod +x /var/lib/libvirt/hooks/kvm.conf - chmod +x /var/lib/libvirt/hooks/qemu.d/win11/prepare/begin/start.sh - chmod +x /var/lib/libvirt/hooks/qemu.d/win11/release/end/stop.sh - '';*/ }; users.extraUsers.regent.extraGroups = [ "libvirtd" ]; From c2db155794f1f285951ec09ec1299c67f47935ed Mon Sep 17 00:00:00 2001 From: waveringana Date: Mon, 16 Jun 2025 00:33:50 -0400 Subject: [PATCH 3/3] idk --- common/desktop/core.nix | 1 - home/regent/home.nix | 22 +++------------------- hosts/focalor/default.nix | 21 ++++++++++++++++----- hosts/focalor/scripts/vm-win11-hook.sh | 2 +- 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/common/desktop/core.nix b/common/desktop/core.nix index 1589246..d03941d 100755 --- a/common/desktop/core.nix +++ b/common/desktop/core.nix @@ -10,7 +10,6 @@ hyfetch sway-contrib.grimshot discord - pamixer ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/home/regent/home.nix b/home/regent/home.nix index eec321a..2902573 100755 --- a/home/regent/home.nix +++ b/home/regent/home.nix @@ -13,8 +13,6 @@ };*/ ghostty.enable = true; ghostty.flavor = "mocha"; - nvim.enable = true; - nvim.flavor = "mocha"; }; programs.ghostty.enable = true; @@ -23,20 +21,6 @@ theme = "catppuccin-mocha"; }; - programs.neovim = { - enable = true; - defaultEditor = true; - viAlias = true; - vimAlias = true; - vimdiffAlias = true; - plugins = with pkgs.vimPlugins; [ - nvim-lspconfig - nvim-treesitter.withAllGrammars - plenary-nvim - mini-nvim - ]; - }; - home.pointerCursor = { gtk.enable = true; package = pkgs.phinger-cursors; @@ -87,7 +71,7 @@ window#waybar { margin: 0px; border: 0px; /*background-color:rgb(0, 0, 0);*/ - background-color: rgba(0, 0, 0, 0.8); + background-color: rgba(0, 0, 0, 0.9); color: @text; } @@ -146,7 +130,7 @@ window#waybar { height = 34; output = [ "HDMI-A-1" - "DP-1" + "DP-2" ]; modules-left = [ "sway/workspaces" ]; modules-center = [ "sway/window" ]; @@ -161,4 +145,4 @@ window#waybar { }; home.stateVersion = "25.05"; -} +} \ No newline at end of file diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix index a76c701..497f0f3 100755 --- a/hosts/focalor/default.nix +++ b/hosts/focalor/default.nix @@ -36,11 +36,6 @@ networking.hostName = "focalor"; networking.hostId = "84bdc587"; - programs.steam.enable = true; - programs.steam.gamescopeSession.enable = true; - programs.appimage.enable = true; - programs.appimage.binfmt = true; - systemd.network = { enable = true; netdevs."br0" = { @@ -69,6 +64,16 @@ }; }; + /*networking = { + firewall.enable = false; + firewall.trustedInterfaces = [ + "tailscale0" + ]; + nameservers = [ "10.0.0.210" "1.1.1.1" ]; + useDHCP = true; + firewall.allowedTCPPorts = [22 80 443 2456 2457 9000 9001 9002]; + };*/ + services.resolved = { enable = true; dnssec = "true"; @@ -77,6 +82,12 @@ dnsovertls = "true"; }; + #boot.supportedFilesystems = [ "zfs" ]; + #boot.kernelModules = [ "nct6775" "coretemp" ]; + + #services.zfs.autoScrub.enable = true; + #services.zfs.trim.enable = true; + services.vscode-server.enable = true; services.vscode-server.nodejsPackage = pkgs.nodejs_20; diff --git a/hosts/focalor/scripts/vm-win11-hook.sh b/hosts/focalor/scripts/vm-win11-hook.sh index ab8a870..6c9232e 100755 --- a/hosts/focalor/scripts/vm-win11-hook.sh +++ b/hosts/focalor/scripts/vm-win11-hook.sh @@ -55,7 +55,7 @@ if [[ "$GUEST_NAME" != "win11" ]]; then fi if [[ "$HOOK_NAME" == "prepare" && "$STATE_NAME" == "begin" ]]; then - echo "do nothing" + start_hook elif [[ "$HOOK_NAME" == "release" && "$STATE_NAME" == "end" ]]; then revert_hook fi