Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos

common/desktop.nix

@@ -74,10 +74,10 @@
     ];
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   # allow non-free packages
   nixpkgs.config.allowUnfree = true;
+
+  # enable garbage collection
   nix.gc = {
     automatic = true;
     dates = "weekly";
@@ -88,14 +88,24 @@
   programs.steam.enable = true;
   hardware.steam-hardware.enable = true;
 
+  # enable lockscreen
+
+  programs.xss-lock = {
+    enable = true;
+    lockerCommand = "i3lock -c 000000";
+  };
+
   environment.shellAliases = {
     nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
+    rebuild = "sudo nixos-rebuild switch";
   };
+
   environment.variables = {
     EDITOR = "vim";
     HIGHLIGHT_STYLE = "solarized-light";
     ZWEILI_ENVIRONMENT = "desktop";
   };
+
   environment.systemPackages = with pkgs; [
     arc-theme
     celluloid
@@ -103,6 +113,7 @@
     git
     highlight
     htop
+    i3lock
     lxappearance
     ncdu
     nitrogen
@@ -110,7 +121,6 @@
     ranger
     rofi
     source-code-pro
-    source-highlight
     terminator
     tree
     vim

home-manager/desktop/qtile/config.py

@@ -79,10 +79,15 @@ for i in groups:
             desc="move focused window to group {}".format(i.name)),
     ])
 
+border = dict(
+    border_width=1,
+    border_focus='#000000'
+)
+
 layouts = [
-    layout.Columns(),
-    layout.TreeTab(),
-    layout.Max(),
+    layout.Columns(**border),
+    layout.TreeTab(**border),
+    layout.Max(**border),
     # Try more layouts by unleashing below layouts.
     # layout.Stack(num_stacks=2),
     # layout.Bsp(),