diff options
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | machines/x1-pincer.nix | 15 | ||||
| -rw-r--r-- | modules/common.nix | 5 | ||||
| -rw-r--r-- | modules/desktop.nix | 31 | ||||
| -rw-r--r-- | modules/router.nix | 1 |
5 files changed, 45 insertions, 37 deletions
@@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1677969766, - "narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", + "lastModified": 1682101079, + "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", "owner": "ryantm", "repo": "agenix", - "rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", + "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", "type": "github" }, "original": { @@ -49,11 +49,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1678559044, - "narHash": "sha256-5Ce/IjDdApIzGAr5Yuk5nemiAMPc2pSHnWnLGDHmTLI=", + "lastModified": 1682154745, + "narHash": "sha256-oLN4vmK3ssPzB94X7gzsBky50j5AOqg6Kv+f9pBARe0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "72f135581fa189c5c3829bb668fcaf456850d9de", + "rev": "4c0a35e80513bd77fdf8291a820f8eea844be56c", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1678397099, - "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1678470307, - "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=", + "lastModified": 1681920287, + "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f", + "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1678426640, - "narHash": "sha256-3Q4KN0XAXQT7YE3A8n3LzLtRNUCo0U++W3gl+5NhKHs=", + "lastModified": 1681932375, + "narHash": "sha256-tSXbYmpnKSSWpzOrs27ie8X3I0yqKA6AuCzCYNtwbCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "824f886682fc893e6dbf27114e5001ebf2770ea1", + "rev": "3d302c67ab8647327dba84fbdb443cdbf0e82744", "type": "github" }, "original": { diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix index abf0c4a..50de352 100644 --- a/machines/x1-pincer.nix +++ b/machines/x1-pincer.nix @@ -52,7 +52,7 @@ let ports = { programs.xwayland.enable = true; programs.dconf.enable = true; - environment.systemPackages = with pkgs; [ river ]; + # environment.systemPackages = with pkgs; [ river ]; programs.sway = { enable = true; @@ -68,19 +68,6 @@ let ports = { foot ]; }; - services.xserver.displayManager.session = [ - { - manage = "window"; - name = "river"; - start = '' - XKB_DEFAULT_LAYOUT="us(dvorak)" - XKB_DEFAULT_OPTIONS="caps:ctrl_modifier,compose:ralt" - ${pkgs.river}/bin/river & - waitPID=$! - ''; - } - ]; - # services.displayManager.slim.enable = lib.mkForce false; # services.xserver.desktopManager.kodi.enable = true; 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 } |