From a75991ba5298ac91ee84101e4fb83a21f375291c Mon Sep 17 00:00:00 2001 From: 4Lost Date: Sun, 4 May 2025 01:00:59 +0200 Subject: [PATCH] add lockscreen - without color --- configuration.nix | 68 +++++----- home/programs/eww/src/powerpopup.yuck | 4 +- home/programs/eww/src/scripts/blur-lock.sh | 1 + home/programs/eww/src/scripts/logout.sh | 1 + home/programs/neovim/default.nix | 20 ++- home/programs/neovim/default.nix.orig | 126 ------------------ home/programs/neovim/init.lua | 1 + home/programs/neovim/lua/config/options.lua | 1 + .../neovim/lua/plugins/catppuccin-nvim.lua | 3 +- .../neovim/lua/plugins/conform-nvim.lua.orig | 66 --------- .../neovim/lua/plugins/nvim-treesitter.lua | 1 + .../plugins/nvim-ts-context-commentstring.lua | 2 +- 12 files changed, 54 insertions(+), 240 deletions(-) create mode 100755 home/programs/eww/src/scripts/blur-lock.sh create mode 100755 home/programs/eww/src/scripts/logout.sh delete mode 100644 home/programs/neovim/default.nix.orig delete mode 100644 home/programs/neovim/lua/plugins/conform-nvim.lua.orig diff --git a/configuration.nix b/configuration.nix index 66a9d7b..a25dd3b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,13 +1,6 @@ { pkgs, ... }: -{ - # Flutter - programs = { adb.enable = true; }; - - # SSH - programs.ssh.startAgent = true; - - system.userActivationScripts = { +{ system.userActivationScripts = { stdio = { text = '' rm -f ~/Android/Sdk/platform-tools/adb @@ -52,7 +45,6 @@ # Activate Flakes. nix.settings.experimental-features = [ "nix-command" "flakes" ]; - services = { # Set XServer Options. displayManager = { @@ -98,6 +90,8 @@ # Setting the Basic Packages. environment.systemPackages = with pkgs; [ (libsForQt5.callPackage ./home/themes/catppuccin-sddm.nix { }) + xsecurelock + xss-lock # flutter android-studio clang @@ -124,8 +118,8 @@ acpilight # For setting Backlight. dbus - pulseaudioFull - pulseaudio-ctl + # pulseaudioFull + # pulseaudio-ctl libnotify @@ -137,10 +131,6 @@ lxqt.lxqt-policykit # provides a default authentication client for policykit ]; - # Adding Features to Dolphin. - services.gvfs.enable = true; - services.udisks2.enable = true; - environment.sessionVariables = { XDG_CACHE_HOME = "$HOME/.cache"; XDG_CONFIG_HOME = "$HOME/.config"; @@ -148,21 +138,6 @@ XDG_STATE_HOME = "$HOME/.local/state"; }; - # Setting the permissions for acpilight. - services.udev = { - enable = true; - extraRules = '' - SUBSYSTEM=="backlight", ACTION=="add", \ - RUN+="${pkgs.coreutils-full}/bin/chgrp video /sys/class/backlight/%k/brightness", \ - RUN+="${pkgs.coreutils-full}/bin/chmod g+w /sys/class/backlight/%k/brightness" - ''; - }; - - nixpkgs.config = { - allowUnfree = true; - permittedInsecurePackages = [ "electron-32.3.3" ]; - }; - # Virtualbox boot.kernelParams = [ "kvm.enable_virt_at_load=0" ]; boot.kernelModules = ["kvm-amd"]; @@ -174,17 +149,38 @@ virtualisation.virtualbox.host.enableKvm = true; virtualisation.virtualbox.host.addNetworkInterface = false; - # Enable zsh for setting it as shell for users. - programs.zsh.enable = true; + programs = { + # Flutter + adb.enable = true; + ssh.startAgent = true; + zsh.enable = true; + }; # Enabling the Keyring. - services.gnome.gnome-keyring.enable = true; security.pam.services.lightdm.enableGnomeKeyring = true; - - # Disable powerbutton => for use with eww - services.logind.extraConfig = ''HandlePowerKey=ignore''; + services = { + gnome.gnome-keyring.enable = true; + # Disable powerbutton => for use with eww + logind.extraConfig = ''HandlePowerKey=ignore''; + # Setting the permissions for acpilight. + udev = { + enable = true; + extraRules = '' + SUBSYSTEM=="backlight", ACTION=="add", \ + RUN+="${pkgs.coreutils-full}/bin/chgrp video /sys/class/backlight/%k/brightness", \ + RUN+="${pkgs.coreutils-full}/bin/chmod g+w /sys/class/backlight/%k/brightness" + ''; + }; + # Adding Features to Dolphin. + gvfs.enable = true; + udisks2.enable = true; + }; # Set stateVersion. Leave it as set. + nixpkgs.config = { + allowUnfree = true; + permittedInsecurePackages = [ "electron-32.3.3" ]; + }; system.stateVersion = "23.11"; } diff --git a/home/programs/eww/src/powerpopup.yuck b/home/programs/eww/src/powerpopup.yuck index 83c99dd..7678f1b 100644 --- a/home/programs/eww/src/powerpopup.yuck +++ b/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 "")))) diff --git a/home/programs/eww/src/scripts/blur-lock.sh b/home/programs/eww/src/scripts/blur-lock.sh new file mode 100755 index 0000000..fb89e9b --- /dev/null +++ b/home/programs/eww/src/scripts/blur-lock.sh @@ -0,0 +1 @@ +xsecurelock diff --git a/home/programs/eww/src/scripts/logout.sh b/home/programs/eww/src/scripts/logout.sh new file mode 100755 index 0000000..8e443d2 --- /dev/null +++ b/home/programs/eww/src/scripts/logout.sh @@ -0,0 +1 @@ +pkill -KILL xmonad diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix index c3ccf4b..5fad233 100644 --- a/home/programs/neovim/default.nix +++ b/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 { diff --git a/home/programs/neovim/default.nix.orig b/home/programs/neovim/default.nix.orig deleted file mode 100644 index 397e22d..0000000 --- a/home/programs/neovim/default.nix.orig +++ /dev/null @@ -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; - }; -} - diff --git a/home/programs/neovim/init.lua b/home/programs/neovim/init.lua index 1435c5e..7feeb78 100644 --- a/home/programs/neovim/init.lua +++ b/home/programs/neovim/init.lua @@ -14,6 +14,7 @@ require("lazy").setup({ path = "@path@/pack/myNeovimPackages/start", patterns = { "folke", + "catppuccin", "geodimm", "Julian", "hrsh7th", diff --git a/home/programs/neovim/lua/config/options.lua b/home/programs/neovim/lua/config/options.lua index 8be5665..50f7dc1 100644 --- a/home/programs/neovim/lua/config/options.lua +++ b/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... diff --git a/home/programs/neovim/lua/plugins/catppuccin-nvim.lua b/home/programs/neovim/lua/plugins/catppuccin-nvim.lua index 42938c4..ab81cf3 100644 --- a/home/programs/neovim/lua/plugins/catppuccin-nvim.lua +++ b/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() diff --git a/home/programs/neovim/lua/plugins/conform-nvim.lua.orig b/home/programs/neovim/lua/plugins/conform-nvim.lua.orig deleted file mode 100644 index fafaca2..0000000 --- a/home/programs/neovim/lua/plugins/conform-nvim.lua.orig +++ /dev/null @@ -1,66 +0,0 @@ -return { - { - "stevearc/conform.nvim", - event = { "BufWritePre" }, - cmd = "ConformInfo", - keys = { - { - "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, - }, -} diff --git a/home/programs/neovim/lua/plugins/nvim-treesitter.lua b/home/programs/neovim/lua/plugins/nvim-treesitter.lua index af5e17a..ed78e4a 100644 --- a/home/programs/neovim/lua/plugins/nvim-treesitter.lua +++ b/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") diff --git a/home/programs/neovim/lua/plugins/nvim-ts-context-commentstring.lua b/home/programs/neovim/lua/plugins/nvim-ts-context-commentstring.lua index 67a74bc..5372017 100644 --- a/home/programs/neovim/lua/plugins/nvim-ts-context-commentstring.lua +++ b/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 { }, }, } -