From 41419e11f030e176c5b2f2d4fe0c509e9ad11239 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:19:32 +0200 Subject: j brauerei: remove some comment garbage --- jeschli/1systems/brauerei/config.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 5a6ad7652..00db1ad15 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -25,21 +25,11 @@ preLVM = true; allowDiscards = true; } ]; -# networking.hostName = "brauerei"; - # Define your hostname. -# networking.wireless.enable = true; networking.networkmanager.enable = true; - # Enables wireless support via wpa_supplicant. - # Select internationalisation properties. - # i18n = { - # consoleFont = "Lat2-Terminus16"; - # consoleKeyMap = "us"; - # defaultLocale = "en_US.UTF-8"; - # }; - # Set your time zone. # time.timeZone = "Europe/Amsterdam"; + nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget + environment.shellAliases = { n = "nix-shell"; stocki = pkgs.writeDash "deploy" '' -- cgit v1.2.3 From 433b5a442bfb06ca2ed5e6ed5a0a7b43c0b4ad64 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:19:55 +0200 Subject: j brauerei: reformatting --- jeschli/1systems/brauerei/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 00db1ad15..26e25c829 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -37,6 +37,7 @@ exec nix-shell -I stockholm="$PWD" --run 'deploy --system="brauerei"' ''; }; + environment.systemPackages = with pkgs; [ # system helper ag -- cgit v1.2.3 From 379b226235f850919d72957579cad5cf052c42e5 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:20:09 +0200 Subject: j brauerei: +taskwarrior --- jeschli/1systems/brauerei/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 26e25c829..5b384d18f 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -94,6 +94,7 @@ zathura # xorg xorg.xbacklight + taskwarrior ]; # Some programs need SUID wrappers, can be configured further or are -- cgit v1.2.3 From 29f65c27655136356354cb96e0ee3676db09dd67 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:20:29 +0200 Subject: j brauerei: *dpi --- jeschli/1systems/brauerei/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index 5b384d18f..d1cca55a6 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -118,7 +118,7 @@ display = 11; tty = 11; - dpi = 96; + dpi = 144; # videoDrivers = [ "nvidia" ]; synaptics = { -- cgit v1.2.3 From 50190d3765cbf72205c410950322dbb2ef70c111 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:21:30 +0200 Subject: j brauerei: add audio group for jeschli --- jeschli/1systems/brauerei/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix index d1cca55a6..e200cbcd4 100644 --- a/jeschli/1systems/brauerei/config.nix +++ b/jeschli/1systems/brauerei/config.nix @@ -130,7 +130,7 @@ users.extraUsers.jeschli = { # TODO: define as krebs.users isNormalUser = true; - extraGroups = ["docker" "vboxusers"]; + extraGroups = ["docker" "vboxusers" "audio"]; uid = 1000; }; users.extraUsers.jamie = { -- cgit v1.2.3 From 84b75261c238fb5ae65137a8b33b51666e8db079 Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:22:32 +0200 Subject: j brauerei: enable pulseaudio --- jeschli/1systems/brauerei/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/1systems/brauerei/hardware-configuration.nix b/jeschli/1systems/brauerei/hardware-configuration.nix index 75fdb89fd..2cb3e6661 100644 --- a/jeschli/1systems/brauerei/hardware-configuration.nix +++ b/jeschli/1systems/brauerei/hardware-configuration.nix @@ -29,5 +29,6 @@ swapDevices = [ ]; + hardware.pulseaudio.enable = true; nix.maxJobs = lib.mkDefault 4; } -- cgit v1.2.3 From 101733029e93a2d3ee8de8ed1d6039aacb010a4e Mon Sep 17 00:00:00 2001 From: jeschli Date: Tue, 31 Jul 2018 19:23:29 +0200 Subject: j xserver: remove xft.dpi option --- jeschli/2configs/xserver/Xresources.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/jeschli/2configs/xserver/Xresources.nix b/jeschli/2configs/xserver/Xresources.nix index adf06ee63..98f325256 100644 --- a/jeschli/2configs/xserver/Xresources.nix +++ b/jeschli/2configs/xserver/Xresources.nix @@ -5,7 +5,6 @@ with import ; pkgs.writeText "Xresources" /* xdefaults */ '' Xcursor.theme: aero-large-drop Xcursor.size: 128 - Xft.dpi: 144 URxvt*cutchars: "\\`\"'&()*,;<=>?@[]^{|}‘’" URxvt*eightBitInput: false -- cgit v1.2.3 From d487c1b5c2a34de41376dddfb39224719d3d81c4 Mon Sep 17 00:00:00 2001 From: jeschli Date: Wed, 1 Aug 2018 13:53:46 +0200 Subject: j emacs: activate evilMode --- jeschli/2configs/emacs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix index 2089d4254..3bd2dbfc4 100644 --- a/jeschli/2configs/emacs.nix +++ b/jeschli/2configs/emacs.nix @@ -57,6 +57,7 @@ let (global-set-key "\C-x\ \C-r" 'recentf-open-files) ''; dotEmacs = pkgs.writeText "dot-emacs" '' + ${evilMode} ${packageRepos} ${orgMode} ${recentFiles} -- cgit v1.2.3 From dbbf237393468b49f07beaeea614e12bac35a6c2 Mon Sep 17 00:00:00 2001 From: jeschli Date: Wed, 1 Aug 2018 13:55:10 +0200 Subject: krebs git: refactor --- krebs/3modules/git.nix | 60 ++++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index 5ae24b40b..6311e88ab 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -8,6 +8,21 @@ with import ; let + defaultBool = o: mkOption { + type = types.bool; + default = option; + }; + + defaultUint = o: mkOption { + type = types.uint; + default = o; + }; + + defaultAbsolutpath = o: mkOption { + type = types.absolute-pathname; + default = o; + }; + cfg = config.krebs.git; out = { @@ -121,42 +136,15 @@ let cgit-settings = types.submodule { # A setting's value of `null` means cgit's default should be used. options = { - cache-root = mkOption { - type = types.absolute-pathname; - default = "/tmp/cgit"; - }; - cache-size = mkOption { - type = types.uint; - default = 1000; - }; - css = mkOption { - type = types.absolute-pathname; - default = "/static/cgit.css"; - }; - enable-commit-graph = mkOption { - type = types.bool; - default = true; - }; - enable-index-links = mkOption { - type = types.bool; - default = true; - }; - enable-index-owner = mkOption { - type = types.bool; - default = false; - }; - enable-log-filecount = mkOption { - type = types.bool; - default = true; - }; - enable-log-linecount = mkOption { - type = types.bool; - default = true; - }; - enable-remote-branches = mkOption { - type = types.bool; - default = true; - }; + cache-root = defaultAbsolutpath("/tmp/cgit"); + cache-size = defaultUint(1000); + css = defaultAbsolutpath("/static/cgit.css"); + enable-commit-graph = defaultBool(true); + enable-index-links = defaultBool(true); + enable-index-owner = defaultBool(false); + enable-log-filecount = defaultBool(true); + enable-log-linecount = defaultBool(true); + enable-remote-branches = defaultBool(true); logo = mkOption { type = types.absolute-pathname; default = "/static/cgit.png"; -- cgit v1.2.3