some stuff

11 files changed, 151 insertions, 134 deletions

diff --git a/flake.lock b/flake.lock
index d8c3c13..ee8453d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1764175031,
-        "narHash": "sha256-SXCfY//GEH1ehxQ1yfrcF6J2xUBWuTlokudSeRlWphg=",
+        "lastModified": 1764379284,
+        "narHash": "sha256-nNdyU94gWdwMphROshWPueeUi/s7Yq463WZl4/yk0Tk=",
         "ref": "refs/heads/main",
-        "rev": "4fa305744634fd99c5d38e3cf4143fbdd9b390e3",
-        "revCount": 1318,
+        "rev": "0b1bb7fe02bc0668c71b969452ea852e2f25e0fa",
+        "revCount": 1319,
         "type": "git",
         "url": "https://codeberg.org/LGFae/awww"
       },
@@ -64,11 +64,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1764153295,
-        "narHash": "sha256-Y+Cp19zLo5JZVLSbzpyCTSK1bVYfE3Leuut6nQVkdR4=",
+        "lastModified": 1764351487,
+        "narHash": "sha256-7XJcTfz0dPhBd7nfyjcFxT1LIIctJZ2LthiI2Ltd7zY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "29c49282c9b2e8216004a87086494defe401fee8",
+        "rev": "2031f4a0507d0f7ab3e1aaff4c027a010feee447",
         "type": "github"
       },
       "original": {
@@ -301,11 +301,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764075860,
-        "narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=",
+        "lastModified": 1764194569,
+        "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "295d90e22d557ccc3049dc92460b82f372cd3892",
+        "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0",
         "type": "github"
       },
       "original": {
@@ -321,15 +321,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1764182832,
-        "narHash": "sha256-ahMNAEknEnSW+WLZsgTnw2e12YcltJDi6J2MsWtPvs0=",
+        "lastModified": 1764361670,
+        "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8220473f952571691b05037dbd18659d1f5f83a1",
+        "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -410,11 +411,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1764111111,
-        "narHash": "sha256-CqXsRpQjhHLzZg/kWiIIUeUJUko5naDLEt/VGZTjyjY=",
+        "lastModified": 1764283894,
+        "narHash": "sha256-5BWYZDmJKwUGxhY+43obUZItkAL6rm3xkvBYdltUWz4=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "210930bef93916b6271685277e54b0dedb46214e",
+        "rev": "7e1e24fea615503a3cc05218c12b06c1b6cabdc7",
         "type": "github"
       },
       "original": {
@@ -662,11 +663,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763714684,
-        "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=",
+        "lastModified": 1764275117,
+        "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3",
+        "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923",
         "type": "github"
       },
       "original": {
@@ -700,11 +701,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764115497,
-        "narHash": "sha256-O76AgT1qySSmdLU+20p0L6L4CLl+L/BFn6Hn+v3lZb0=",
+        "lastModified": 1764374701,
+        "narHash": "sha256-T17q4xbY1Qf6LOsiexg3KtwbY5wle4jjIQtI7AluH1c=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "531a6afb65033ff28663e83efcb5d8b94c339aeb",
+        "rev": "df074066e65d8a575f218fbf74b00ab973144d45",
         "type": "github"
       },
       "original": {
@@ -716,11 +717,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1764103112,
-        "narHash": "sha256-tnxXyr4eqFft9gm8elxB91maZ8FkvKrI14duvNJW6aw=",
+        "lastModified": 1764372574,
+        "narHash": "sha256-G53rBJNiVHIm+sXjBKXGWi11aM/fIHJKqO/wSbpXyeo=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "87bd16e470b2d7a45f38c7402037ad1bcf91ded9",
+        "rev": "fd47bc2f046d3c8c9f01507e84072041512841d6",
         "type": "github"
       },
       "original": {
@@ -741,11 +742,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1764165116,
-        "narHash": "sha256-DN0m9X9dFPxNTfhaUWlHoM2CFbNiWgxVHzC4j0AIiuc=",
+        "lastModified": 1764405884,
+        "narHash": "sha256-TnvBRPmcpcyinvLgsitHS7w5soSa6yNBfRYEI2TK1Ts=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "ae097a3c5ef217f9441d0da1c0bc14bbb4796b94",
+        "rev": "10aae4855ee275f7d80d85f4328c24265fb20f1f",
         "type": "github"
       },
       "original": {
@@ -774,11 +775,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1764160906,
-        "narHash": "sha256-6Dud/oe0UnkgCe+JAGF+GjXl6S6ynpcAUYWCdbXjJL4=",
+        "lastModified": 1764399944,
+        "narHash": "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "8370c539fb584f78924b826d0ac0ad8fa068cf95",
+        "rev": "b35bcae35b3f9665043c335e55ed5828af77db85",
         "type": "github"
       },
       "original": {
@@ -819,11 +820,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764144269,
-        "narHash": "sha256-KwKC3ZdsMyfPAAy/ULWDw2ULADEnWxCtjuR4AtYH1Ec=",
+        "lastModified": 1764347286,
+        "narHash": "sha256-AqhVZYYtr5Yz7EHchBxQauyfbanAhTiwkMyCopTi5jA=",
         "owner": "KaylorBen",
         "repo": "nixcord",
-        "rev": "fb447975eb53fd560456d043f2f8702f7470b839",
+        "rev": "b7e0bafd7c4b81ad85bdcd22129927268231d525",
         "type": "github"
       },
       "original": {
@@ -834,11 +835,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763966396,
-        "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
         "type": "github"
       },
       "original": {
@@ -865,11 +866,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1763948260,
-        "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=",
+        "lastModified": 1764316264,
+        "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c",
+        "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
         "type": "github"
       },
       "original": {
@@ -881,11 +882,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1763948260,
-        "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=",
+        "lastModified": 1764316264,
+        "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c",
+        "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
         "type": "github"
       },
       "original": {
@@ -897,11 +898,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1763966396,
-        "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
         "type": "github"
       },
       "original": {
@@ -937,11 +938,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1764148348,
-        "narHash": "sha256-C9UobzCvMaLwNtRaFrt26TA/SkQtcDhJFmlVQ6DPHyA=",
+        "lastModified": 1764385708,
+        "narHash": "sha256-OW19qwRisjzD1vQknzGXbZ5yqtULI1FU1f6HZdKn5TA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "7fe6951bf8c2719f437f74224adf3a2e875d6781",
+        "rev": "96d3538c32816992f30d858095aa93c9ee32fd45",
         "type": "github"
       },
       "original": {
@@ -957,11 +958,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764187826,
-        "narHash": "sha256-ep25ULajD84KufFh3CojvI8/rfumsKRHXHgwnoTyVBY=",
+        "lastModified": 1764401432,
+        "narHash": "sha256-WECTdY/gLw8SqD+VKFpTnQDFhOEHBivf4FKEPb2j4OA=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "8419549183a1497e7f0d2e4cd49d3dbe1784f5b1",
+        "rev": "3db394c80ab21b1b821ea5496be202e0730d44c0",
         "type": "github"
       },
       "original": {
@@ -1024,11 +1025,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764174290,
-        "narHash": "sha256-oumC1tnM97XfUqlHWb/5fLhjFufRdExe9aP7lEHDZKk=",
+        "lastModified": 1764334760,
+        "narHash": "sha256-ddrVDrLUeMETGFD8ylt29f1GzFuTskZnbM7WpPcVzT8=",
         "owner": "PrismLauncher",
         "repo": "PrismLauncher",
-        "rev": "64e923e977ad4d31c1ceaae559c52f1484d3fe35",
+        "rev": "5c8b18098faf43a73a7f2a2db913da82d45f7678",
         "type": "github"
       },
       "original": {
@@ -1087,11 +1088,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764038373,
-        "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
+        "lastModified": 1764211126,
+        "narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
+        "rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed",
         "type": "github"
       },
       "original": {
@@ -1147,11 +1148,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1763964999,
-        "narHash": "sha256-eBhoBwlKg4dajpbFeFPb1zXDodLtzsb6e6VBzFpRaOY=",
+        "lastModified": 1764313190,
+        "narHash": "sha256-yAkUKVIwhTwkF/p4hMUQhWH5HaitHbAiH4pvCrbobcE=",
         "owner": "gabm",
         "repo": "Satty",
-        "rev": "d80cc93317cc56789a4be060940f52cc08962351",
+        "rev": "3848015764af30483daa5abce649231faed2d766",
         "type": "github"
       },
       "original": {
@@ -1338,11 +1339,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1763704521,
-        "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=",
+        "lastModified": 1764366786,
+        "narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad",
+        "rev": "b362a3873710a42f7ac2d8ba03772d8290733934",
         "type": "github"
       },
       "original": {
@@ -1360,11 +1361,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1764149272,
-        "narHash": "sha256-qQ1UB4hLrzaemZ1GjhJ2jhUqgm4pw63HanJKz+XDRvg=",
+        "lastModified": 1764399745,
+        "narHash": "sha256-iLiLLsOguSyFH44tBACDAYH6SOctGHn8bx+nDBtK+6g=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "329c80cbee5bb9e527ffa475bc0df2477f71ed93",
+        "rev": "ade1025a7426028a668307b6241caa79c41f8eb8",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7ef56f3..e0359f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/home/editors/nixvim.nix b/home/editors/nixvim.nix
index d11e9c0..6bfc119 100644
--- a/home/editors/nixvim.nix
+++ b/home/editors/nixvim.nix
@@ -12,7 +12,7 @@
     colorschemes.gruvbox.enable = true;
 
      plugins = {
-       # lualine.enable = true;
+       lualine.enable = true;
        nvim-autopairs.enable = true;
        neoscroll.enable = true;
        bufferline.enable = true;
diff --git a/home/home.nix b/home/home.nix
index e37c4da..87dc479 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -27,6 +27,13 @@
   home.stateVersion = "25.05";
 
   home.packages = with pkgs; [
+    librewolf
+    firefox
+    equibop
+    sherlock
+    inputs.prismlauncher.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher
+    inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
+    clinfo
     grim
     slurp
     satty
@@ -40,9 +47,6 @@
     fastfetch
     foot
     wofi
-    inputs.prismlauncher.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher
-    # prismlauncher
-    inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
     bitwarden-desktop
     yt-dlp_git
     ffmpeg
@@ -84,6 +88,4 @@
     enable = true;
     style.name = "Breeze-Dark";
   };
-
-  programs.home-manager.enable = true;
 }
diff --git a/home/programs/nixcord.nix b/home/programs/nixcord.nix
index f50a474..ddd648a 100644
--- a/home/programs/nixcord.nix
+++ b/home/programs/nixcord.nix
@@ -3,10 +3,6 @@
   imports = [ inputs.nixcord.homeModules.nixcord ];
   programs.nixcord = {
     enable = true;
-    equibop = {
-      enable = true;
-      autoscroll.enable = true;
-    };
     discord = {
       enable = true;
       vencord.enable = false;
@@ -15,7 +11,6 @@
     config = {
       frameless = true;
       plugins = {
-        alwaysExpandProfiles.enable = true;
         alwaysExpandRoles = {
           enable = true;
           hideArrow = true;
@@ -61,7 +56,7 @@
           enable = true;
           noMirroredCamera = true;
         };
-        equicordToolbox.enable = true;
+    # equicordToolbox.enable = true;
         expressionCloner.enable = true;
         fakeNitro = {
           enable = true;
@@ -102,10 +97,10 @@
         imgToGif.enable = true;
         inRole.enable = true;
         inviteDefaults.enable = true;
-        keyboardNavigation = {
-          enable = true;
-          hotkey = [ "Alt+Q" ];
-        };
+    # keyboardNavigation = {
+    #   enable = true;
+    #   hotkey = [ "Alt+Q" ];
+    # };
         memberCount.enable = true;
         mentionAvatars = {
           enable = true;
@@ -129,7 +124,7 @@
         noMaskedUrlPaste.enable = true;
         noModalAnimation.enable = true;
         noNitroUpsell.enable = true;
-      # noOnboarding.enable = true;
+    # noOnboarding.enable = true;
         noOnboardingDelay.enable = true;
         noMosaic.enable = true;
         noProfileThemes.enable = true;
@@ -160,15 +155,18 @@
         sendTimestamps.enable = true;
         serverInfo.enable = true;
         showConnections.enable = true;
-        showHiddenChannels.enable = true;
+        showHiddenChannels = {
+          enable = true;
+          # channelStyle = 2;
+        };
         showHiddenThings.enable = true;
         showResourceChannels.enable = true;
         showTimeoutDuration.enable = true;
-        soggy = {
-          enable = true;
-          imageLink = "https://codeberg.org/adikro/wallpapers/raw/branch/main/kirkinator.gif";
-          songLink = "https://video.twimg.com/amplify_video/1976076971651268608/vid/avc1/1080x720/KGLQcBQQDvLZUGKI.mp4";
-        };
+    # soggy = {
+    #   enable = true;
+    #   imageLink = "https://codeberg.org/adikro/wallpapers/raw/branch/main/kirkinator.gif";
+    #   songLink = "https://video.twimg.com/amplify_video/1976076971651268608/vid/avc1/1080x720/KGLQcBQQDvLZUGKI.mp4";
+    # };
         spotifyCrack = {
           enable = true;
           noSpotifyAutoPause = false;
diff --git a/home/xdg.nix b/home/xdg.nix
index f4b1294..be43d92 100644
--- a/home/xdg.nix
+++ b/home/xdg.nix
@@ -1,5 +1,4 @@
 { ... }:
-
 {
   xdg.userDirs = {
     enable = true;
@@ -16,7 +15,7 @@
     templates = null;
 
     extraConfig = {
-      XDG_PROJECTS_DIR = "$HOME/projects";
+      XDG_PROJECTS_DIR = "$HOME/proj";
       XDG_GAMES_DIR = "$HOME/Games";
       XDG_MEDIA_DIR = "/media";
       XDG_SS_DIR = "/media/ss";
@@ -26,7 +25,7 @@
     };
   };
     home.sessionVariables = { 
-      XDG_PROJECTS_DIR = "$HOME/projects";
+      XDG_PROJECTS_DIR = "$HOME/proj";
       XDG_GAMES_DIR = "$HOME/Games";
       XDG_MEDIA_DIR = "/media";
       XDG_SS_DIR = "/media/ss";
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index a9a147a..df86452 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -37,6 +37,8 @@
     package = pkgs.xwayland-satellite;
   };
 
+  programs.kdeconnect.enable = true;
+
   programs.coolercontrol.enable = true;
 
   programs.gnupg.agent = {
@@ -91,9 +93,9 @@ chaotic = {
   mesa-git = {
     enable = true;
     fallbackSpecialisation = false;
-    extraPackages = with pkgs; [
-      mesa_git.opencl
-    ];
+      extraPackages = with pkgs; [
+        mesa_git.opencl
+      ];
   };
 };
 
@@ -101,10 +103,19 @@ services.dbus.enable = true;
 
 xdg.portal = {
   enable = true;
-  wlr.enable = true;
+  xdgOpenUsePortal = true;
+    wlr = {
+      enable = true;
+    };
+  config = {
+    common = {
+      default = [
+        "gtk"
+      ];
+    };
+  };
   extraPortals = with pkgs; [
     xdg-desktop-portal-gtk
-    xdg-desktop-portal-gnome
   ];
 };
 
@@ -144,12 +155,13 @@ environment.sessionVariables = {
 
     users.users.adam = {
       isNormalUser = true;
-      extraGroups = [ "wheel" "input" ];
+      extraGroups = [ "wheel" "input" "docker" ];
       home = "/home/adam";
       shell = pkgs.fish;
    };
 
    environment.systemPackages = with pkgs; [
+    dbus
     swaylock-effects
     swayidle
     helvum
@@ -162,7 +174,6 @@ environment.sessionVariables = {
     nh
     gamemode
     mangohud
-    grimblast
     cliphist
     wl-clipboard
     nix-output-monitor
diff --git a/modules/networking.nix b/modules/networking.nix
index d4079f8..0b3cf91 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,6 +1,6 @@
 { ... }:
 {
-  # systemd.services."NetworkManager-wait-online".enable = false;
+  systemd.services."NetworkManager-wait-online".enable = false;
   networking = {
     hostName = "szpont";
 
@@ -12,14 +12,14 @@
 
     firewall = {
       enable = true;
-      allowedTCPPorts = [  ];
-      allowedUDPPorts = [  ];
+      allowedTCPPorts = [ 9150 ];
+      allowedUDPPorts = [ 9150 ];
     };
 
     nameservers = [ ];
   };
-  services.resolved = {
-    enable = true;
-    domains = [ "1.1.1.1" "8.8.8.8" ];
-  };
+  # services.resolved = {
+  #   enable = true;
+  #   domains = [ "1.1.1.1" "8.8.8.8" ];
+  # };
 }
diff --git a/modules/scx.nix b/modules/scx.nix
index b6af15c..0f777fe 100644
--- a/modules/scx.nix
+++ b/modules/scx.nix
@@ -2,11 +2,11 @@
 {
   services.scx = {
     enable = true;
-    scheduler = "scx_rusty";
-    # extraArgs =[
-    #   ''
-    #   --performance
-    #   ''
-    # ];
+    scheduler = "scx_lavd";
+    extraArgs =[
+      ''
+      --performance
+      ''
+    ];
   };
 }
diff --git a/modules/tor.nix b/modules/tor.nix
index 548da38..ad69f52 100644
--- a/modules/tor.nix
+++ b/modules/tor.nix
@@ -1,34 +1,41 @@
 { pkgs, ... }:
-
 {
+  networking.proxy.default = "https://127.0.0.1:8118";
   services = {
     tor = {
       enable = true;
-      
-      client = {
-        enable = true;
-        dns.enable = true;
-      };
+      # openFirewall = true;
+      torsocks.enable = true;
+      # torsocks.allowInbound = true;
+      client.enable = true;
+      # client = {
+      #   enable = true;
+      #   dns.enable = true;
+      # };
 
-      settings.DNSPort = [{
-        addr = "127.0.0.1";
-        port = 53;
-      }];
+      # settings.DNSPort = [{
+      #   addr = "127.0.0.1";
+      #   port = 53;
+      # }];
 
-      torsocks.enable = true;
+      # torsocks.enable = true;
+    };
+    privoxy = {
+      enable = true;
+      enableTor = true;
     };
-
-#    resolved = {
-#      enable = true;
-#      fallbackDns = [ "127.0.0.1:9053" ];
-#    };
   };
 
   environment.systemPackages = with pkgs; [
     tor
     torsocks
     tor-browser
+    torctl
+    vanguards
+    tractor
+    onioncircuits
+    oniux
   ];
 
-  networking.nameservers = [ "127.0.0.1" ];
+  # networking.nameservers = [ "127.0.0.1" ];
 }
diff --git a/modules/virtualization.nix b/modules/virtualization.nix
index eea29f4..0071f1a 100644
--- a/modules/virtualization.nix
+++ b/modules/virtualization.nix
@@ -10,15 +10,14 @@
     };
 
     docker = {
-      enable = false;
+      enable = true;
       extraPackages = with pkgs; [ docker-compose ];
     };
-
     containerd.enable = false;
   };
 
   programs.virt-manager.enable = true;
-#  networking.firewall.allowedTCPPorts = [ 16509 ]; # NAT
+  networking.firewall.allowedTCPPorts = [ 5984 ];
 
   users.users.adam.extraGroups = [ "libvirtd" "kvm" "docker" ];
 }