Zuviele Änderungen
This commit is contained in:
parent
525a0d6722
commit
e558bb6e67
|
@ -2,18 +2,31 @@
|
|||
let
|
||||
unstable = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
|
||||
in {
|
||||
|
||||
imports = [
|
||||
../../snippets/everywhere.nix
|
||||
../../snippets/my-systems.nix
|
||||
../../snippets/graphical.nix
|
||||
../../snippets/latex.nix
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
# config
|
||||
gnome3.gnome_session
|
||||
gnome3.gnome-dictionary
|
||||
|
||||
programs = {
|
||||
firefox = {
|
||||
enable = true;
|
||||
package = unstable.firefox;
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
udiskie = {
|
||||
enable = true;
|
||||
notify = true;
|
||||
tray = "auto";
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# web
|
||||
unstable.firefox
|
||||
chromium
|
||||
|
||||
# tools & office
|
||||
|
@ -26,13 +39,11 @@ in {
|
|||
handbrake
|
||||
octave
|
||||
|
||||
#dev
|
||||
# dev
|
||||
rustup
|
||||
gnome3.glade
|
||||
|
||||
# look & feel
|
||||
arc-theme
|
||||
arc-icon-theme
|
||||
libertine
|
||||
nerdfonts
|
||||
|
||||
|
|
|
@ -7,8 +7,16 @@ in {
|
|||
let
|
||||
sort-mail-script = pkgs.writeShellScriptBin "sort-mail" ''
|
||||
${unstable.isync}/bin/mbsync -a
|
||||
|
||||
mv $HOME/data/aktuell/it/mail/.Move.kiva/cur/* $HOME/data/aktuell/it/mail-accounts/fb4/INBOX/new/
|
||||
mv $HOME/data/aktuell/it/mail/.Move.Auslandskoordination/cur/* $HOME/data/aktuell/it/mail-accounts/auslandskoordination/Malte/bearbeiten/new/
|
||||
|
||||
mv $HOME/data/aktuell/it/mail-accounts/fb4/Move/privat/cur/* $HOME/data/aktuell/it/mail/new/
|
||||
mv $HOME/data/aktuell/it/mail-accounts/fb4/Move/Auslandskoordination/cur/* $HOME/data/aktuell/it/mail-accounts/auslandskoordination/Malte/bearbeiten/new/
|
||||
|
||||
mv $HOME/data/aktuell/it/mail-accounts/auslandskoordination/Malte/privat/cur/* $HOME/data/aktuell/it/mail/new/
|
||||
mv $HOME/data/aktuell/it/mail-accounts/auslandskoordination/Malte/kiva/cur/* $HOME/data/aktuell/it/mail-accounts/fb4/INBOX/new/
|
||||
|
||||
${unstable.isync}/bin/mbsync -a
|
||||
'';
|
||||
in {
|
||||
|
|
|
@ -3,15 +3,15 @@
|
|||
imports = [
|
||||
../../snippets/everywhere.nix
|
||||
../../snippets/graphical.nix
|
||||
../../snippets/latex.nix
|
||||
# ./syncthing.nix
|
||||
# ./nix-gc.nix
|
||||
# ./nix-update-channel.nix
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
xautolock
|
||||
syncthing
|
||||
];
|
||||
|
||||
systemd.user.systemctlPath = "/usr/bin/systemctl";
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
tray = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
rcm
|
||||
tmux
|
||||
tig
|
||||
exa
|
||||
|
||||
neovim
|
||||
taskwarrior
|
||||
|
@ -32,4 +33,80 @@
|
|||
pythonPackages.qrcode
|
||||
ranger
|
||||
];
|
||||
programs = {
|
||||
git = {
|
||||
enable = true;
|
||||
ignores = [
|
||||
".syncthing*.tmp"
|
||||
"*.swp"
|
||||
"*.autosave~"
|
||||
"*.aux"
|
||||
"*.bbl"
|
||||
"*.fls"
|
||||
"*.idx"
|
||||
"*.ilg"
|
||||
"*.ind"
|
||||
"*.log"
|
||||
"*.out"
|
||||
"*.toc"
|
||||
"*.bcf"
|
||||
"*.blg"
|
||||
"*.fdb*"
|
||||
"*.thm"
|
||||
"*.run.xml"
|
||||
"*.slnc"
|
||||
"*.glade~"
|
||||
"__pycache__"
|
||||
".hledger-web_client_session_key.aes"
|
||||
".nix-gc-roots"
|
||||
];
|
||||
signing = {
|
||||
signByDefault = true;
|
||||
};
|
||||
userEmail = "malte.brandy@maralorn.de";
|
||||
userName = "Malte Brandy";
|
||||
};
|
||||
htop.enable = true;
|
||||
neovim = {
|
||||
enable = true;
|
||||
configure = {
|
||||
};
|
||||
};
|
||||
rofi = {
|
||||
enable = true;
|
||||
};
|
||||
ssh = {
|
||||
controlPath = true;
|
||||
enable = true;
|
||||
matchBlocks = let
|
||||
matheGwProxy = "ssh -q gw nc -q0 %h %p";
|
||||
kivaHost = "fb04386.mathematik.tu-darmstadt.de";
|
||||
agHost = "fb04217.mathematik.tu-darmstadt.de";
|
||||
in [
|
||||
{ host = "charon"; hostname = "charon.olymp.space"; }
|
||||
{ host = "*.olymp.space"; user = "maralorn"; }
|
||||
{ host = "ag-forward"; hostname = agHost; proxyCommand = matheGwProxy; }
|
||||
{ host = "ag"; hostname = agHost; }
|
||||
{ host = "kiva-forward"; hostname = kivaHost; proxyCommand = matheGwProxy; }
|
||||
{ host = "kiva"; hostname = kivaHost; }
|
||||
{ host = "gw"; hostname = "gwres4.mathematik.tu-darmstadt.de"; }
|
||||
{ host = "*.mathematik.tu-darmstadt.de"; user = "brandy"; }
|
||||
{ host = "shells"; hostname = "shells.darmstadt.ccc.de"; }
|
||||
{ host = "vorstand"; hostname = "vorstand.darmstadt.ccc.de"; }
|
||||
{ host = "*.darmstadt.ccc.de"; user = "maralorn"; }
|
||||
{ host = "whisky"; hostname = "whisky.w17.io"; user = "chaos"; }
|
||||
];
|
||||
};
|
||||
zsh = {
|
||||
enable = true;
|
||||
enableAutosuggestions = true;
|
||||
enableCompletion = true;
|
||||
history = {
|
||||
path = "~/.zsh_history";
|
||||
save = 100000;
|
||||
size = 100000;
|
||||
};
|
||||
};
|
||||
xdg.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -37,11 +37,71 @@ let
|
|||
'';
|
||||
};
|
||||
in {
|
||||
home.packages = with pkgs; [
|
||||
vimPlugins.vimtex
|
||||
redshift
|
||||
python27Packages.syncthing-gtk
|
||||
rxvt_unicode
|
||||
tasktree
|
||||
];
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
vimPlugins.vimtex
|
||||
redshift
|
||||
python27Packages.syncthing-gtk
|
||||
rxvt_unicode
|
||||
tasktree
|
||||
tilda
|
||||
];
|
||||
keyboard = {
|
||||
layout = "de";
|
||||
variant = "neo";
|
||||
};
|
||||
};
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconeTheme = {
|
||||
name = "Arc";
|
||||
package = "arc-icon-theme";
|
||||
};
|
||||
theme = {
|
||||
name = "Arc";
|
||||
packages = "arc-theme";
|
||||
};
|
||||
};
|
||||
service = {
|
||||
compton = {
|
||||
enable = true;
|
||||
fade = true;
|
||||
shadow = true;
|
||||
};
|
||||
dunst = {
|
||||
enable = true;
|
||||
};
|
||||
gnome-keyring = {
|
||||
enable = true;
|
||||
components = [
|
||||
"secrets"
|
||||
"ssh"
|
||||
];
|
||||
};
|
||||
gpg-agent = {
|
||||
enable = true;
|
||||
};
|
||||
network-manager-applet.enable = true;
|
||||
redshift = {
|
||||
enable = true;
|
||||
temperature.day = 6500;
|
||||
latitude = 49.86667;
|
||||
longitude = 8.65;
|
||||
};
|
||||
screen-locker = {
|
||||
enable = true;
|
||||
lockCmd = "${pkgs.i3lock}/bin/i3lock";
|
||||
};
|
||||
};
|
||||
xsession = {
|
||||
enable = true;
|
||||
windowManager.i3 = {
|
||||
enable = true;
|
||||
gaps = {
|
||||
inner = 3;
|
||||
outer = 6;
|
||||
smartBorders = "on";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
20
home/snippets/latex.nix
Normal file
20
home/snippets/latex.nix
Normal file
|
@ -0,0 +1,20 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs = {
|
||||
texlive = {
|
||||
enable = true;
|
||||
extraPackages = tpkgs: {inherit (tpkgs)
|
||||
scheme-small
|
||||
latexmk
|
||||
collection-latexextra
|
||||
collection-bibtexextra
|
||||
collection-luatex
|
||||
collection-mathscience
|
||||
collection-fontsextra;
|
||||
};
|
||||
};
|
||||
};
|
||||
home.packages = [
|
||||
pgks.biber
|
||||
];
|
||||
}
|
27
home/snippets/update-hm.nix
Normal file
27
home/snippets/update-hm.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
path = https://github.com/rycee/home-manager/archive/release-17.09.tar.gz;
|
||||
home-manager = (import ../../home-manager {
|
||||
inherit pkgs;
|
||||
inherit path;
|
||||
});
|
||||
in {
|
||||
systemd.user = {
|
||||
services.update-hm = {
|
||||
Unit = {
|
||||
Description = "Update home-manager";
|
||||
};
|
||||
|
||||
Service = {
|
||||
Type = "oneshot";
|
||||
ExecStart="${home-manager}/bin/home-manager switch";
|
||||
};
|
||||
};
|
||||
timers.update-hm = {
|
||||
Timer = {
|
||||
OnCalendar = "22:15";
|
||||
Persistent = "true";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -51,20 +51,21 @@ services = {
|
|||
enable = true;
|
||||
drivers = [pkgs.hplip];
|
||||
};
|
||||
xserver = {
|
||||
enable = true;
|
||||
layout = "de";
|
||||
xkbVariant = "neo";
|
||||
desktopManager.gnome3.enable = true;
|
||||
displayManager.gdm = {
|
||||
autoLogin = {
|
||||
delay = 3;
|
||||
enable = true;
|
||||
user = "maralorn";
|
||||
};
|
||||
wayland = false;
|
||||
enable = true;
|
||||
};
|
||||
xserver = {
|
||||
enable = true;
|
||||
layout = "de";
|
||||
xkbVariant = "neo";
|
||||
#desktopManager.gnome3.enable = true;
|
||||
#windowManager.i3.enable = true;
|
||||
# displayManager.gdm = {
|
||||
# autoLogin = {
|
||||
# delay = 3;
|
||||
# enable = true;
|
||||
# user = "maralorn";
|
||||
# };
|
||||
# wayland = false;
|
||||
# enable = true;
|
||||
# };
|
||||
libinput.enable = true;
|
||||
config = ''
|
||||
Section "InputClass"
|
||||
|
|
|
@ -79,7 +79,8 @@ je-orga: :include:/etc/nixos/local/lists/je-orga
|
|||
lookupMX = true;
|
||||
extraConfig =
|
||||
''
|
||||
message_size_limit = 30720000
|
||||
message_size_limit = 100000000
|
||||
mailbox_size_limit = 100000000
|
||||
|
||||
mailbox_command = ${pkgs.dovecot}/libexec/dovecot/dovecot-lda -f "$SENDER" -a "$RECIPIENT" -d "$USER"
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
let
|
||||
unstable = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz) {};
|
||||
unstable = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/f022cc679486ec5f21a13dab9a336ba1f5543910.tar.gz) {};
|
||||
in
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [ 8448 ];
|
||||
|
|
Loading…
Reference in a new issue