add lockscreen - without color

home/programs/eww/src/powerpopup.yuck

@@ -9,7 +9,7 @@
     (label
       :text " ")
     (button
-      :onclick "close eww power; loginctl lock-session"
+      :onclick "close eww power; ./scripts/blur-lock.sh"
       :class "powermenu-button"
       (label
         :text ""))
@@ -23,7 +23,7 @@
     (label
       :text "")
     (button
-      :onclick "close eww power; loginctl terminate-user $USER"
+      :onclick "close eww power; ./scripts/logout.sh"
       :class "powermenu-button"
       (label
         :text ""))))

home/programs/eww/src/scripts/blur-lock.sh

@@ -0,0 +1 @@
+xsecurelock

home/programs/eww/src/scripts/logout.sh

@@ -0,0 +1 @@
+pkill -KILL xmonad

home/programs/neovim/default.nix

@@ -1,24 +1,26 @@
 { pkgs, config, ... }:
 
 let
+  deferred-clipboard-nvim = pkgs.vimUtils.buildVimPlugin {
+    name = "deferred-clipboard-nvim";
+    src = pkgs.fetchFromGitHub {
+      owner = "EtiamNullam";
+      repo = "deferred-clipboard.nvim";
+      rev = "f58d9a20fe5d5891c61773814a1f3051ce43c006";
+      hash = "sha256-HTk70Fb4n/F4nVkfxSKRsgrXnoFwMpSV276WvDt5uY0=";
+    };
+  };
   mkLuaConfig = file: args:
     builtins.readFile "${pkgs.substituteAll (args // { src = file; })}";
 in {
   home.sessionVariables = { EDITOR = "nvim"; };
 
-  home.packages = with pkgs; [
-    nerd-fonts.jetbrains-mono
-    texliveFull
-    clang-tools
-  ];
-
   programs.neovim = {
     enable = true;
     vimAlias = true;
     vimdiffAlias = true;
     withNodeJs = true;
     withPython3 = true;
-
     plugins = (with pkgs.vimPlugins; [
       bufferline-nvim
       catppuccin-nvim
@@ -59,6 +61,7 @@ in {
       telescope-nvim
       vimtex
       which-key-nvim
+
     ]) ++ [
       (pkgs.vimPlugins.nvim-treesitter.withPlugins
         (plugins: pkgs.tree-sitter.allGrammars))
@@ -103,6 +106,9 @@ in {
       shfmt
       # Scheme
       chez
+      nerd-fonts.jetbrains-mono
+      texliveFull
+      clang-tools
     ];
 
     extraLuaConfig = mkLuaConfig ./init.lua {

home/programs/neovim/default.nix.orig

@@ -1,126 +0,0 @@
-{ pkgs, config, ... }:
-
-let
-  mkLuaConfig = file: args:
-    builtins.readFile "${pkgs.substituteAll (args // { src = file; })}";
-in {
-  home.sessionVariables = { EDITOR = "nvim"; };
-
-  home.packages = with pkgs; [
-    nerd-fonts.jetbrains-mono
-    texliveFull
-    clang-tools
-<<<<<<< HEAD
-=======
-    vimPlugins.catppuccin-nvim
->>>>>>> test
-  ];
-
-  programs.neovim = {
-    enable = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-    withNodeJs = true;
-    withPython3 = true;
-
-    plugins = (with pkgs.vimPlugins; [
-      bufferline-nvim
-      catppuccin-nvim
-      cmp-buffer
-      cmp-conjure
-      cmp-nvim-lua
-      cmp-nvim-lsp
-      cmp-path
-      cmp_luasnip
-      conform-nvim
-      conjure
-      dropbar-nvim
-      friendly-snippets
-      lazy-nvim
-      lean-nvim
-      leap-nvim
-      lspkind-nvim
-      lualine-lsp-progress
-      lualine-nvim
-      luasnip
-      markdown-preview-nvim
-      neoconf-nvim
-      neodev-nvim
-      neoscroll-nvim
-      nvim-autopairs
-      nvim-cmp
-      nvim-lspconfig
-      nvim-surround
-      nvim-tree-lua
-      nvim-treesitter-textobjects
-      nvim-ts-context-commentstring
-      nvim-web-devicons
-      oil-nvim
-      plenary-nvim
-      rainbow-delimiters-nvim
-      telescope-fzf-native-nvim
-      telescope-nvim
-      vimtex
-      which-key-nvim
-    ]) ++ [
-      (pkgs.vimPlugins.nvim-treesitter.withPlugins
-        (plugins: pkgs.tree-sitter.allGrammars))
-    ];
-
-    extraPackages = with pkgs; [
-      ripgrep
-      fd
-      codespell
-      prettierd
-      # Lua
-      lua-language-server
-      stylua
-      # Haskell
-      haskell-language-server
-      ghc
-      stack
-      cabal-install
-      haskellPackages.fourmolu
-      # Lean
-      lean
-      # Python
-      ruff
-      pyright
-      isort
-      python311Packages.autopep8
-      # LaTeX
-      texlab
-      xdotool
-      pplatex
-      neovim-remote
-      # Nix
-      nixd
-<<<<<<< HEAD
-      nixfmt-classic
-=======
-      nixfmt-rfc-style
->>>>>>> test
-      # Rust
-      rust-analyzer
-      # Bash
-      nodePackages.bash-language-server
-      shellcheck
-      shellharden
-      # sh
-      shfmt
-      # Scheme
-      chez
-    ];
-
-    extraLuaConfig = mkLuaConfig ./init.lua {
-      path = "${pkgs.vimUtils.packDir
-        config.programs.neovim.finalPackage.passthru.packpathDirs}";
-    };
-  };
-
-  xdg.configFile."nvim/lua" = {
-    recursive = true;
-    source = ./lua;
-  };
-}
-

home/programs/neovim/init.lua

@@ -14,6 +14,7 @@ require("lazy").setup({
     path = "@path@/pack/myNeovimPackages/start",
     patterns = {
       "folke",
+      "catppuccin",
       "geodimm",
       "Julian",
       "hrsh7th",

home/programs/neovim/lua/config/options.lua

@@ -1,5 +1,6 @@
 local opt = vim.opt
 
+opt.clipboard = "unnamedplus"
 opt.cursorline = true -- Enable highlighting of the current line
 opt.expandtab = true -- Use spaces instead of tabs
 opt.list = true -- Show some invisible characters (tabs...

home/programs/neovim/lua/plugins/catppuccin-nvim.lua

@@ -1,8 +1,7 @@
 return {
   {
     "catppuccin/nvim",
-    lazy = false,
-    name = "catppuccin",
+    name = "catppuccin-nvim",
     priority = 1000,
     config = function()
       require("catppuccin").setup()

home/programs/neovim/lua/plugins/conform-nvim.lua.orig

@@ -1,66 +0,0 @@
-return {
-  {
-    "stevearc/conform.nvim",
-    event = { "BufWritePre" },
-    cmd = "ConformInfo",
-    keys = {
-      {
-        "<leader>cF",
-        function()
-          require("conform").format({ formatters = { "injected" } })
-        end,
-        mode = { "n", "v" },
-        desc = "Format Injected Langs",
-      },
-    },
-    config = function()
-      require("conform").setup({
-        format_on_save = {
-          -- These options will be passed to conform.format()
-          timeout_ms = 500,
-          lsp_fallback = true,
-        },
-        formatters_by_ft = {
-          lua = { "stylua" },
-          python = { "isort", "autopep8" },
-          haskell = { "fourmolu" },
-          bash = { "shellcheck", "shellharden" },
-          sh = { "shfmt" },
-          markdown = { "prettierd" },
-          json = { "prettierd" },
-          yaml = { "prettierd" },
-<<<<<<< HEAD
-          nix = { "nixfmt-classic" },
-=======
-          nix = { "nixfmt-rfc-style" },
->>>>>>> test
-          tex = { "latexindent" },
-          c = { "clang_format" },
-          cpp = { "clang_format" },
-          ["*"] = { "codespell" },
-          ["_"] = { "trim_whitespace" },
-        },
-        formatters = {
-          stylua = {
-            inherit = true,
-            prepend_args = { "--indent-type", "Spaces", "--indent-width", "2" },
-          },
-          codespell = {
-            inherit = true,
-            prepend_args = { "-L", "launch" },
-          },
-          latexindent = {
-            inherit = true,
-            prepend_args = { "-y=\"defaultIndent:'  '\"" },
-          },
-          clang_format = {
-            prepend_args = {
-              "--style=file:./.clang-format",
-              "--fallback-style=LLVM",
-            },
-          },
-        },
-      })
-    end,
-  },
-}

home/programs/neovim/lua/plugins/nvim-treesitter.lua

@@ -16,6 +16,7 @@ return {
     end,
     dependencies = {
       "HiPhish/rainbow-delimiters",
+      name = "rainbow-delimiters.nvim",
       config = function()
         -- This module contains a number of default definitions
         local rainbow_delimiters = require("rainbow-delimiters")

home/programs/neovim/lua/plugins/nvim-ts-context-commentstring.lua

@@ -4,6 +4,7 @@ return {
     dependencies = {
       {
         "numToStr/Comment.nvim",
+        name = "comment.nvim",
         lazy = false,
         config = function()
           require("Comment").setup({
@@ -17,4 +18,3 @@ return {
     },
   },
 }
-