Refactor: ..., also: Added vim-lastplace and tmate

users/kat/base.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 {
-  home-manager.users.kat = { imports = [ ../home/base ]; };
+  home-manager.users.kat = { imports = [ ./base ]; };
 
   users.users.kat = {
     uid = 1000;

users/kat/base/packages.nix

@@ -2,6 +2,7 @@
 
 {
   home.packages = with pkgs; [
+    tmate
     htop
     fd
     sd

users/kat/base/vim/default.nix

@@ -23,6 +23,7 @@
       vim-startify
       vim-airline
       vim-airline-themes
+      vim-lastplace
       base16-vim
     ];
     #extraPackages = with pkgs;

users/kat/base/vim/vimrc.nix

@@ -22,6 +22,9 @@
     let g:notmuch_search_date_format='%Y/%m/%d  %H:%M'
     let g:notmuch_html_converter='${pkgs.elinks}/bin/elinks --dump'
 
+    " lastplace 
+    let g:lastplace_ignore = "gitcommit,gitrebase,svn,hgcommit"
+
     autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
         \ quit | endif
     autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 |
@@ -52,18 +55,6 @@
     set relativenumber
     set completeopt=longest,menuone
     
-    function! ResCur()
-      if line("'\"") <= line("$")
-        normal! g`"
-        return 1
-      endif
-    endfunction
-
-    augroup resCur
-      autocmd!
-      autocmd BufWinEnter * call ResCur()
-    augroup END
-
   inoremap <silent><expr> <TAB>
         \ pumvisible() ? "\<C-n>" :
         \ <SID>check_back_space() ? "\<TAB>" :

users/kat/default.nix

@@ -1,10 +1,10 @@
 rec {
-  base = ./nixos/base.nix;
-  gui = ./nixos/gui.nix;
-  sway = ./nixos/sway.nix;
-  dev = ./nixos/dev.nix;
-  media = ./nixos/media.nix;
-  personal = ./nixos/personal.nix;
+  base = ./base.nix;
+  gui = ./gui.nix;
+  sway = ./sway.nix;
+  dev = ./dev.nix;
+  media = ./media.nix;
+  personal = ./personal.nix;
 
   server = { imports = [ personal ]; };
   guiFull = { imports = [ gui sway dev media personal ]; };

users/kat/dev.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  home-manager.users.kat = { imports = [ ./dev ]; };
+}

users/kat/gui.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  home-manager.users.kat = { imports = [ ./gui ]; };
+}

users/kat/gui/weechat.nix

@@ -1,11 +1,6 @@
 { config, pkgs, lib, superConfig, ... }:
 
 {
-  home.file = {
-    ".local/share/weechat/sec.conf" = lib.mkIf config.deploy.profile.private {
-      source = ../../../../private/files/weechat/sec.conf;
-    };
-  };
   programs.weechat = {
     enable = true;
     config = {

users/kat/home/default.nix

@@ -1,5 +0,0 @@
-rec {
-  base = ./base;
-  sway = ./sway;
-  gui = ./gui;
-}

users/kat/home/personal/bitw.nix

@@ -1,10 +0,0 @@
-{ config, ... }:
-
-{
-  xdg.configFile."rbw/config.json".text = builtins.toJSON {
-    email = "kat@kittywit.ch";
-    base_url = "https://vault.kittywit.ch";
-    identity_url = null;
-    lock_timeout = 3600;
-  };
-}

users/kat/home/personal/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  imports = [ ./secrets.nix ./bitw.nix ./gpg.nix ./packages.nix ];
-}

users/kat/media.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  home-manager.users.kat = { imports = [ ./media ]; };
+}

users/kat/nixos/dev.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  home-manager.users.kat = { imports = [ ../home/dev ]; };
-}

users/kat/nixos/gui.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  home-manager.users.kat = { imports = [ ../home/gui ]; };
-}

users/kat/nixos/media.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  home-manager.users.kat = { imports = [ ../home/media ]; };
-}

users/kat/nixos/personal.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  home-manager.users.kat = { imports = [ ../home/personal ]; };
-}

users/kat/nixos/sway.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  home-manager.users.kat = { imports = [ ../home/sway ]; };
-}

users/kat/personal.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  home-manager.users.kat = { imports = [ ./personal ]; };
+}

users/kat/personal/default.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  imports = [ ./secrets.nix ./gpg.nix ./packages.nix ];
+}

users/kat/sway.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  home-manager.users.kat = { imports = [ ./sway ]; };
+}