From dd8c918c876f923b7ca5d9446b03c0b01f82b531 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 5 Aug 2015 15:11:52 +0200 Subject: test vicious for awesome on tsp --- makefu/2configs/base-gui.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index 5f977251f..056005f75 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -3,13 +3,24 @@ with lib; { imports = [ ]; - services.xserver.enable = true; - services.xserver.layout = "us"; + services.xserver = { + enable = true; + layout = "us"; # use awesome, direct boot into - services.xserver.displayManager.auto.enable =true; - services.xserver.displayManager.auto.user =config.krebs.users.makefu; - services.xserver.windowManager.awesome.enable = true; + displayManager.auto.enable = true; +# TODO: use config.krebs.users.makefu ... or not + displayManager.auto.user = "makefu"; + + windowManager = { + awesome.enable = true; + awesome.luaModules = [ pkgs.luaPackages.vicious ]; + default = "awesome"; + }; + + desktopManager.xterm.enable = false; + desktopManager.default = "none"; + }; security.setuidPrograms = [ "slock" ]; -- cgit v1.2.3 From 91a112c24294154be3b812e2b52e1c651d336aff Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Aug 2015 12:10:02 +0200 Subject: refactor tsp --- makefu/2configs/base-gui.nix | 26 +++++++++++++++++--------- makefu/2configs/base.nix | 14 +++++++++++++- makefu/2configs/sda-crypto-root.nix | 27 +++++++++++++++++++++++++++ makefu/2configs/tp-x200.nix | 23 +++++++++++++++++++++++ 4 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 makefu/2configs/sda-crypto-root.nix create mode 100644 makefu/2configs/tp-x200.nix (limited to 'makefu/2configs') diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index 056005f75..7f329c6ce 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -1,31 +1,39 @@ { config, lib, pkgs, ... }: - +## +# of course this name is a lie - it prepares a GUI environment close to my +# current configuration. +# +# autologin with mainUser into awesome +## +# with lib; +let + mainUser = config.krebs.build.user.name; +in { imports = [ ]; services.xserver = { enable = true; layout = "us"; -# use awesome, direct boot into - displayManager.auto.enable = true; -# TODO: use config.krebs.users.makefu ... or not - displayManager.auto.user = "makefu"; - windowManager = { awesome.enable = true; awesome.luaModules = [ pkgs.luaPackages.vicious ]; default = "awesome"; }; + displayManager.auto.enable = true; + displayManager.auto.user = mainUser; desktopManager.xterm.enable = false; - desktopManager.default = "none"; }; security.setuidPrograms = [ "slock" ]; -# use pulseaudio - environment.systemPackages = [ pkgs.slock ]; + environment.systemPackages = [ + pkgs.slock + pkgs.rxvt_unicode-with-plugins + ]; + hardware.pulseaudio = { enable = true; systemWide = true; diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix index 8dfb2ef27..792cccc71 100644 --- a/makefu/2configs/base.nix +++ b/makefu/2configs/base.nix @@ -6,7 +6,7 @@ with lib; krebs.enable = true; krebs.search-domain = "retiolum"; - networking.hostName = config.krebs.build.host.name; + users.extraUsers = { root = { openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ]; @@ -24,6 +24,18 @@ with lib; }; }; + networking.hostName = config.krebs.build.host.name; + nix.maxJobs = config.krebs.build.host.cores + 1; + + krebs.build.deps = { + secrets = { + url = "/home/makefu/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; + services.openssh.enable = true; nix.useChroot = true; diff --git a/makefu/2configs/sda-crypto-root.nix b/makefu/2configs/sda-crypto-root.nix new file mode 100644 index 000000000..0d979a0b8 --- /dev/null +++ b/makefu/2configs/sda-crypto-root.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +# sda: bootloader grub2 +# sda1: boot ext4 (label nixboot) +# sda2: cryptoluks -> ext4 +with lib; +{ + boot = { + loader.grub.enable =true; + loader.grub.version =2; + loader.grub.device = "/dev/sda"; + + initrd.luks.devices = [ { name = "luksroot"; device= "/dev/sda2";}]; + initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ]; + initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; + }; + fileSystems = { + "/" = { + device = "/dev/mapper/luksroot"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-label/nixboot"; + fsType = "ext4"; + }; + }; +} diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix new file mode 100644 index 000000000..64d3f85a1 --- /dev/null +++ b/makefu/2configs/tp-x200.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + #services.xserver = { + # videoDriver = "intel"; + #}; + + boot = { + kernelModules = [ "tp_smapi" "msr" ]; + extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; + + }; + + networking.wireless.enable = true; + + hardware.enableAllFirmware = true; + nixpkgs.config.allowUnfree = true; + + hardware.trackpoint.enable = true; + hardware.trackpoint.sensitivity = 255; + hardware.trackpoint.speed = 255; +} -- cgit v1.2.3 From 4d460eb95f398797df4d502be496a79481bdd809 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Aug 2015 12:53:02 +0200 Subject: refactor pnp --- makefu/2configs/graphite-standalone.nix | 1 + makefu/2configs/graphite-web.nix | 24 ------------------------ makefu/2configs/tinc-basic-retiolum.nix | 14 ++++++++++++++ makefu/2configs/vm-single-partition.nix | 20 ++++++++++++++++++++ 4 files changed, 35 insertions(+), 24 deletions(-) delete mode 100644 makefu/2configs/graphite-web.nix create mode 100644 makefu/2configs/tinc-basic-retiolum.nix create mode 100644 makefu/2configs/vm-single-partition.nix (limited to 'makefu/2configs') diff --git a/makefu/2configs/graphite-standalone.nix b/makefu/2configs/graphite-standalone.nix index 50c623ab9..8b70c11c8 100644 --- a/makefu/2configs/graphite-standalone.nix +++ b/makefu/2configs/graphite-standalone.nix @@ -5,6 +5,7 @@ with lib; { imports = [ ]; + services.graphite = { web = { enable = true; diff --git a/makefu/2configs/graphite-web.nix b/makefu/2configs/graphite-web.nix deleted file mode 100644 index daa1d49a3..000000000 --- a/makefu/2configs/graphite-web.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -{ - imports = [ ]; - services.graphite = { - web = { - enable = true; - host = "0.0.0.0"; - }; - carbon = { - enableCache = true; - storageSchemas = '' - [carbon] - pattern = ^carbon\. - retentions = 60:90d - - [default] - pattern = .* - retentions = 60s:30d,300s:1y - ''; - }; - }; -} diff --git a/makefu/2configs/tinc-basic-retiolum.nix b/makefu/2configs/tinc-basic-retiolum.nix new file mode 100644 index 000000000..cb1991bd6 --- /dev/null +++ b/makefu/2configs/tinc-basic-retiolum.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + krebs.retiolum = { + enable = true; + hosts = ../../Zhosts; + connectTo = [ + "gum" + "pigstarter" + "fastpoke" + ]; + }; +} diff --git a/makefu/2configs/vm-single-partition.nix b/makefu/2configs/vm-single-partition.nix new file mode 100644 index 000000000..78a5e7175 --- /dev/null +++ b/makefu/2configs/vm-single-partition.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: + +# vda1 ext4 (label nixos) -> only root partition +with lib; +{ + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + boot.loader.grub.device = "/dev/vda"; + + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; + + hardware.enableAllFirmware = true; + nixpkgs.config.allowUnfree = true; + hardware.cpu.amd.updateMicrocode = true; + + +} -- cgit v1.2.3 From fad2a76defb18108a271633392344dbb49bb769b Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Aug 2015 12:53:38 +0200 Subject: begin customization of gui --- makefu/2configs/base-gui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index 7f329c6ce..c4755c217 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -15,6 +15,8 @@ in services.xserver = { enable = true; layout = "us"; + xkbVariant = "altgr-intl"; + xkbOptions = "ctrl:nocaps"; windowManager = { awesome.enable = true; @@ -27,10 +29,8 @@ in desktopManager.xterm.enable = false; }; - security.setuidPrograms = [ "slock" ]; - environment.systemPackages = [ - pkgs.slock + pkgs.xlockmore pkgs.rxvt_unicode-with-plugins ]; -- cgit v1.2.3 From 7bb85d74f8dbf8751344f9248b9365b4543bf20f Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Aug 2015 13:51:49 +0200 Subject: makefu/2configs:add hashedPasswords --- makefu/2configs/base.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'makefu/2configs') diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix index 792cccc71..2e18acf7c 100644 --- a/makefu/2configs/base.nix +++ b/makefu/2configs/base.nix @@ -2,7 +2,13 @@ with lib; { - imports = [ ]; + imports = [ + { + users.extraUsers = + mapAttrs (_: h: { hashedPassword = h; }) + (import /root/src/secrets/hashedPasswords.nix); + } + ]; krebs.enable = true; krebs.search-domain = "retiolum"; @@ -39,7 +45,7 @@ with lib; services.openssh.enable = true; nix.useChroot = true; - users.mutableUsers = true; + users.mutableUsers = false; boot.tmpOnTmpfs = true; systemd.tmpfiles.rules = [ -- cgit v1.2.3 From a919ddb3878c59f1306d8d22f46b603aceb90e27 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Aug 2015 15:50:06 +0200 Subject: makefu:include vim.nix --- makefu/2configs/base.nix | 2 + makefu/2configs/vim.nix | 119 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 makefu/2configs/vim.nix (limited to 'makefu/2configs') diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix index 2e18acf7c..25d92d63d 100644 --- a/makefu/2configs/base.nix +++ b/makefu/2configs/base.nix @@ -8,6 +8,7 @@ with lib; mapAttrs (_: h: { hashedPassword = h; }) (import /root/src/secrets/hashedPasswords.nix); } + ./vim.nix ]; krebs.enable = true; krebs.search-domain = "retiolum"; @@ -32,6 +33,7 @@ with lib; networking.hostName = config.krebs.build.host.name; nix.maxJobs = config.krebs.build.host.cores + 1; + #nix.maxJobs = 1; krebs.build.deps = { secrets = { diff --git a/makefu/2configs/vim.nix b/makefu/2configs/vim.nix new file mode 100644 index 000000000..b71d95148 --- /dev/null +++ b/makefu/2configs/vim.nix @@ -0,0 +1,119 @@ +{ config, pkgs, ... }: + +let + customPlugins.vim-better-whitespace = pkgs.vimUtils.buildVimPlugin { + name = "vim-better-whitespace"; + src = pkgs.fetchFromGitHub { + owner = "ntpeters"; + repo = "vim-better-whitespace"; + rev = "984c8da518799a6bfb8214e1acdcfd10f5f1eed7"; + sha256 = "10l01a8xaivz6n01x6hzfx7gd0igd0wcf9ril0sllqzbq7yx2bbk"; + }; + }; + +in { + + environment.systemPackages = [ + pkgs.python27Full # required for youcompleteme + (pkgs.vim_configurable.customize { + name = "vim"; + + vimrcConfig.customRC = '' + set nocompatible + syntax on + + filetype off + filetype plugin indent on + + colorscheme darkblue + set background=dark + + set number + set relativenumber + set mouse=a + set ignorecase + set incsearch + set wildignore=*.o,*.obj,*.bak,*.exe,*.os + set textwidth=79 + set shiftwidth=2 + set expandtab + set softtabstop=2 + set shiftround + set smarttab + set tabstop=2 + set et + set autoindent + set backspace=indent,eol,start + + + inoremap + nnoremap + vnoremap + + nnoremap :UndotreeToggle + set undodir =~/.vim/undo + set undofile + "maximum number of changes that can be undone + set undolevels=1000000 + "maximum number lines to save for undo on a buffer reload + set undoreload=10000000 + + nnoremap :set invpaste paste? + set pastetoggle= + set showmode + + set showmatch + set matchtime=3 + set hlsearch + + autocmd ColorScheme * highlight ExtraWhitespace ctermbg=red guibg=red + + + " save on focus lost + au FocusLost * :wa + + autocmd BufRead *.json set filetype=json + au BufNewFile,BufRead *.mustache set syntax=mustache + + cnoremap SudoWrite w !sudo tee > /dev/null % + + " create Backup/tmp/undo dirs + set backupdir=~/.vim/backup + set directory=~/.vim/tmp + + function! InitBackupDir() + let l:parent = $HOME . '/.vim/' + let l:backup = l:parent . 'backup/' + let l:tmpdir = l:parent . 'tmp/' + let l:undodir= l:parent . 'undo/' + + + if !isdirectory(l:parent) + call mkdir(l:parent) + endif + if !isdirectory(l:backup) + call mkdir(l:backup) + endif + if !isdirectory(l:tmpdir) + call mkdir(l:tmpdir) + endif + if !isdirectory(l:undodir) + call mkdir(l:undodir) + endif + endfunction + call InitBackupDir() + + + ''; + + vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins; + vimrcConfig.vam.pluginDictionaries = [ + { names = [ "undotree" + "YouCompleteMe" + "vim-better-whitespace" ]; } + { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; } + ]; + + }) + ]; +} -- cgit v1.2.3