diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2023-04-22 18:43:34 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2023-04-22 18:43:34 -0400 |
| commit | 4e37880f0d20c401dcdf63f7b30601445f53165f (patch) | |
| tree | 13442aa24b3595716b40efd8c2880f518a840a0e /modules | |
| parent | f6e57dd288edadfe5e8e72e15cbe071a30bdefb9 (diff) | |
Update
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/common.nix | 5 | ||||
| -rw-r--r-- | modules/desktop.nix | 31 | ||||
| -rw-r--r-- | modules/router.nix | 1 |
3 files changed, 29 insertions, 8 deletions
diff --git a/modules/common.nix b/modules/common.nix index 6b7b479..6e81120 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -35,8 +35,8 @@ dnsutils binutils #emacs - #emacsPgtkNativeComp - pkgs.unstable.emacsNativeComp + emacsPgtk + #pkgs.unstable.emacsNativeComp exa fd fzf @@ -109,6 +109,7 @@ ''; }; + services.emacs.package = pkgs.emacsPgtk; services.emacs.enable = true; boot.cleanTmpDir = true; diff --git a/modules/desktop.nix b/modules/desktop.nix index 15f1112..752d264 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -14,6 +14,9 @@ in { programs.kdeconnect.enable = true; xdg.portal.enable = true; + xdg.portal.wlr.enable = true; + xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-kde]; + services.dbus.enable = true; location.latitude = 40.0; location.longitude = -74.0; @@ -26,11 +29,14 @@ in { nixpkgs.overlays = [ (final: prev: { xmonad = (prev.xmonad-with-packages.override { - packages = self: [ self.xmonad-contrib self.xmonad-extras ]; - }); - #.overrideAttrs (oldAttrs: rec { - # buildInputs = oldAttrs.buildInputs + [ pkgs.xlibs.libXft ]; - #}); + packages = self: [ self.xmonad-contrib self.xmonad-extras ]; + }); + }) + (final: prev: { + river = final.unstable.river; + lswt = final.unstable.lswt; + swayidle = final.unstable.swayidle; + swaylock = final.unstable.swaylock; }) ]; @@ -76,6 +82,18 @@ in { }; environment.systemPackages = with pkgs; [ + # Wayland packages + river + waybar + light + playerctl + swaylock + swayidle + grim + wlopm + wev + lswt + (conky.override { pulseSupport = true; }) wezterm anki @@ -165,7 +183,8 @@ in { extraPackages = hpkgs: [ hpkgs.xmobar hpkgs.split ]; }; - displayManager.lightdm.enable = true; + displayManager.sddm.enable = true; + displayManager.sessionPackages = with pkgs; [ river ]; }; # redshift = { diff --git a/modules/router.nix b/modules/router.nix index 29c198c..e3ac754 100644 --- a/modules/router.nix +++ b/modules/router.nix @@ -235,6 +235,7 @@ let table inet nat { chain prerouting { type nat hook prerouting priority -100; policy accept + meta nfproto ipv4 iifname wan-vport tcp dport 20000 counter dnat to 172.20.100.214 meta nfproto ipv4 iifname wan-vport tcp dport $SERVER_WAN_PORTS counter dnat to 172.20.20.2 meta nfproto ipv4 iifname mullvad tcp dport 56732 counter dnat to 172.20.20.2 } |