update + lix + no more millennium + oil-nvim + idek anymore

9 files changed, 32 insertions, 7 deletions

diff --git a/modules/hosts/dragotha/dragotha.nix b/modules/hosts/dragotha/dragotha.nix
index 82de721..e73eae8 100644
--- a/modules/hosts/dragotha/dragotha.nix
+++ b/modules/hosts/dragotha/dragotha.nix
@@ -5,7 +5,6 @@
 }: {
   flake.nixosConfigurations.dragotha = inputs.nixpkgs.lib.nixosSystem {
     modules = [
-      inputs.lix-module.nixosModules.default
       self.nixosModules.dragotha
       self.nixosModules.dragothaHardware
 
@@ -34,6 +33,7 @@
       trusted-public-keys = [
         "linux-surface.cachix.org-1:h4xRj4dujnm9I9aL2V7OmUTiT7oEefGVwiI4UQrESsk="
       ];
+      trusted-users = ["jck" "root"];
     };
 
     hardware.graphics = {
diff --git a/modules/hosts/tiamat/tiamat.nix b/modules/hosts/tiamat/tiamat.nix
index 30f0a1f..12b1250 100644
--- a/modules/hosts/tiamat/tiamat.nix
+++ b/modules/hosts/tiamat/tiamat.nix
@@ -5,7 +5,6 @@
 }: {
   flake.nixosConfigurations.tiamat = inputs.nixpkgs.lib.nixosSystem {
     modules = [
-      inputs.lix-module.nixosModules.default
       self.nixosModules.tiamat
       self.nixosModules.tiamatHardware
 
diff --git a/modules/hosts/vecna/vecna.nix b/modules/hosts/vecna/vecna.nix
index e6dedbf..d3cd9a7 100644
--- a/modules/hosts/vecna/vecna.nix
+++ b/modules/hosts/vecna/vecna.nix
@@ -5,7 +5,6 @@
 }: {
   flake.nixosConfigurations.vecna = inputs.nixpkgs.lib.nixosSystem {
     modules = [
-      inputs.lix-module.nixosModules.default
       self.nixosModules.vecna
       self.nixosModules.vecnaHardware
 
diff --git a/modules/nixosModules/createHost.nix b/modules/nixosModules/createHost.nix
index 18fc915..a4996cb 100644
--- a/modules/nixosModules/createHost.nix
+++ b/modules/nixosModules/createHost.nix
@@ -68,6 +68,7 @@
     };
 
     nixpkgs.config.allowUnfree = true;
+    nix.package = pkgs.lix;
     nix.settings = {
       experimental-features = ["nix-command" "flakes"];
       auto-optimise-store = true;
diff --git a/modules/nixosModules/desktop/default.nix b/modules/nixosModules/desktop/default.nix
index 1f8a2c8..f4df60e 100644
--- a/modules/nixosModules/desktop/default.nix
+++ b/modules/nixosModules/desktop/default.nix
@@ -6,7 +6,6 @@
   flake.nixosModules.desktop = {pkgs, ...}: {
     imports = [
       self.nixosModules.gaming
-      self.nixosModules.mullvad
       self.nixosModules.pipewire
       self.nixosModules.printing
       self.nixosModules.tailscaleDesktop
@@ -39,6 +38,7 @@
       pkgs.vlc
       pkgs.winetricks
       pkgs.wineWow64Packages.stable
+      pkgs.wl-clipboard
     ];
 
     boot.plymouth.enable = true;
@@ -53,5 +53,14 @@
       corefonts
       unifont
     ];
+
+    programs.obs-studio = {
+      enable = true;
+      plugins = with pkgs.obs-studio-plugins; [
+        obs-pipewire-audio-capture
+        obs-vaapi
+        wlrobs
+      ];
+    };
   };
 }
diff --git a/modules/nixosModules/desktop/gaming.nix b/modules/nixosModules/desktop/gaming.nix
index 36db573..94851f7 100644
--- a/modules/nixosModules/desktop/gaming.nix
+++ b/modules/nixosModules/desktop/gaming.nix
@@ -8,11 +8,13 @@
       inputs.nix-flatpak.nixosModules.nix-flatpak
     ];
 
-    nixpkgs.overlays = [inputs.millennium.overlays.default];
+    # nixpkgs.overlays = [
+    #   inputs.millennium.overlays.default
+    # ];
 
     programs.steam = {
       enable = true;
-      package = pkgs.millennium-steam;
+      # package = pkgs.millennium-steam;
 
       protontricks.enable = true;
       extest.enable = true;
@@ -23,6 +25,7 @@
     };
 
     environment.systemPackages = with pkgs; [
+      faugus-launcher
       prismlauncher
       heroic
     ];
diff --git a/modules/packages/environment.nix b/modules/packages/environment.nix
index cfdd46e..31ff8c0 100644
--- a/modules/packages/environment.nix
+++ b/modules/packages/environment.nix
@@ -32,6 +32,7 @@
         pkgs.btop
         pkgs.killall
         pkgs.lazygit
+        pkgs.nix-output-monitor
         pkgs.p7zip
         pkgs.rsync
         pkgs.speedtest-cli
diff --git a/modules/packages/kitty.nix b/modules/packages/kitty.nix
index 53580cb..55e9752 100644
--- a/modules/packages/kitty.nix
+++ b/modules/packages/kitty.nix
@@ -19,7 +19,7 @@
 
       shell_integration = "enabled";
       allow_remote_control = "yes";
-      confirm_os_window_close = -1;
+      confirm_os_window_close = 0;
 
       # Gruvbox Material Dark Hard
       background = "#1d2021";
diff --git a/modules/packages/nvf/_nvfConfig.nix b/modules/packages/nvf/_nvfConfig.nix
index f7b2c60..2a94619 100644
--- a/modules/packages/nvf/_nvfConfig.nix
+++ b/modules/packages/nvf/_nvfConfig.nix
@@ -73,6 +73,12 @@
         silent = true;
         action = ":noh<CR>";
       }
+      {
+        key = "<leader>e";
+        mode = "n";
+        action = ":Oil<CR>";
+        desc = "Open Oil File Explorer";
+      }
     ];
 
     lsp = {
@@ -118,6 +124,13 @@
       motion = {
         precognition.enable = true;
       };
+      oil-nvim = {
+        enable = true;
+        setupOpts = {
+          view_options.show_hidden = true;
+        };
+        gitStatus.enable = true;
+      };
     };
 
     visuals = {