diff --git a/flake.nix b/flake.nix index 955dad7..c027e10 100644 --- a/flake.nix +++ b/flake.nix @@ -126,22 +126,7 @@ }) ]; - lucca = mkSystem "lucca" "none" [ - ({pkgs, ...}: { - imports = [ - inputs.nixos-wsl.nixosModules.wsl - ]; - wsl.enable = true; - wsl.defaultUser = "zoriya"; - environment.systemPackages = with pkgs; [ - wslu - wsl-open - ]; - - # Disable it for wls - environment.persistence."/nix/persist".enable = false; - }) - ]; + lucca = mkSystem "lucca" "wsl" []; }; }; } diff --git a/modules/misc/home.nix b/modules/misc/home.nix index f4d5bfe..8610d41 100644 --- a/modules/misc/home.nix +++ b/modules/misc/home.nix @@ -64,6 +64,9 @@ bind-key -r f run-shell "tmux neww tmux-sessionizer" bind-key -r C-h run-shell "tmux-sessionizer ~/projects/kyoo" bind-key -r C-s run-shell "tmux-sessionizer ~/projects/flake" + bind-key -r C-n run-shell "tmux-sessionizer ~/projects/blog" + bind-key -r C-g run-shell "tmux-sessionizer ~/work/pagga" + bind-key -r C-c run-shell "tmux-sessionizer ~/work/Pay.Monitor" run-shell ${pkgs.tmuxPlugins.sensible.rtp} run-shell ${pkgs.tmuxPlugins.fzf-tmux-url.rtp} diff --git a/modules/misc/nvim/lua/settings.lua b/modules/misc/nvim/lua/settings.lua index 0169ccd..aacd680 100644 --- a/modules/misc/nvim/lua/settings.lua +++ b/modules/misc/nvim/lua/settings.lua @@ -111,17 +111,4 @@ if vim.call("has", "wsl") == 1 then -- Lumen takes 170ms on windows and I only use the windows laptop at work, with light mode. vim.g.lumen_startup_overwrite = 0 vim.opt.background="light" - - vim.g.clipboard = { - name = 'WslClipboard', - copy = { - ['+'] = 'clip.exe', - ['*'] = 'clip.exe', - }, - paste = { - ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', - }, - cache_enabled = 0, - } end diff --git a/modules/wsl/default.nix b/modules/wsl/default.nix new file mode 100644 index 0000000..da822de --- /dev/null +++ b/modules/wsl/default.nix @@ -0,0 +1,19 @@ +{ + pkgs, + inputs, + ... +}: { + imports = [ + inputs.nixos-wsl.nixosModules.wsl + ]; + + wsl.enable = true; + wsl.defaultUser = "zoriya"; + environment.systemPackages = with pkgs; [ + wslu + wsl-open + ]; + + # Disable it for wls + environment.persistence."/nix/persist".enable = false; +} diff --git a/modules/wsl/home.nix b/modules/wsl/home.nix new file mode 100644 index 0000000..2ebb1cc --- /dev/null +++ b/modules/wsl/home.nix @@ -0,0 +1,10 @@ +{lib, ...}: { + imports = [ + # Install apps that I open with wslg (and tools like wl-clipboard which works) + ../common/apps.nix + ]; + + gtk.enable = lib.mkForce false; + services.xsettingsd.enable = lib.mkForce false; + qt.enable = lib.mkForce false; +}