From 3384165fcf31d0afa2e47b784b409ec6345f1ebc Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 13:31:06 +0200 Subject: l: import urxvt in desktop-base.nix --- lass/1systems/uriel.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass/1systems/uriel.nix') diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 62338d05..2b36912e 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -7,7 +7,6 @@ with builtins; ../2configs/browsers.nix ../2configs/games.nix ../2configs/pass.nix - ../2configs/urxvt.nix ../2configs/bird.nix ../2configs/git.nix ../2configs/chromium-patched.nix -- cgit v1.2.3 From c52c48366eae0b06aa51a3f6d2cc85b34ba680c9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 13:57:42 +0200 Subject: l 2: rename desktop-base.nix to baseX.nix --- lass/1systems/uriel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/1systems/uriel.nix') diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 2b36912e..d1855977 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -3,7 +3,7 @@ with builtins; { imports = [ - ../2configs/desktop-base.nix + ../2configs/baseX.nix ../2configs/browsers.nix ../2configs/games.nix ../2configs/pass.nix -- cgit v1.2.3 From 1d4f2bf01131d90e370bb8da2d5023aeaacf0b1d Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 14:00:15 +0200 Subject: l: move more config to base.nix --- lass/1systems/uriel.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'lass/1systems/uriel.nix') diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index d1855977..3514459f 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -24,26 +24,9 @@ with builtins; } ]; - krebs.build = { - user = config.krebs.users.lass; - target = "root@uriel"; - host = config.krebs.hosts.uriel; - source = { - dir.secrets = { - host = config.krebs.hosts.mors; - path = "/home/lass/secrets/${config.krebs.build.host.name}"; - }; - dir.stockholm = { - host = config.krebs.hosts.mors; - path = "/home/lass/dev/stockholm"; - }; - }; - }; - - networking.hostName = "uriel"; + krebs.build.host = config.krebs.hosts.uriel; networking.wireless.enable = true; - nix.maxJobs = 2; hardware.enableAllFirmware = true; nixpkgs.config.allowUnfree = true; -- cgit v1.2.3 From cd237e5f45a6fe0e155dec9cfa9a63d63c0f7b00 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 14:01:30 +0200 Subject: l 1: remove dead code --- lass/1systems/uriel.nix | 6 ------ 1 file changed, 6 deletions(-) (limited to 'lass/1systems/uriel.nix') diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 3514459f..2565f4c0 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -47,8 +47,6 @@ with builtins; initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; #kernelModules = [ "kvm-intel" "msr" ]; kernelModules = [ "msr" ]; - extraModprobeConfig = '' - ''; }; fileSystems = { "/" = { @@ -75,10 +73,6 @@ with builtins; Option "FingerLow" "60" ''; }; - - environment.systemPackages = with pkgs; [ - ]; - #for google hangout users.extraUsers.google.extraGroups = [ "audio" "video" ]; -- cgit v1.2.3 From bb713845190d558d52ab29327055530e73345340 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 19 Oct 2015 14:02:38 +0200 Subject: l 1 uriel: remove obsolete code --- lass/1systems/uriel.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'lass/1systems/uriel.nix') diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 2565f4c0..1b008cbf 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -73,7 +73,4 @@ with builtins; Option "FingerLow" "60" ''; }; - #for google hangout - - users.extraUsers.google.extraGroups = [ "audio" "video" ]; } -- cgit v1.2.3