summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/helios/config.nix1
-rw-r--r--lass/2configs/baseX.nix29
-rw-r--r--lass/2configs/copyq.nix7
-rw-r--r--lass/2configs/zsh.nix7
-rw-r--r--lass/source.nix2
5 files changed, 36 insertions, 10 deletions
diff --git a/lass/1systems/helios/config.nix b/lass/1systems/helios/config.nix
index fc30a3478..f53e93f26 100644
--- a/lass/1systems/helios/config.nix
+++ b/lass/1systems/helios/config.nix
@@ -131,7 +131,6 @@ with import <stockholm/lib>;
services.xserver.displayManager.sessionCommands = ''
${pkgs.xorg.xrandr}/bin/xrandr --output DP-6 --off --output DP-5 --off --output DP-4 --mode 2560x1440 --pos 3840x0 --rotate left --output DP-3 --off --output DP-2 --primary --mode 3840x2160 --pos 0x400 --rotate normal --output DP-1 --off --output DP-0 --mode 2560x1440 --pos 5280x1120 --rotate normal
- ${pkgs.systemd}/bin/systemctl start xresources.service
'';
networking.hostName = lib.mkForce "BLN02NB0162";
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 65e8f15a4..5cb7eb03f 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -106,15 +106,40 @@ in {
xlibs.fontschumachermisc
];
- lass.xserver.enable = true;
+ #lass.xserver.enable = true;
services.xserver = {
+ enable = true;
layout = "us";
+ display = mkForce 0;
xkbModel = "evdev";
xkbVariant = "altgr-intl";
xkbOptions = "caps:backspace";
+ displayManager.lightdm.enable = true;
+ windowManager.default = "xmonad";
+ windowManager.session = [{
+ name = "xmonad";
+ start = ''
+ ${pkgs.xorg.xhost}/bin/xhost +LOCAL:
+ ${pkgs.coreutils}/bin/sleep infinity
+ '';
+ }];
+ };
+
+ systemd.user.services.xmonad = {
+ wantedBy = [ "graphical-session.target" ];
+ environment = {
+ DISPLAY = ":${toString config.services.xserver.display}";
+ RXVT_SOCKET = "%t/urxvtd-socket";
+ XMONAD_DATA_DIR = "/tmp";
+ };
+ serviceConfig = {
+ SyslogIdentifier = "xmonad";
+ ExecStart = "${pkgs.xmonad-lass}/bin/xmonad";
+ ExecStop = "${pkgs.xmonad-lass}/bin/xmonad --shutdown";
+ };
+ restartIfChanged = false;
};
- services.urxvtd.enable = true;
krebs.xresources.enable = true;
lass.screenlock.enable = true;
}
diff --git a/lass/2configs/copyq.nix b/lass/2configs/copyq.nix
index cd10313fc..56c091a6e 100644
--- a/lass/2configs/copyq.nix
+++ b/lass/2configs/copyq.nix
@@ -19,9 +19,9 @@ let
${pkgs.copyq}/bin/copyq config text_wrap true
'';
in {
- systemd.services.copyq = {
- wantedBy = [ "multi-user.target" ];
- requires = [ "xserver.service" ];
+ systemd.user.services.copyq = {
+ wantedBy = [ "graphical-session.target" ];
+ requires = [ "xmonad.service" ];
environment = {
DISPLAY = ":${toString config.services.xserver.display}";
};
@@ -35,7 +35,6 @@ in {
Restart = "always";
RestartSec = "15s";
StartLimitBurst = 0;
- User = "lass";
};
};
}
diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix
index 728c0cc0d..7b0ef79f3 100644
--- a/lass/2configs/zsh.nix
+++ b/lass/2configs/zsh.nix
@@ -1,5 +1,6 @@
{ config, lib, pkgs, ... }:
{
+ environment.systemPackages = [ pkgs.fzf ];
programs.zsh = {
enable = true;
shellInit = ''
@@ -37,6 +38,10 @@
zle -N edit-command-line
bindkey "^X^E" edit-command-line
+ #fzf inclusion
+ source ${pkgs.fzf}/share/fzf/completion.zsh
+ source ${pkgs.fzf}/share/fzf/key-bindings.zsh
+
#completion magic
autoload -Uz compinit
compinit
@@ -52,8 +57,6 @@
sha256="05lh5w3bgj9h8d8lrbbwbzw8788709cnzzkl8yh7m1dawkpf6nlp";
}}/LS_COLORS)
- # export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -'
-
#beautiful colors
alias ls='ls --color'
# zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS}
diff --git a/lass/source.nix b/lass/source.nix
index 8ca3fe3c0..eaae841fd 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "92d088e";
+ ref = "d9a2891";
};
secrets = getAttr builder {
buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;