Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2595be06af5c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 163adc50392c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 24, 2018

  1. sway-beta: module init

    @colemickens
    colemickens committed Oct 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    da960bb View commit details

Commits on Oct 25, 2018

  1. Merge pull request #48916 from colemickens/sway-module 

    programs.sway-beta: module init (temporary until sway-beta becomes sway-1.0)
    @primeos
    primeos authored Oct 25, 2018
    Copy the full SHA
    163adc5 View commit details
Showing with 55 additions and 0 deletions.
  1. +1 −0 nixos/modules/module-list.nix
  2. +54 −0 nixos/modules/programs/sway-beta.nix
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
View file
Original file line number Diff line number Diff line change
@@ -120,6 +120,7 @@
./programs/sysdig.nix
./programs/systemtap.nix
./programs/sway.nix
./programs/sway-beta.nix
./programs/thefuck.nix
./programs/tmux.nix
./programs/udevil.nix
54 changes: 54 additions & 0 deletions nixos/modules/programs/sway-beta.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{ config, pkgs, lib, ... }:

with lib;

let
cfg = config.programs.sway-beta;
swayPackage = cfg.package;
in {
options.programs.sway-beta = {
enable = mkEnableOption ''
Sway, the i3-compatible tiling Wayland compositor. This module will be removed after the final release of Sway 1.0
'';

package = mkOption {
type = types.package;
default = pkgs.sway-beta;
defaultText = "pkgs.sway-beta";
description = ''
The package to be used for `sway`.
'';
};

extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [
xwayland dmenu
];
defaultText = literalExample ''
with pkgs; [ xwayland dmenu ];
'';
example = literalExample ''
with pkgs; [
xwayland
i3status i3status-rust
termite rofi light
]
'';
description = ''
Extra packages to be installed system wide.
'';
};
};

config = mkIf cfg.enable {
environment.systemPackages = [ swayPackage ] ++ cfg.extraPackages;
security.pam.services.swaylock = {};
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
programs.dconf.enable = mkDefault true;
};

meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];
}