diff --git a/home/alt.nix b/home/alt.nix index 0225f44..01bd239 100644 --- a/home/alt.nix +++ b/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 = { diff --git a/home/cli-office/default.nix b/home/cli-office/default.nix index 9100fe2..b3bdd2d 100644 --- a/home/cli-office/default.nix +++ b/home/cli-office/default.nix @@ -7,8 +7,10 @@ ]; home.packages = with pkgs; [ + bat castget ghostscript + glow hunspell hunspellDicts.de_DE hunspellDicts.en_US diff --git a/home/foot.nix b/home/foot.nix index d8fc8ef..a0fadb4 100644 --- a/home/foot.nix +++ b/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"; diff --git a/home/gpg.nix b/home/gpg.nix index 330bd85..15fdc98 100644 --- a/home/gpg.nix +++ b/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; diff --git a/home/mail/default.nix b/home/mail/default.nix index a623ced..462f7df 100644 --- a/home/mail/default.nix +++ b/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 = '' - return { - "woof-vim", - name = "woof-vim", - dev = { - path = "~/devel" - } - } - ''; + xdg.configFile."nvim/bundle/woof-vim" = { + source = config.lib.file.mkOutOfStoreSymlink "/home/till/devel/woof-vim"; + recursive = true; + }; } diff --git a/home/nvim/config.vim b/home/nvim/config.vim index e1dbf9c..3d93a6e 100644 --- a/home/nvim/config.vim +++ b/home/nvim/config.vim @@ -41,7 +41,6 @@ nnoremap l nnoremap :hide nnoremap m :make -nnoremap M :!home-manager switch tnoremap diff --git a/home/nvim/ftplugin/nix.vim b/home/nvim/ftplugin/nix.vim new file mode 100644 index 0000000..3d77fc5 --- /dev/null +++ b/home/nvim/ftplugin/nix.vim @@ -0,0 +1 @@ +setlocal makeprg=sudo\ nixos-rebuild\ switch diff --git a/home/slim-desktop.nix b/home/slim-desktop.nix index 1da6a7b..e4299fa 100644 --- a/home/slim-desktop.nix +++ b/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; diff --git a/home/user-dirs.nix b/home/user-dirs.nix new file mode 100644 index 0000000..4a04c28 --- /dev/null +++ b/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"; + }; + +} diff --git a/system/default.nix b/system/default.nix index 820d30f..688001f 100644 --- a/system/default.nix +++ b/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 diff --git a/system/desktop/default.nix b/system/desktop/default.nix index ba5d089..26f54a5 100644 --- a/system/desktop/default.nix +++ b/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