From 6a2f63e71e2af2fbf1f35a78db2547546fcd6fda Mon Sep 17 00:00:00 2001 From: iofq Date: Sat, 22 Jul 2023 05:35:03 -0500 Subject: [PATCH] various changes --- config/nvim/ftplugin/go.lua | 5 -- config/nvim/lua/blankline-conf.lua | 6 -- config/nvim/lua/init.lua | 7 -- config/nvim/lua/leap-conf.lua | 5 -- config/nvim/lua/nvim-conf.lua | 90 ------------------------ config/nvim/lua/nvim-treesitter-conf.lua | 51 -------------- config/nvim/lua/plugins-conf.lua | 2 - config/nvim/lua/telescope-conf.lua | 44 ------------ config/nvim/lua/toggleterm-conf.lua | 5 -- flake.lock | 6 +- flake.nix | 2 +- home/common.nix | 3 +- home/default.nix | 3 +- home/t14/home.nix | 3 +- modules/programs/2fa/default.nix | 2 +- modules/programs/default.nix | 4 +- modules/programs/dev.nix | 5 ++ modules/programs/direnv/default.nix | 8 +++ modules/programs/nvim/default.nix | 46 ++---------- modules/programs/shell/default.nix | 1 + modules/programs/xdg/default.nix | 41 +++++++++++ modules/wayland/default.nix | 8 +-- nixos/configuration.nix | 8 ++- nixos/t14/configuration.nix | 14 ++-- 24 files changed, 90 insertions(+), 279 deletions(-) delete mode 100755 config/nvim/ftplugin/go.lua delete mode 100755 config/nvim/lua/blankline-conf.lua delete mode 100755 config/nvim/lua/init.lua delete mode 100755 config/nvim/lua/leap-conf.lua delete mode 100755 config/nvim/lua/nvim-conf.lua delete mode 100755 config/nvim/lua/nvim-treesitter-conf.lua delete mode 100755 config/nvim/lua/plugins-conf.lua delete mode 100755 config/nvim/lua/telescope-conf.lua delete mode 100755 config/nvim/lua/toggleterm-conf.lua create mode 100755 modules/programs/direnv/default.nix create mode 100755 modules/programs/xdg/default.nix diff --git a/config/nvim/ftplugin/go.lua b/config/nvim/ftplugin/go.lua deleted file mode 100755 index a5ab98c..0000000 --- a/config/nvim/ftplugin/go.lua +++ /dev/null @@ -1,5 +0,0 @@ -vim.g.go_def_mode='gopls' -vim.g.go_info_mode='gopls' -vim.g.go_doc_popup_window = 1 -vim.g.go_play_browser_command = 'librewolf %URL% &' -vim.g.go_doc_keywordprg_enabled = 1 diff --git a/config/nvim/lua/blankline-conf.lua b/config/nvim/lua/blankline-conf.lua deleted file mode 100755 index 17104f8..0000000 --- a/config/nvim/lua/blankline-conf.lua +++ /dev/null @@ -1,6 +0,0 @@ -vim.cmd([[ hi IndentBlanklineChar ctermfg=240 ]]) -vim.cmd([[ hi IndentBlanklineContextChar ctermfg=7 ]]) -require("indent_blankline").setup { - show_current_context = true, - show_current_context_start = true, -} diff --git a/config/nvim/lua/init.lua b/config/nvim/lua/init.lua deleted file mode 100755 index 1d016e3..0000000 --- a/config/nvim/lua/init.lua +++ /dev/null @@ -1,7 +0,0 @@ -require("blankline-conf") -require("leap-conf") -require("nvim-conf") -require("nvim-treesitter-conf") -require("plugins-conf") -require("telescope-conf") -require("toggleterm-conf") diff --git a/config/nvim/lua/leap-conf.lua b/config/nvim/lua/leap-conf.lua deleted file mode 100755 index ea1ec81..0000000 --- a/config/nvim/lua/leap-conf.lua +++ /dev/null @@ -1,5 +0,0 @@ -local leap = require('leap') -leap.set_default_keymaps() -leap.init_highlight(true) -vim.cmd([[ hi LeapLabelPrimary ctermbg=251 ctermfg=0 ]]) - diff --git a/config/nvim/lua/nvim-conf.lua b/config/nvim/lua/nvim-conf.lua deleted file mode 100755 index 684755a..0000000 --- a/config/nvim/lua/nvim-conf.lua +++ /dev/null @@ -1,90 +0,0 @@ --- vim settings ----------------------------------------- -vim.opt.autoindent = true -vim.opt.background = "light" -vim.opt.backspace = "indent,eol,start" -vim.opt.backup = false -- and auto backps, to instead use -vim.opt.breakindent = true -vim.opt.clipboard = "unnamedplus" -- use system clipboard -vim.opt.completeopt = "menuone" -vim.opt.cursorline = true -vim.opt.expandtab = true -- insert tabs as spaces -vim.opt.guicursor = "" -- fixes alacritty changing cursor -vim.opt.hidden = true -- dont save when switching buffers -vim.opt.hlsearch = true -vim.opt.ignorecase = true -- ignore case in searches -vim.opt.inccommand = "split" -- incremental live completion -vim.opt.incsearch = true -vim.opt.laststatus = 1 -vim.opt.list = true -vim.opt.listchars:append("trail:ยท") -vim.opt.mouse = "a" -vim.opt.nrformats:append("alpha") -- let Ctrl-a do letters as well -vim.opt.number = true -vim.opt.pastetoggle = "" -vim.opt.path:append("**") -- enable fuzzy :find ing -vim.opt.relativenumber = true -vim.opt.shadafile = "NONE" -- disable shada -vim.opt.shiftwidth = 0 -- >> shifts by tabstop -vim.opt.showmatch = true -- highlight matching brackets -vim.opt.signcolumn= "number" -vim.opt.smartcase = true -- unless capital query -vim.opt.smartindent = true -- indent according to lang -vim.opt.softtabstop = -1 -- backspace removes tabstop -vim.opt.splitbelow = true -vim.opt.splitright = true -vim.opt.swapfile = false -- disable swapfiles -vim.opt.tabstop = 4 -- 4 space tabs -vim.opt.undofile = true -- enable auto save of undos -vim.opt.updatetime = 250 -- decrease update time -vim.opt.virtualedit = "onemore" -vim.opt.wildmenu = true - -vim.g.netrw_banner = 0 -- disable annoying banner -vim.g.netrw_altv = 1 -- open splits to the right -vim.g.netrw_liststyle = 3 -- tree view -vim.g.fzf_layout = { window = { width = 0.9, height = 0.6 } } -vim.g.indent_blankline_use_treesitter = true - --- mappings ----------------------------------------- --- local func to set keybinds -local remap = function(type, key, value) - vim.api.nvim_set_keymap(type,key,value,{noremap = true, silent = true}); -end -remap("i", "wq", "l") -remap("v", "wq", "l") -remap("n","gr", "gT") -remap("i", "{", "{}O") -remap("i", "(", "()O") -remap("n", "", "nohlsearchdiffupdate") -remap("n","n", "nzz") -remap("n", "N", "Nzz") -remap("n", "Y", "y$") -remap("n","[", ":put!=repeat([''],v:count)']+1") -remap("n","]", ":put =repeat([''],v:count)'[-1") - --- autocmd ----------------------------------------- -local undopath = "~/.local/share/nvim/undo" -vim.api.nvim_create_autocmd("VimEnter", { - command = "silent !mkdir -p " .. undopath, - group = vim.api.nvim_create_augroup("Init", {}), -}) - -local toggle_rel_num = vim.api.nvim_create_augroup("ToggleRelNum", {}) -vim.api.nvim_create_autocmd("InsertEnter", { - command = "set norelativenumber", - group = toggle_rel_num, -}) -vim.api.nvim_create_autocmd("InsertLeave", { - command = "set relativenumber", - group = toggle_rel_num, -}) -vim.api.nvim_create_autocmd("TextYankPost", { - callback = function() - vim.highlight.on_yank({ higroup = "Visual" }) - end, - group = vim.api.nvim_create_augroup("YankHighlight", {}), -}) - diff --git a/config/nvim/lua/nvim-treesitter-conf.lua b/config/nvim/lua/nvim-treesitter-conf.lua deleted file mode 100755 index 1cd779a..0000000 --- a/config/nvim/lua/nvim-treesitter-conf.lua +++ /dev/null @@ -1,51 +0,0 @@ -require("nvim-treesitter.configs").setup { - ensure_installed = {}, - highlight = { - enable = true, - }, - indent = { - enable = true, - }, - textobjects = { - select = { - enable = true, - lookahead = true, - keymaps = { - ['ac'] = '@comment.outer', - ['ic'] = '@comment.inner', - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["aa"] = "@call.inner", - }, - }, - move = { - enable = true, - set_jumps = true, -- whether to set jumps in the jumplist - goto_next_start = { - [']]'] = '@function.outer', - [']m'] = '@class.outer', - }, - goto_next_end = { - [']['] = '@function.outer', - [']M'] = '@class.outer', - }, - goto_previous_start = { - ['[['] = '@function.outer', - ['[m'] = '@class.outer', - }, - goto_previous_end = { - ['[]'] = '@function.outer', - ['[M'] = '@class.outer', - }, - }, - }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = '', - scope_incremental = '', - node_incremental = '', - node_decremental = '', - }, - }, -} diff --git a/config/nvim/lua/plugins-conf.lua b/config/nvim/lua/plugins-conf.lua deleted file mode 100755 index 1d32eab..0000000 --- a/config/nvim/lua/plugins-conf.lua +++ /dev/null @@ -1,2 +0,0 @@ --- telescope ----------------------------------------- diff --git a/config/nvim/lua/telescope-conf.lua b/config/nvim/lua/telescope-conf.lua deleted file mode 100755 index 4fb06b5..0000000 --- a/config/nvim/lua/telescope-conf.lua +++ /dev/null @@ -1,44 +0,0 @@ -local telescope = require("telescope.builtin") -vim.keymap.set("n", "fb", telescope.buffers, {noremap = true, silent = true}) -vim.keymap.set("n", "ff", telescope.find_files, {noremap = true, silent = true}) -vim.keymap.set("n", "fg", telescope.git_files, {noremap = true, silent = true}) -vim.keymap.set("n", "fv", telescope.command_history, {noremap = true, silent = true}) -vim.keymap.set("n", "", telescope.live_grep, {noremap = true, silent = true}) -vim.keymap.set("n", "8", telescope.grep_string, {noremap = true, silent = true}) -vim.keymap.set("n", "fd", telescope.lsp_definitions, {noremap = true, silent = true}) --- fix highlighting -vim.cmd([[ hi telescopeselection ctermfg=242 ctermbg=252 ]]) - -require("telescope").setup({ - defaults = { - layout_strategy = "vertical", - layout_config = { width = .90, }, - vimgrep_arguments = { - "rg", - "--color=never", - "--no-heading", - "--hidden", - "--with-filename", - "--line-number", - "--column", - "--smart-case" - }, - mappings = { - i = { - [""] = require("telescope.actions").close, - [""] = require("telescope.actions").move_selection_previous, - [""] = require("telescope.actions").move_selection_next, - }, - }, - }, - pickers = { - find_files = { - hidden = true, - find_command = { 'rg', '--files', '--iglob', '!.git', '--hidden' } - }, - git_files = { - hidden = true, - find_command = { 'rg', '--files', '--iglob', '!.git', '--hidden' } - }, - } -}) diff --git a/config/nvim/lua/toggleterm-conf.lua b/config/nvim/lua/toggleterm-conf.lua deleted file mode 100755 index 0b066f9..0000000 --- a/config/nvim/lua/toggleterm-conf.lua +++ /dev/null @@ -1,5 +0,0 @@ -require("toggleterm").setup{ - open_mapping = [[t]], - shade_terminals = true, - size = vim.o.lines * 0.4 -} diff --git a/flake.lock b/flake.lock index f0d84d1..1f06c33 100755 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1683960683, - "narHash": "sha256-hCKwb272GS5uM2eHGs1O9EMZHQIdhh51yIKYPY7Mc/E=", + "lastModified": 1685092015, + "narHash": "sha256-l46igFN6SYT72XntGxfCUIV7IJX79l7wIOumuIwBcEc=", "owner": "iofq", "repo": "nvim.nix", - "rev": "bfc15eb6cb362845375e92df2298b0d776bbbbe1", + "rev": "482ec8e00a840bff4104cb031b13215fa12f2271", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2d9fc23..b559d55 100755 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, home-manager, nixos-hardware, ... } @inputs: + outputs = { self, nixpkgs, home-manager, nixos-hardware, nvim, ... } @inputs: let username = "e"; in { diff --git a/home/common.nix b/home/common.nix index 0500667..72603d3 100755 --- a/home/common.nix +++ b/home/common.nix @@ -1,6 +1,5 @@ { inputs, pkgs, ... }: { - imports = ( import ../modules/programs ); programs.home-manager.enable = true; nixpkgs.config.allowUnfree = true; nix = { @@ -24,7 +23,7 @@ spleen ]; }; - + imports = ( import ../modules/programs ); xdg.enable = true; fonts.fontconfig.enable = true; systemd.user.startServices = "sd-switch"; diff --git a/home/default.nix b/home/default.nix index 71b69d3..a5569a8 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,7 +6,7 @@ config.allowUnfree = true; overlays = [ (final: prev: { - inherit (inputs.nvim.packages.${final.system}) iofqvim; + inherit (inputs.nvim.packages.${final.system}) full; }) ]; }; @@ -19,6 +19,7 @@ }; modules = [ ./t14/home.nix + ./common.nix ]; }; } diff --git a/home/t14/home.nix b/home/t14/home.nix index 111e468..3ba02c9 100755 --- a/home/t14/home.nix +++ b/home/t14/home.nix @@ -3,7 +3,6 @@ imports = [ ../../modules/wayland ../../modules/librewolf - ../common.nix ]; home = { username = "e"; @@ -13,7 +12,7 @@ signal-desktop runelite framesh - iofqvim + prismlauncher ]; }; } diff --git a/modules/programs/2fa/default.nix b/modules/programs/2fa/default.nix index 4551bae..950d6e8 100755 --- a/modules/programs/2fa/default.nix +++ b/modules/programs/2fa/default.nix @@ -27,6 +27,6 @@ services.gpg-agent = { enable = true; enableSshSupport = true; - pinentryFlavor = "curses"; + pinentryFlavor = "tty"; }; } diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 893aed3..f7767d9 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -1,8 +1,10 @@ [ ./dev.nix ./alacritty - #./nvim + ./nvim ./shell ./git ./2fa + ./direnv + ./xdg ] diff --git a/modules/programs/dev.nix b/modules/programs/dev.nix index 97506f7..ed00fad 100644 --- a/modules/programs/dev.nix +++ b/modules/programs/dev.nix @@ -6,5 +6,10 @@ k9s kubectl python3 + p7zip + nodejs + nodePackages.pnpm + gnumake + gcc ]; } diff --git a/modules/programs/direnv/default.nix b/modules/programs/direnv/default.nix new file mode 100755 index 0000000..b2f008b --- /dev/null +++ b/modules/programs/direnv/default.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + programs.direnv = { + enable = true; + enableBashIntegration = true; + nix-direnv.enable = true; + }; +} diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 722d861..f744a2a 100755 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -1,44 +1,6 @@ { pkgs, ...}: { - xdg.configFile.nvim = { - source = ../../../config/nvim; - recursive = true; - }; - programs.neovim = { - enable = true; - defaultEditor = true; - vimAlias = true; - vimdiffAlias = true; - extraConfig = ":luafile ~/.config/nvim/lua/init.lua"; - - plugins = with pkgs.vimPlugins; [ - vim-commentary - vim-surround - toggleterm-nvim - targets-vim - indent-blankline-nvim - vim-go - vim-nix - (nvim-treesitter.withPlugins - ( - plugins: with plugins; [ - tree-sitter-bash - tree-sitter-c - tree-sitter-dockerfile - tree-sitter-go - tree-sitter-javascript - tree-sitter-json - tree-sitter-lua - tree-sitter-nix - tree-sitter-php - tree-sitter-python - tree-sitter-yaml - ] - ) - ) - nvim-treesitter-textobjects - leap-nvim - telescope-nvim - ]; - }; - } + home.packages = with pkgs; [ + full + ]; +} diff --git a/modules/programs/shell/default.nix b/modules/programs/shell/default.nix index 9256e6f..2467a2d 100755 --- a/modules/programs/shell/default.nix +++ b/modules/programs/shell/default.nix @@ -21,6 +21,7 @@ sus = "systemctl suspend"; hms = "home-manager switch --flake $NIX_FLAKE#${host.username}"; rbs = "sudo nixos-rebuild switch --flake $NIX_FLAKE#${host.hostName}"; + nvim-dev = "nix run ~/dev/nvim.nix"; }; shellOptions = [ "cmdhist" diff --git a/modules/programs/xdg/default.nix b/modules/programs/xdg/default.nix new file mode 100755 index 0000000..bee607b --- /dev/null +++ b/modules/programs/xdg/default.nix @@ -0,0 +1,41 @@ +{pkgs, ... }: +{ + home.packages = with pkgs; [ + xdg-utils + ]; + xdg.mimeApps = { + enable = true; + defaultApplications = { + "x-scheme-handler/http" = "io.gitlab.librewolf-community.desktop"; + "x-scheme-handler/https" = "io.gitlab.librewolf-community.desktop"; + "x-scheme-handler/chrome" = "io.gitlab.librewolf-community.desktop"; + "video/mp4" = "io.gitlab.librewolf-community.desktop"; + "video/mkv" = "io.gitlab.librewolf-community.desktop"; + "image/jpeg" = "io.gitlab.librewolf-community.desktop"; + "image/jpg" = "io.gitlab.librewolf-community.desktop"; + "image/png" = "io.gitlab.librewolf-community.desktop"; + "application/epub" = "io.gitlab.librewolf-community.desktop"; + "application/pdf" = "io.gitlab.librewolf-community.desktop"; + "application/x-extension-htm" = "io.gitlab.librewolf-community.desktop"; + "application/x-extension-html" = "io.gitlab.librewolf-community.desktop"; + "application/x-extension-shtml" = "io.gitlab.librewolf-community.desktop"; + "application/xhtml+xml" = "io.gitlab.librewolf-community.desktop"; + "application/x-extension-xhtml" = "io.gitlab.librewolf-community.desktop"; + "application/x-extension-xht" = "io.gitlab.librewolf-community.desktop"; + "x-scheme-handler/about" = "io.gitlab.librewolf-community.desktop"; + "x-scheme-handler/unknown" = "io.gitlab.librewolf-community.desktop"; + }; + associations.added = { + "x-scheme-handler/http" = "io.gitlab.librewolf-community.desktop"; + "x-scheme-handler/https" = "io.gitlab.librewolf-community.desktop"; + "x-scheme-handler/chrome" = "io.gitlab.librewolf-community.desktop"; + "text/html" = "io.gitlab.librewolf-community.desktop;"; + "application/x-extension-htm" = "io.gitlab.librewolf-community.desktop;"; + "application/x-extension-html" = "io.gitlab.librewolf-community.desktop;"; + "application/x-extension-shtml" = "io.gitlab.librewolf-community.desktop;"; + "application/xhtml+xml" = "io.gitlab.librewolf-community.desktop;"; + "application/x-extension-xhtml" = "io.gitlab.librewolf-community.desktop;"; + "application/x-extension-xht" = "io.gitlab.librewolf-community.desktop;"; + }; + }; +} diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix index 701bede..39e0930 100644 --- a/modules/wayland/default.nix +++ b/modules/wayland/default.nix @@ -202,7 +202,7 @@ ]; timeouts = [ { timeout = 600; command = "${pkgs.swaylock}/bin/swaylock";} - { timeout = 1200; command = "${pkgs.sway}/bin/swaymsg \"output * toggle\"";} + { timeout = 600; command = "${pkgs.sway}/bin/swaymsg \"output * toggle\"";} ]; }; services.kanshi = { @@ -218,7 +218,7 @@ dock = { outputs = [ { - criteria = "DP-4"; + criteria = "HDMI-A-1"; status = "enable"; mode = "1920x1080@60Hz"; position = "0,0"; @@ -229,11 +229,11 @@ outputs = [ { criteria = "eDP-1"; - status = "enable"; + status = "disable"; position = "0,1080"; } { - criteria = "DP-4"; + criteria = "HDMI-A-1"; status = "enable"; mode = "1920x1080@60Hz"; position = "0,0"; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d9288d0..c02e49e 100755 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -7,6 +7,12 @@ users.groups.plugdev = {}; # Create plugdev group + networking.hostName = host.hostName; + networking.firewall = { + enable = true; + allowedTCPPorts = []; + allowedUDPPorts = []; + }; users.users.${host.username} = { isNormalUser = true; extraGroups = [ @@ -25,7 +31,7 @@ dates = "00:00"; options = "--delete-older-than 14d"; }; - nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowUnfree = true; system.stateVersion = "22.11"; } diff --git a/nixos/t14/configuration.nix b/nixos/t14/configuration.nix index d172546..72ea369 100755 --- a/nixos/t14/configuration.nix +++ b/nixos/t14/configuration.nix @@ -5,22 +5,24 @@ ./hardware-configuration.nix ./nano.nix ]; - networking.hostName = host.hostName; - networking.firewall = { - enable = true; - allowedTCPPorts = []; - allowedUDPPorts = []; - } environment.systemPackages = with pkgs; [ cryptsetup ]; + virtualisation.podman = { + enable = true; + dockerCompat = true; + }; + programs.light.enable = true; services.pipewire = { enable = true; alsa.enable = true; pulse.enable = true; }; + programs.ssh = { + startAgent = true; + }; hardware.opengl.enable = true;