diff options
| -rw-r--r-- | configuration.nix | 17 | ||||
| -rw-r--r-- | modules/dev.nix | 4 | ||||
| -rw-r--r-- | modules/wayland.nix | 24 | ||||
| -rw-r--r-- | modules/xdp.nix | 27 |
4 files changed, 21 insertions, 51 deletions
diff --git a/configuration.nix b/configuration.nix index fdac68a..f128856 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,7 @@ -{ pkgs, lib, ... }: +{ config, pkgs, lib, ... }: let - user = "sinan"; + user = config.passthru.user; in { imports = [ @@ -9,6 +9,8 @@ in ./hosts/cez.nix ]; + passthru.user = "sinan"; + # boot boot = { tmp.useTmpfs = true; @@ -35,16 +37,8 @@ in geoipWithDatabase dig nnn - shellcheck ffmpeg - gnumake rtorrent - nixos-option - pass - gcc - lua - luajit - neofetch ps_mem brightnessctl ]; @@ -63,13 +57,10 @@ in unzip bc file - openssl git htop curl neovim - wget - tree ]; }; system.stateVersion = "23.05"; diff --git a/modules/dev.nix b/modules/dev.nix index 75e0967..6a2ee21 100644 --- a/modules/dev.nix +++ b/modules/dev.nix @@ -2,6 +2,10 @@ { environment.systemPackages = with pkgs; [ + shellcheck + pass + gnumake + gcc nodePackages.bash-language-server nil ccls diff --git a/modules/wayland.nix b/modules/wayland.nix index 0c622c7..17b9279 100644 --- a/modules/wayland.nix +++ b/modules/wayland.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { imports = [ ./seatd.nix ]; @@ -6,29 +6,31 @@ # pkgs environment.systemPackages = with pkgs; [ dwl-sinan - zathura + wmenu-sinan pinentry-gnome - mpv - qemu - OVMFFull - element-desktop swaylock swayidle swaybg foot - grim - slurp wl-clipboard - wmenu-sinan mako wayland xdg-utils - imv libnotify wob wlr-randr - tor-browser-bundle-bin + ]; + users.users.${config.passthru.user}.packages = with pkgs; [ + zathura + mpv + imv wtype + tor-browser-bundle-bin + qemu + OVMFFull + element-desktop + grim + slurp ]; # font diff --git a/modules/xdp.nix b/modules/xdp.nix deleted file mode 100644 index a7adfa5..0000000 --- a/modules/xdp.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, ... }: - -let - # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist - dbus-xdp-environment = pkgs.writeTextFile { - name = "dbus-xdp-environment"; - destination = "/bin/dbus-xdp-environment"; - executable = true; - - text = '' - dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=wlroots - systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr - systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr - ''; - }; -in -{ - # pkgs - environment.systemPackages = [ dbus-xdp-environment ]; - - # xdg desktop portal - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - }; -} |