working

home/alt.nix

@@ -1,17 +1,6 @@
 { config, pkgs, inputs, lib, ... }:
 
 {
-  xdg.userDirs = {
-    enable = true;
-    createDirectories = true;
-    download = "${config.home.homeDirectory}/tmp";
-    music = "${config.home.homeDirectory}/media/music";
-    pictures = "${config.home.homeDirectory}/media/img";
-    videos = "${config.home.homeDirectory}/media/vid";
-    documents = "${config.home.homeDirectory}/misc";
-    templates = "${config.xdg.dataHome}/templates";
-  };
-
   home.packages = with pkgs; [
     fzf
     silver-searcher
@@ -25,6 +14,8 @@
   ];
 
   imports = [
+    ./minimal.nix
+
     ./gnome
     ./firefox.nix
     ./foot.nix
@@ -32,7 +23,7 @@
     ./vifm
     ./tmux
     ./nvim
-    ./minimal.nix
+    ./user-dirs.nix
   ];
 
   programs.nix-index = {

home/cli-office/default.nix

@@ -7,8 +7,10 @@
   ];
 
   home.packages = with pkgs; [
+    bat
     castget
     ghostscript
+    glow
     hunspell
     hunspellDicts.de_DE
     hunspellDicts.en_US

home/foot.nix

@@ -14,7 +14,7 @@
         font-italic = "Adwaita Mono:size=17:slant=italic";
         font-bold-italic = "Adwaita Mono:size=17:weight=boldslant=italic";
         initial-window-mode = "maximized";
-        # line-height = "20";
+        initial-color-theme = "dark";
       };
 
       mouse.hide-when-typing = "yes";

home/gpg.nix

@@ -1,14 +1,21 @@
 { config, pkgs, ... }:
 
 {
+
+  home.packages = with pkgs; [
+    pinentry-all
+  ];
+
   services.gpg-agent = {
     enable = true;
-    pinentry.package = pkgs.pinentry-gnome3;
+    # pinentry.package = pkgs.pinentry-gnome3;
+    pinentry.program = "pinentry-gnome3";
     enableSshSupport = true;
   };
 
   programs.gpg = {
-    homedir = "${config.xdg.dataHome}/gnupg";
+    enable = true;
+    # homedir = "${config.xdg.dataHome}/gnupg";
     settings = {
       no-emit-version = true;
       no-comments = true;

home/mail/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.msmtp = {
@@ -50,7 +50,7 @@
         msmtp.enable = true;
         neomutt = {
           enable = true;
-          sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
+          sendMailCommand = lib.getExe pkgs.msmtp;
           extraConfig = ''
             set mbox='+Archive'
             set my_junk='+Spamverdacht'
@@ -104,7 +104,7 @@
         };
         neomutt = {
           enable = true;
-          sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
+          sendMailCommand = lib.getExe pkgs.msmtp;
           extraConfig = ''
             set my_mbsync_acct='t9e'
             set mbox='+Archive'
@@ -153,7 +153,7 @@
         };
         neomutt = {
           enable = true;
-          sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
+          sendMailCommand = lib.getExe pkgs.msmtp;
           extraConfig = ''
             set my_mbsync_acct='ktiu'
 
@@ -198,7 +198,8 @@
         signature.showSignature = "append";
         neomutt = {
           enable = true;
-          sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
+          # sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
+          sendMailCommand = lib.getExe pkgs.msmtp;
           extraConfig = ''
             set my_mbsync_acct='ksh'
             set mbox='+Erledigt'
@@ -230,16 +231,16 @@
     };
   };
 
-    programs.neovim.plugins = with pkgs.vimPlugins; [ lazy-nvim ];
+  programs.neovim.plugins = with pkgs.vimPlugins; [
+    { 
+      plugin = vim-pathogen; 
+      config = "execute pathogen#infect()";
+    }
+  ];
 
-    xdg.configFile."nvim/lua/woof-vim.lua".text = ''
+  xdg.configFile."nvim/bundle/woof-vim" = {
-      return {
+    source = config.lib.file.mkOutOfStoreSymlink "/home/till/devel/woof-vim";
-        "woof-vim",
+    recursive = true;
-        name = "woof-vim",
+  };
-        dev = {
-          path = "~/devel"
-        }
-      }
-    '';
 
 }

home/nvim/config.vim

@@ -41,7 +41,6 @@ nnoremap <c-l> <c-w>l
 nnoremap <c-q> :hide<return>
 
 nnoremap <leader>m :make<return>
-nnoremap <leader>M :!home-manager switch<return>
 
 tnoremap <esc> <c-\><c-n>
 

home/nvim/ftplugin/nix.vim

@@ -0,0 +1 @@
+setlocal makeprg=sudo\ nixos-rebuild\ switch

home/slim-desktop.nix

@@ -10,6 +10,7 @@
     ./firefox.nix
     ./foot.nix
     ./mail
+    ./user-dirs.nix
   ];
 
   home.packages = with pkgs; [
@@ -25,19 +26,6 @@
     zathura
   ];
 
-  xdg.userDirs = {
-    enable = true;
-    createDirectories = true;
-    desktop = "${config.home.homeDirectory}/desktop";
-    documents = "${config.home.homeDirectory}/misc";
-    download = "${config.home.homeDirectory}/tmp";
-    music = "${config.home.homeDirectory}/media/music";
-    pictures = "${config.home.homeDirectory}/media/img";
-    publicShare = "${config.home.homeDirectory}/box";
-    templates = "${config.xdg.dataHome}/templates";
-    videos = "${config.home.homeDirectory}/media/vid";
-  };
-
   xdg.configFile."castget/castget.conf".source = ./castget/castget.conf;
 
   services.syncthing.enable = true;

home/user-dirs.nix

@@ -0,0 +1,17 @@
+{ config, ... }:
+
+{
+  xdg.userDirs = {
+    enable = true;
+    createDirectories = true;
+    desktop = "${config.home.homeDirectory}/desktop";
+    documents = "${config.home.homeDirectory}/misc";
+    download = "${config.home.homeDirectory}/tmp";
+    music = "${config.home.homeDirectory}/media/music";
+    pictures = "${config.home.homeDirectory}/media/img";
+    publicShare = "${config.home.homeDirectory}/box";
+    templates = "${config.xdg.dataHome}/templates";
+    videos = "${config.home.homeDirectory}/media/vid";
+  };
+
+}

system/default.nix

@@ -17,6 +17,12 @@
     optimise.automatic = true;
   };
 
+  environment.sessionVariables = {
+    XDG_CONFIG_HOME = "$HOME/.config";
+    XDG_CACHE_HOME = "$HOME/.cache";
+    XDG_DATA_HOME = "$HOME/.local/share";
+  };
+
   environment.systemPackages = with pkgs; [
     dig.dnsutils
     file

system/desktop/default.nix

@@ -26,14 +26,6 @@
     pulse.enable = true;
   };
 
-  # nixpkgs.config.allowUnfree = true;
-
-  environment.sessionVariables = {
-    XDG_CONFIG_HOME = "$HOME/.config";
-    XDG_CACHE_HOME = "$HOME/.cache";
-    XDG_DATA_HOME = "$HOME/.local/share";
-  };
-
   environment.systemPackages = with pkgs; [
     firefox
     libreoffice