From 17a80f2b4a525af58df31bd7743950336090635b Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Feb 2016 12:23:13 +0100 Subject: nixpkgs: expose stockholm pkgs --- nixpkgs/default.nix | 6 +++++- nixpkgs/pkgs | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) mode change 120000 => 100644 nixpkgs/default.nix delete mode 120000 nixpkgs/pkgs diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix deleted file mode 120000 index 6e5223c16..000000000 --- a/nixpkgs/default.nix +++ /dev/null @@ -1 +0,0 @@ -../../upstream-nixpkgs/default.nix \ No newline at end of file diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix new file mode 100644 index 000000000..1fe99b0ab --- /dev/null +++ b/nixpkgs/default.nix @@ -0,0 +1,5 @@ +_: + +(import { + configuration = {}; +}).pkgs diff --git a/nixpkgs/pkgs b/nixpkgs/pkgs deleted file mode 120000 index 983384943..000000000 --- a/nixpkgs/pkgs +++ /dev/null @@ -1 +0,0 @@ -../../upstream-nixpkgs/pkgs \ No newline at end of file -- cgit v1.2.3 From 386a2191a13229b24a851d7ed02297d289cd5725 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Feb 2016 14:20:51 +0100 Subject: xmonad-stockholm: 1.0.0 -> 1.1.0 --- krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix | 8 ++++---- tv/5pkgs/xmonad-tv/Main.hs | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix b/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix index 096597808..12eab943d 100644 --- a/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix +++ b/krebs/5pkgs/haskell-overrides/xmonad-stockholm.nix @@ -3,11 +3,11 @@ }: mkDerivation { pname = "xmonad-stockholm"; - version = "1.0.0"; + version = "1.1.0"; src = fetchgit { - url = "http://cgit.cd.krebsco.de/xmonad-stockholm"; - sha256 = "35dda5d16acc90af94ae2fae10ab5cc2d5b450c3f1ff2e7f515ac53877269abf"; - rev = "2dbefe42fc5cfe9093465bf3e22ba8f82feeef6e"; + url = http://cgit.cd.krebsco.de/xmonad-stockholm; + rev = "179d29fd4c765dee698058ef63295331ac603639"; + sha256 = "0c6mj68xsxxr4j8adkzhjszi7bg6cpisrsmqn587a16sblpbrnkj"; }; libraryHaskellDepends = [ base containers X11 X11-xshape xmonad xmonad-contrib diff --git a/tv/5pkgs/xmonad-tv/Main.hs b/tv/5pkgs/xmonad-tv/Main.hs index 6482d9cc8..817d0092e 100644 --- a/tv/5pkgs/xmonad-tv/Main.hs +++ b/tv/5pkgs/xmonad-tv/Main.hs @@ -13,7 +13,6 @@ import XMonad import System.IO (hPutStrLn, stderr) import System.Environment (getArgs, withArgs, getEnv, getEnvironment) import System.Posix.Process (executeFile) -import XMonad.Prompt (defaultXPConfig) import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace , removeEmptyWorkspace) import XMonad.Actions.GridSelect @@ -64,7 +63,7 @@ mainNoArgs = do -- $ withUrgencyHook borderUrgencyHook "magenta" -- $ withUrgencyHookC BorderUrgencyHook { urgencyBorderColor = "magenta" } urgencyConfig { suppressWhen = Never } $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ") - $ defaultConfig + $ def { terminal = myTerm , modMask = mod4Mask , keys = myKeys @@ -179,8 +178,8 @@ myKeys conf = Map.fromList $ , ((_4 , xK_comma ), sendMessage $ IncMasterN 1) , ((_4 , xK_period ), sendMessage $ IncMasterN (-1)) - , ((_4 , xK_a ), addWorkspacePrompt defaultXPConfig) - , ((_4 , xK_r ), renameWorkspace defaultXPConfig) + , ((_4 , xK_a ), addWorkspacePrompt def) + , ((_4 , xK_r ), renameWorkspace def) , ((_4 , xK_Delete ), removeEmptyWorkspace) , ((_4 , xK_Return ), toggleWS) @@ -205,7 +204,7 @@ myKeys conf = Map.fromList $ pagerConfig :: PagerConfig -pagerConfig = defaultPagerConfig +pagerConfig = def { pc_font = myFont , pc_cellwidth = 64 --, pc_cellheight = 36 -- TODO automatically keep screen aspect @@ -218,13 +217,13 @@ pagerConfig = defaultPagerConfig where windowColors _ _ _ True _ = ("#ef4242","#ff2323") windowColors wsf m c u wf = do - let def = defaultWindowColors wsf m c u wf + let y = defaultWindowColors wsf m c u wf if m == False && wf == True - then ("#402020", snd def) - else def + then ("#402020", snd y) + else y horseConfig :: RhombusConfig -horseConfig = defaultRhombusConfig +horseConfig = def { rc_font = myFont , rc_cellwidth = 64 --, rc_cellheight = 36 -- TODO automatically keep screen aspect @@ -236,7 +235,7 @@ horseConfig = defaultRhombusConfig } wGSConfig :: GSConfig Window -wGSConfig = defaultGSConfig +wGSConfig = def { gs_cellheight = 20 , gs_cellwidth = 192 , gs_cellpadding = 5 @@ -244,7 +243,7 @@ wGSConfig = defaultGSConfig , gs_navigate = navNSearch } --- wsGSConfig = defaultGSConfig +-- wsGSConfig = def -- { gs_cellheight = 20 -- , gs_cellwidth = 64 -- , gs_cellpadding = 5 -- cgit v1.2.3 From d954dd5e192834a72a2d05b428fc0e8cef599c31 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Feb 2016 19:48:16 +0100 Subject: Makefile: interpolate $(target_*) for a nicer log --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e61d16b75..9ed045e4d 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ export target_path ?= /var/src evaluate = \ nix-instantiate \ - --arg configuration "./$$LOGNAME/1systems/$$system.nix" \ + --arg configuration ./$(LOGNAME)/1systems/$(system).nix \ --eval \ --readonly-mode \ --show-trace \ @@ -22,7 +22,7 @@ execute = \ # usage: make deploy system=foo [target_host=bar] deploy: $(call execute,populate) - @set -x; ssh "$$target_user@$$target_host" nixos-rebuild switch -I "$$target_path" + ssh $(target_user)@$(target_host) nixos-rebuild switch -I $(target_path) # usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name eval eval.:;@$(call evaluate) -- cgit v1.2.3 From 1497ee718256ff48c65ebcb0ddea633c6628eb69 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 12 Feb 2016 19:56:04 +0100 Subject: Makefile: enable "make install" --- Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 9ed045e4d..f39ed0c02 100644 --- a/Makefile +++ b/Makefile @@ -28,14 +28,13 @@ deploy: eval eval.:;@$(call evaluate) eval.%:;@$(call evaluate,-A $*) -## usage: make install system=foo target= -#.PHONY: install -#install: ssh = ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -#install:;@set -x -# $(ssh) "$$target_user@$$target_host" \ -# env target_path="$target_path" \ -# sh -s prepare < krebs/4lib/infest/prepare.sh -# make -s populate target_path=/mnt"$$target_path" -# $(ssh) "$$target_user@$$target_host" \ -# env NIXOS_CONFIG=/var/src/nixos-config \ -# nixos-install +# usage: make install system=foo [target_host=bar] +install: ssh = ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null +install: + $(ssh) $(target_user)@$(target_host) \ + env target_path=$(target_path) \ + sh -s prepare < krebs/4lib/infest/prepare.sh + target_path=/mnt$(target_path) $(call execute,populate) + $(ssh) $(target_user)@$(target_host) \ + env NIXOS_CONFIG=$(target_path)/nixos-config \ + nixos-install -- cgit v1.2.3