various changes

config/nvim/ftplugin/go.lua

@@ -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

config/nvim/lua/blankline-conf.lua

@@ -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,
-}

config/nvim/lua/init.lua

@@ -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")

config/nvim/lua/leap-conf.lua

@@ -1,5 +0,0 @@
-local leap = require('leap')
-leap.set_default_keymaps()
-leap.init_highlight(true)
-vim.cmd([[ hi LeapLabelPrimary ctermbg=251 ctermfg=0 ]])
-

config/nvim/lua/nvim-conf.lua

@@ -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 = "<F2>"
-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", "<esc>l")
-remap("v", "wq", "<esc>l")
-remap("n","gr", "gT")
-remap("i", "{<CR>", "{<CR>}<Esc>O")
-remap("i", "(<CR>", "(<CR>)<Esc>O")
-remap("n", "<C-L>", "<Cmd>nohlsearch<Bar>diffupdate<CR><C-L>")
-remap("n","n", "nzz")
-remap("n", "N", "Nzz")
-remap("n", "Y", "y$")
-remap("n","[<space>", ":<c-u>put!=repeat([''],v:count)<bar>']+1<cr>")
-remap("n","]<space>", ":<c-u>put =repeat([''],v:count)<bar>'[-1<cr><Esc>")
-
--- 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", {}),
-})
-

config/nvim/lua/nvim-treesitter-conf.lua

@@ -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 = '<CR>',
-            scope_incremental = '<CR>',
-            node_incremental = '<TAB>',
-            node_decremental = '<S-TAB>',
-        },
-    },
-}

config/nvim/lua/plugins-conf.lua

@@ -1,2 +0,0 @@
--- telescope
-----------------------------------------

config/nvim/lua/telescope-conf.lua

@@ -1,44 +0,0 @@
-local telescope = require("telescope.builtin")
-vim.keymap.set("n", "<leader>fb", telescope.buffers, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader>ff", telescope.find_files, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader>fg", telescope.git_files, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader>fv", telescope.command_history, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader><leader>", telescope.live_grep, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader>8", telescope.grep_string, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader>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 = {
-                ["<esc>"] = require("telescope.actions").close,
-                ["<C-k>"] = require("telescope.actions").move_selection_previous,
-                ["<C-j>"] = 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' }
-        },
-    }
-})

config/nvim/lua/toggleterm-conf.lua

@@ -1,5 +0,0 @@
-require("toggleterm").setup{
-    open_mapping = [[<leader>t]],
-    shade_terminals = true,
-    size = vim.o.lines * 0.4
-}

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": {

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 {

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";

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
     ];
   };
 }

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
     ];
   };
 }

modules/programs/2fa/default.nix

@@ -27,6 +27,6 @@
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
-    pinentryFlavor = "curses";
+    pinentryFlavor = "tty";
   };
 }

modules/programs/default.nix

@@ -1,8 +1,10 @@
 [
   ./dev.nix
   ./alacritty
-  #./nvim
+  ./nvim
   ./shell
   ./git
   ./2fa
+  ./direnv
+  ./xdg
 ]

modules/programs/dev.nix

@@ -6,5 +6,10 @@
     k9s
     kubectl
     python3
+    p7zip
+    nodejs
+    nodePackages.pnpm
+    gnumake
+    gcc
   ];
 }

modules/programs/direnv/default.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  programs.direnv = {
+    enable = true;
+    enableBashIntegration = true;
+    nix-direnv.enable = true;
+  };
+}

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
   ];
-    };
-  }
+}

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"

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;";
+    };
+  };
+}

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";

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";
 }

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;