From ffcb2c7d0c165d65ed9ab287064e6c1fb0284c21 Mon Sep 17 00:00:00 2001 From: Markus Hihn Date: Wed, 20 Dec 2017 18:15:49 +0100 Subject: jeschli bln: +sqlite, datagrip --- jeschli/1systems/bln/config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 901970e..0748667 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -72,6 +72,8 @@ rxvt_unicode # editors emacs + # databases + sqlite # internet thunderbird hipchat @@ -91,6 +93,7 @@ jetbrains.pycharm-professional jetbrains.webstorm jetbrains.goland + jetbrains.datagrip texlive.combined.scheme-full pandoc redis -- cgit v1.2.3 From 370989e5c34ad0118ab02d3325be6d5cdcb9a7e5 Mon Sep 17 00:00:00 2001 From: Markus Hihn Date: Sat, 23 Dec 2017 09:19:45 +0100 Subject: jeschli bln: gh/gd aliases --- jeschli/1systems/bln/config.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 0748667..578638a 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -54,7 +54,11 @@ # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget nixpkgs.config.allowUnfree = true; - environment.shellAliases = { n = "nix-shell"; }; + environment.shellAliases = { + n = "nix-shell"; + gd = "cd /home/markus/go/src/gitlab.dcso.lolcat"; + gh = "cd /home/markus/go/src/github.com"; + }; environment.variables = { GOROOT= [ "${pkgs.go.out}/share/go" ]; }; environment.systemPackages = with pkgs; [ # system helper -- cgit v1.2.3 From 06e9ff116be37d22c05913351137a15d40626f10 Mon Sep 17 00:00:00 2001 From: Markus Hihn Date: Wed, 27 Dec 2017 17:34:26 +0100 Subject: jeschli bln: wireless for 34c3 --- jeschli/1systems/bln/config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 578638a..9ea6801 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -37,8 +37,8 @@ ]; networking.hostName = "BLN02NB0154"; # Define your hostname. - networking.networkmanager.enable = true; - #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; + networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Select internationalisation properties. # i18n = { -- cgit v1.2.3 From b7c0b46986a8b3dc2a91d8d7356b2a9854bbf175 Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 2 Jan 2018 22:38:26 +0100 Subject: nin axon: init --- nin/1systems/axon/config.nix | 121 +++++++++++++++++++++++++++++++++++++++++++ nin/1systems/axon/source.nix | 4 ++ 2 files changed, 125 insertions(+) create mode 100644 nin/1systems/axon/config.nix create mode 100644 nin/1systems/axon/source.nix diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix new file mode 100644 index 0000000..88060fc --- /dev/null +++ b/nin/1systems/axon/config.nix @@ -0,0 +1,121 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = [ + + + #../2configs/copyq.nix + + + + + ]; + + krebs.build.host = config.krebs.hosts.axon; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/pool/root"; + fsType = "ext4"; + }; + + fileSystems."/tmp" = + { device = "tmpfs"; + fsType = "tmpfs"; + }; + + fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext2"; + }; + + boot.initrd.luks.devices.crypted.device = "/dev/sda2"; + boot.initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 4; + # Use the GRUB 2 boot loader. + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + # Define on which hard drive you want to install Grub. + boot.loader.grub.device = "/dev/sda"; + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + fileSystems."/home/nin/.local/share/Steam" = { + device = "/dev/fam/steam"; + }; + + # nin config + time.timeZone = "Europe/Berlin"; + services.xserver.enable = true; + + networking.networkmanager.enable = true; + #networking.wireless.enable = true; + + hardware.pulseaudio = { + enable = true; + systemWide = true; + }; + + hardware.bluetooth.enable = true; + + hardware.opengl.driSupport32Bit = true; + + #nixpkgs.config.steam.java = true; + + environment.systemPackages = with pkgs; [ + firefox + git + lmms + networkmanagerapplet + python + steam + thunderbird + vim + virtmanager + ]; + + nixpkgs.config = { + + allowUnfree = true; + + }; + + #services.logind.extraConfig = "HandleLidSwitch=ignore"; + + services.xserver.synaptics = { + enable = true; + }; + + + services.xserver.desktopManager.xfce = let + xbindConfig = pkgs.writeText "xbindkeysrc" '' + "${pkgs.pass}/bin/passmenu --type" + Control + p + ''; + in { + enable = true; + extraSessionCommands = '' + ${pkgs.xbindkeys}/bin/xbindkeys -f ${xbindConfig} + ''; + }; + + # The NixOS release to be compatible with for stateful data such as databases. + system.stateVersion = "17.03"; + +} diff --git a/nin/1systems/axon/source.nix b/nin/1systems/axon/source.nix new file mode 100644 index 0000000..6a40296 --- /dev/null +++ b/nin/1systems/axon/source.nix @@ -0,0 +1,4 @@ +import { + name = "axon"; + secure = true; +} -- cgit v1.2.3 From 2a093fb7734d32e5291cbb2f63724b3c0789e7c1 Mon Sep 17 00:00:00 2001 From: nin Date: Wed, 3 Jan 2018 15:23:27 +0100 Subject: nin 1 axon config: remove steam partition --- nin/1systems/axon/config.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix index 88060fc..c5f38c1 100644 --- a/nin/1systems/axon/config.nix +++ b/nin/1systems/axon/config.nix @@ -56,10 +56,6 @@ with lib; # Enable CUPS to print documents. # services.printing.enable = true; - fileSystems."/home/nin/.local/share/Steam" = { - device = "/dev/fam/steam"; - }; - # nin config time.timeZone = "Europe/Berlin"; services.xserver.enable = true; -- cgit v1.2.3 From 5c2bcf914efc5a88954a3c20b7e790fb31a77847 Mon Sep 17 00:00:00 2001 From: nin Date: Wed, 3 Jan 2018 18:11:48 +0100 Subject: nin axon: set up ssh keys --- nin/2configs/default.nix | 2 ++ nin/2configs/git.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix index d7b89c8..62f499a 100644 --- a/nin/2configs/default.nix +++ b/nin/2configs/default.nix @@ -16,6 +16,7 @@ with import ; root = { openssh.authorizedKeys.keys = [ config.krebs.users.nin.pubkey + config.krebs.users.nin_h.pubkey ]; }; nin = { @@ -31,6 +32,7 @@ with import ; ]; openssh.authorizedKeys.keys = [ config.krebs.users.nin.pubkey + config.krebs.users.nin_h.pubkey ]; }; }; diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix index 2a86046..9ebbaab 100644 --- a/nin/2configs/git.nix +++ b/nin/2configs/git.nix @@ -53,7 +53,7 @@ let with git // config.krebs.users; repo: singleton { - user = [ nin ]; + user = [ nin nin_h ]; repo = [ repo ]; perm = push "refs/*" [ non-fast-forward create delete merge ]; } ++ -- cgit v1.2.3 From 221671d0b115a8baaebb2644b5316ce79e8edad9 Mon Sep 17 00:00:00 2001 From: jeschli Date: Thu, 4 Jan 2018 18:51:22 +0100 Subject: jeschli nixpkgs: f9390d6 -> d83c808 --- jeschli/1systems/brauerei/config.nix | 2 +- jeschli/source.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 171a002..2dec457 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -96,7 +96,7 @@ # Enable the X11 windowing system. services.xserver.enable = true; - # services.xserver.layout = "us"; + services.xserver.layout = "us"; # services.xserver.xkbOptions = "eurosign:e"; # Enable touchpad support. diff --git a/jeschli/source.nix b/jeschli/source.nix index d1b64b0..ae9e1e7 100644 --- a/jeschli/source.nix +++ b/jeschli/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "f9390d6"; + ref = "d83c808"; }; secrets.file = getAttr builder { buildbot = toString ; -- cgit v1.2.3 From f87e50d054c9ca377344d995ef96a1b21a60c88c Mon Sep 17 00:00:00 2001 From: Markus Hihn Date: Fri, 5 Jan 2018 10:46:36 +0100 Subject: jeschli bln: activated nm again --- jeschli/1systems/bln/config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 9ea6801..5ffa99c 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -37,8 +37,8 @@ ]; networking.hostName = "BLN02NB0154"; # Define your hostname. - # networking.networkmanager.enable = true; - networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager.enable = true; + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Select internationalisation properties. # i18n = { -- cgit v1.2.3 From e55f8ad3a0336e5d9a1d49723fd08baa48dd4bc2 Mon Sep 17 00:00:00 2001 From: Markus Hihn Date: Fri, 5 Jan 2018 12:37:34 +0100 Subject: jeschli bln: +tig --- jeschli/1systems/bln/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix index 5ffa99c..873c0fa 100644 --- a/jeschli/1systems/bln/config.nix +++ b/jeschli/1systems/bln/config.nix @@ -66,6 +66,7 @@ copyq dmenu git + tig i3lock keepass networkmanagerapplet -- cgit v1.2.3 From d2e8d36c05baad49a75b1ad19f578aaa0e9f2f85 Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 5 Jan 2018 20:37:54 +0100 Subject: jeschli urxvt: got better eyes now - adjust font size --- jeschli/2configs/urxvt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeschli/2configs/urxvt.nix b/jeschli/2configs/urxvt.nix index a2e02de..69811eb 100644 --- a/jeschli/2configs/urxvt.nix +++ b/jeschli/2configs/urxvt.nix @@ -28,7 +28,7 @@ with import ; URxvt*scrollBar: false URxvt*urgentOnBell: true - URxvt*font: xft:DejaVu Sans Mono:pixelsize=20 + URxvt*font: xft:DejaVu Sans Mono:pixelsize=12 URXvt*faceSize: 12 ''; } -- cgit v1.2.3