More config
This commit is contained in:
parent
1247b05423
commit
9566f776be
|
@ -1,14 +1,12 @@
|
|||
{ pkgs, config, ... }:
|
||||
let
|
||||
rust-scripts = with pkgs; callPackage ../packages/rust-scripts {};
|
||||
unstable-pkgs = import <unstable> {};
|
||||
eventd = unstable-pkgs.callPackage ../packages/eventd {};
|
||||
st = import graphical/st;
|
||||
in {
|
||||
{
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
eventd = eventd;
|
||||
st = st pkgs config.common.colors;
|
||||
rust-scripts = pkgs.callPackage ./packages/rust-scripts {};
|
||||
jali = pkgs.callPackage ./packages/jali {};
|
||||
eventd = (import <unstable> {}).callPackage ./packages/eventd {};
|
||||
st = (import graphical/st) pkgs config.common.colors;
|
||||
};
|
||||
|
||||
home.file.".tmux.conf".text = ''
|
||||
set -g default-terminal "st-256color"
|
||||
set -ga terminal-overrides ",st-256color:Tc"
|
||||
|
@ -16,6 +14,7 @@ in {
|
|||
set -g status off
|
||||
set -g escape-time 1
|
||||
'';
|
||||
|
||||
programs = {
|
||||
home-manager = {
|
||||
enable = true;
|
||||
|
@ -129,8 +128,6 @@ in {
|
|||
pythonPackages.qrcode
|
||||
ranger
|
||||
|
||||
# rust-scripts
|
||||
|
||||
(pkgs.neovim.override {
|
||||
vimAlias = true;
|
||||
withPython3 = true;
|
||||
|
@ -145,7 +142,6 @@ in {
|
|||
'';
|
||||
packages.myVimPackage = with pkgs.vimPlugins; {
|
||||
start = [
|
||||
# deoplete-nvim
|
||||
vim-nix
|
||||
ctrlp
|
||||
vimtex
|
||||
|
@ -153,11 +149,8 @@ in {
|
|||
UltiSnips
|
||||
airline
|
||||
rust-vim
|
||||
# deoplete-rust
|
||||
fugitive
|
||||
airline
|
||||
# ale
|
||||
# vim-snippets
|
||||
vim-trailing-whitespace
|
||||
vim-polyglot
|
||||
nvim-cm-racer
|
||||
|
|
13
home-manager/packages/jali/default.nix
Normal file
13
home-manager/packages/jali/default.nix
Normal file
|
@ -0,0 +1,13 @@
|
|||
{ jinja2, pendulum, GitPython, aqbanking, python36Packages, fetchgit }:
|
||||
with python36Packages; buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "jali";
|
||||
doCheck = false;
|
||||
version = "1d1c5d0a";
|
||||
src = fetchgit {
|
||||
url = "https://git.darmstadt.ccc.de/jali/jali.git";
|
||||
rev = version;
|
||||
sha256 = "1nzzangp7yr2gq66qz7wk2cqqwjlhrfaqmc85qigjv4vpfmlphl0";
|
||||
};
|
||||
propagatedBuildInputs = [ jinja2 pendulum GitPython aqbanking ];
|
||||
}
|
|
@ -1,22 +1,23 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
|
||||
networking = {
|
||||
hostName = "apollo";
|
||||
networkmanager.enable = true;
|
||||
hostId = "38d29f92";
|
||||
};
|
||||
|
||||
i18n.consoleKeyMap = "neo";
|
||||
|
||||
imports = [
|
||||
imports = [
|
||||
<home-manager/nixos>
|
||||
./hardware-configuration.nix
|
||||
../../modules/cdarknet
|
||||
../../host-common/common.nix
|
||||
../../system
|
||||
];
|
||||
|
||||
home-manager.users = {};
|
||||
networking = {
|
||||
hostName = "apollo";
|
||||
};
|
||||
|
||||
m-0 = {
|
||||
laptop.enable = true;
|
||||
};
|
||||
|
||||
home-manager.users.maralorn = {
|
||||
imports = [ ./home.nix ];
|
||||
};
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot = {
|
||||
|
@ -27,47 +28,13 @@ boot = {
|
|||
supportedFilesystems = [ "exfat" ];
|
||||
};
|
||||
|
||||
security.rngd.enable = true;
|
||||
|
||||
cdark_net = {
|
||||
enable = true;
|
||||
hostName = "maralorn_apollo";
|
||||
ed25519PrivateKeyFile = /etc/nixos/local/tinc/ed25519_key.priv;
|
||||
hostsDirectory = /etc/nixos/config/modules/cdarknet/hosts;
|
||||
ed25519PrivateKeyFile = /etc/nixos/hosts/apollo/secret/tinc/ed25519_key.priv;
|
||||
hostsDirectory = /etc/nixos/system/modules/cdarknet/hosts;
|
||||
ip6address = "fd23:42:cda:4342::2";
|
||||
ip4address = "172.20.71.2";
|
||||
};
|
||||
|
||||
|
||||
hardware.pulseaudio.enable = true;
|
||||
services = {
|
||||
# printing = {
|
||||
# enable = true;
|
||||
# drivers = [pkgs.hplip];
|
||||
# };
|
||||
# gnome3 = {
|
||||
# gnome-keyring.enable = true;
|
||||
# evolution-data-server.enable = true;
|
||||
# gnome-disks.enable = true;
|
||||
# };
|
||||
xserver = {
|
||||
enable = true;
|
||||
layout = "de";
|
||||
xkbVariant = "neo";
|
||||
libinput.enable = true;
|
||||
desktopManager.gnome3.enable = true;
|
||||
displayManager.auto = {
|
||||
enable = true;
|
||||
user = "maralorn";
|
||||
};
|
||||
config = ''
|
||||
Section "InputClass"
|
||||
Identifier "Enable libinput for TrackPoint"
|
||||
MatchIsPointer "on"
|
||||
Driver "libinput"
|
||||
EndSection
|
||||
'';
|
||||
};
|
||||
};
|
||||
#virtualisation.docker.enable = true;
|
||||
}
|
||||
|
|
2
hosts/apollo/secret/.gitattributes
vendored
Normal file
2
hosts/apollo/secret/.gitattributes
vendored
Normal file
|
@ -0,0 +1,2 @@
|
|||
* filter=git-crypt-apollo diff=git-crypt-apollo
|
||||
.gitattributes !filter !diff
|
BIN
hosts/apollo/secret/pw-maralorn
Normal file
BIN
hosts/apollo/secret/pw-maralorn
Normal file
Binary file not shown.
BIN
hosts/apollo/secret/tinc/ed25519_key.priv
Normal file
BIN
hosts/apollo/secret/tinc/ed25519_key.priv
Normal file
Binary file not shown.
|
@ -3,29 +3,23 @@
|
|||
# channel = 18.03
|
||||
|
||||
imports = [
|
||||
./laptop.nix
|
||||
./admin.nix
|
||||
./syncthing.nix
|
||||
modules/cdarknet
|
||||
];
|
||||
|
||||
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
security.rngd.enable = true;
|
||||
|
||||
# So that boot does not fill up with old kernels
|
||||
boot.loader.grub.configurationLimit = 5;
|
||||
|
||||
nix = {
|
||||
gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 5d";
|
||||
};
|
||||
optimise.automatic = true;
|
||||
};
|
||||
system.autoUpgrade.enable = true;
|
||||
system.autoUpgrade.dates = "22:00";
|
||||
|
||||
users = {
|
||||
defaultUserShell = pkgs.zsh;
|
||||
mutableUsers = false;
|
||||
|
@ -46,7 +40,6 @@
|
|||
git
|
||||
gnumake
|
||||
python3
|
||||
python
|
||||
mkpasswd
|
||||
rxvt_unicode.terminfo
|
||||
htop
|
35
system/laptop.nix
Normal file
35
system/laptop.nix
Normal file
|
@ -0,0 +1,35 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
options = {
|
||||
m-0.laptop.enable = mkOption {
|
||||
type = types.bool;
|
||||
};
|
||||
};
|
||||
config = mkIf config.m-0.laptop.enable {
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
};
|
||||
i18n.consoleKeyMap = "neo";
|
||||
hardware.pulseaudio.enable = true;
|
||||
services = {
|
||||
xserver = {
|
||||
enable = true;
|
||||
layout = "de";
|
||||
xkbVariant = "neo";
|
||||
libinput.enable = true;
|
||||
desktopManager.gnome3.enable = true;
|
||||
displayManager.auto = {
|
||||
enable = true;
|
||||
user = "maralorn";
|
||||
};
|
||||
config = ''
|
||||
Section "InputClass"
|
||||
Identifier "Enable libinput for TrackPoint"
|
||||
MatchIsPointer "on"
|
||||
Driver "libinput"
|
||||
EndSection
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,4 +1,21 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
options = {
|
||||
m-0.server.enable = mkOption {
|
||||
type = types.bool;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf config.m-0.server.enable {
|
||||
nix = {
|
||||
gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 5d";
|
||||
};
|
||||
optimise.automatic = true;
|
||||
};
|
||||
system.autoUpgrade.enable = true;
|
||||
system.autoUpgrade.dates = "22:00";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue