diff options
| -rw-r--r-- | config/dwl.nix | 3 | ||||
| -rw-r--r-- | config/qtile/config.py | 5 | ||||
| -rw-r--r-- | config/swaylock/default.nix | 10 | ||||
| -rwxr-xr-x | dist/autostart.sh | 3 | ||||
| -rw-r--r-- | dist/wallpaper.jpg | bin | 254852 -> 349362 bytes | |||
| -rw-r--r-- | machines/x/configuration.nix | 2 | ||||
| -rw-r--r-- | machines/x/home.nix | 3 | ||||
| -rw-r--r-- | modules/login.nix | 2 | ||||
| -rw-r--r-- | packages/dwl.nix | 8 | ||||
| -rw-r--r-- | packages/wlroots.nix | 45 |
10 files changed, 68 insertions, 13 deletions
diff --git a/config/dwl.nix b/config/dwl.nix index 2d0ab0a..241d7f9 100644 --- a/config/dwl.nix +++ b/config/dwl.nix @@ -1,7 +1,8 @@ { pkgs, home, ... }: let - dwl = (pkgs.callPackage ../packages/dwl.nix {}); + wlroots = pkgs.callPackage ../packages/wlroots.nix {}; + dwl = (pkgs.callPackage ../packages/dwl.nix { inherit wlroots; }); dwlb = (pkgs.callPackage ../packages/dwlb.nix {}); in { home.packages = [ dwl dwlb ]; diff --git a/config/qtile/config.py b/config/qtile/config.py index a1bdb73..c104e65 100644 --- a/config/qtile/config.py +++ b/config/qtile/config.py @@ -43,7 +43,8 @@ keys = [ Key([], "XF86AudioMute", lazy.spawn("pamixer -t"), desc='Volume Mute'), Key([], "XF86MonBrightnessUp", lazy.spawn("brightnessctl s 5%+"), desc='brightness UP'), Key([], "XF86MonBrightnessDown", lazy.spawn("brightnessctl s 5%-"), desc='brightness Down'), - Key([mod],"e", lazy.spawn("pcmanfm"), desc='File manager'), + Key([mod], "e", lazy.spawn("pcmanfm"), desc='File manager'), + Key([mod], "x", lazy.spawn("swaylock"), desc='Lock'), # Key([mod], "s", lazy.spawn("flameshot gui"), desc='Screenshot'), Key([mod], "Tab", lazy.next_layout(), desc="Toggle between layouts"), @@ -231,7 +232,7 @@ screens = [ ), widget.Clock( - format=' %d/%M/%y', + format=' %d %b, %Y', background='#0F1212', foreground='#607767', ), diff --git a/config/swaylock/default.nix b/config/swaylock/default.nix index 1832503..4f4ed9c 100644 --- a/config/swaylock/default.nix +++ b/config/swaylock/default.nix @@ -1,6 +1,12 @@ { pkgs, config, ... }: -{ - home.packages = [ pkgs.swaylock pkgs.swayidle ]; +let + swaylockPkgs = import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/05bbf675397d5366259409139039af8077d695ce.tar.gz"; + sha256 = "1r26vjqmzgphfnby5lkfihz6i3y70hq84bpkwd43qjjvgxkcyki0"; + }) { system = "x86_64-linux"; }; + swaylock = swaylockPkgs.swaylock; +in { + home.packages = [ swaylock pkgs.swayidle ]; home.file.".config/swaylock/config".source = ./config; } diff --git a/dist/autostart.sh b/dist/autostart.sh index c673bd1..35c9c26 100755 --- a/dist/autostart.sh +++ b/dist/autostart.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash +systemctl --user import-environment DISPLAY WAYLAND_DISPLAY & way-displays & dunst & blueman-applet & -systemctl --user import-environment DISPLAY WAYLAND_DISPLAY & +swayidle before-sleep swaylock lock swaylock & diff --git a/dist/wallpaper.jpg b/dist/wallpaper.jpg Binary files differindex 9cdc604..f229728 100644 --- a/dist/wallpaper.jpg +++ b/dist/wallpaper.jpg diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix index 3d89307..ed69181 100644 --- a/machines/x/configuration.nix +++ b/machines/x/configuration.nix @@ -24,7 +24,7 @@ "remapcapslock.nix" "wm_utils.nix" - "qtile" + # "qtile" ]); boot.loader.systemd-boot.enable = true; diff --git a/machines/x/home.nix b/machines/x/home.nix index 2c009e5..90d7883 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -43,7 +43,8 @@ "emacs" "nvim" - "qtile" + # "qtile" + "dwl.nix" "themes.nix" "way-displays" "swaylock" diff --git a/modules/login.nix b/modules/login.nix index 28432c1..038f4a3 100644 --- a/modules/login.nix +++ b/modules/login.nix @@ -10,7 +10,7 @@ enable = true; settings = { default_session = { - command = "tuigreet --time --remember --cmd \"qtile start -b wayland\""; + command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; user = "greeter"; }; }; diff --git a/packages/dwl.nix b/packages/dwl.nix index 637648a..950458e 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -11,7 +11,7 @@ , wayland-scanner , wayland , wayland-protocols -, wlroots_0_17 +, wlroots , writeText , xcbutilwm , xwayland @@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "compromyse"; repo = "dwl"; - rev = "master"; - hash = "sha256-KvbDzaTB3/3W0N14oCSCUbtuv8Z3GoCO3cIq8GwPgkk="; + rev = "compromyse"; + hash = "sha256-IlzzpSYKfmut4oFxtffneox44HDETmainP/Ulcl3NiE="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pixman wayland wayland-protocols - wlroots_0_17 + wlroots ] ++ lib.optionals enableXWayland [ libX11 xcbutilwm diff --git a/packages/wlroots.nix b/packages/wlroots.nix new file mode 100644 index 0000000..c7ec477 --- /dev/null +++ b/packages/wlroots.nix @@ -0,0 +1,45 @@ +args_@{ + lib, + fetchFromGitLab, + wlroots, + libdisplay-info, + hwdata, + lcms2, + ... +}: + +let + metadata = rec { + domain = "gitlab.freedesktop.org"; + owner = "wlroots"; + repo = "wlroots"; + repo_git = "https://${domain}/${owner}/${repo}"; + branch = "master"; + rev = "a8d1e5273abad02e594c4ad2f237a204ca239528"; + sha256 = "sha256-u1YttUkeA/vplXuQs27K38uqDZyBxXZHcbqz7ywRrVY="; + }; + ignore = [ + "wlroots" + "hwdata" + "libdisplay-info" + "lcms2" + ]; + args = lib.filterAttrs (n: _v: (!builtins.elem n ignore)) args_; +in +(wlroots.override args).overrideAttrs (old: { + version = "${metadata.rev}"; + buildInputs = old.buildInputs ++ [ + hwdata + libdisplay-info + lcms2 + ]; + src = fetchFromGitLab { + inherit (metadata) + domain + owner + repo + rev + sha256 + ; + }; +}) |
