diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nixos/services.nix | 5 | ||||
| -rw-r--r-- | modules/nixos/sway.nix | 60 | ||||
| -rw-r--r-- | modules/nixos/system-packages.nix | 45 | ||||
| -rw-r--r-- | modules/user-profiles/defin.nix | 12 |
4 files changed, 71 insertions, 51 deletions
diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index c0cd4e8..6ad8594 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -24,7 +24,10 @@ # Enable the Plasma 5 Desktop Environment. desktopManager.plasma5.enable = true; displayManager = { - sddm.enable = true; + sddm = { + enable = true; + autoNumlock = true; + }; # defaultSession = "plasmawayland"; }; }; diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index f2f616c..f431759 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -1,6 +1,66 @@ { config, pkgs, lib, ... }: +let + # bash script to let dbus know about important env variables and + # propagate them to relevent services run at the end of sway config + # see + # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist + # note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts + # some user services to make sure they have the correct environment variables + dbus-sway-environment = pkgs.writeTextFile { + name = "dbus-sway-environment"; + destination = "/bin/dbus-sway-environment"; + executable = true; + + text = '' + dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway + systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr + systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr + ''; + }; + + # currently, there is some friction between sway and gtk: + # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland + # the suggested way to set gtk settings is with gsettings + # for gsettings to work, we need to tell it where the schemas are + # using the XDG_DATA_DIR environment variable + # run at the end of sway config + configure-gtk = pkgs.writeTextFile { + name = "configure-gtk"; + destination = "/bin/configure-gtk"; + executable = true; + text = let + schema = pkgs.gsettings-desktop-schemas; + datadir = "${schema}/share/gsettings-schemas/${schema.name}"; + in '' + export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS + gnome_schema=org.gnome.desktop.interface + gsettings set $gnome_schema gtk-theme 'Dracula' + ''; + }; + +in + { environment.systemPackages = with pkgs; [ + #For sway + alacritty # gpu accelerated terminal + dbus-sway-environment + configure-gtk + wayland + waybar + xdg-utils # for opening default programs when clicking links + glib # gsettings + dracula-theme # gtk theme + gnome3.adwaita-icon-theme # default gnome cursors + swaylock + swayidle + grim # screenshot functionality + slurp # screenshot functionality + bemenu # wayland clone of dmenu + mako # notification system developed by swaywm maintainer + wdisplays # tool to configure displays + wofi + (writeShellScriptBin "rofi" "exec -a $0 ${wofi}/bin/wofi $@") #Lets qutebrowser select passwords ]; # xdg-desktop-portal works by exposing a series of D-Bus interfaces diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix index 6c7f9f0..dc73fb8 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -1,47 +1,4 @@ -{ pkgs, ...}: -let - - # bash script to let dbus know about important env variables and - # propagate them to relevent services run at the end of sway config - # see - # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist - # note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts - # some user services to make sure they have the correct environment variables - dbus-sway-environment = pkgs.writeTextFile { - name = "dbus-sway-environment"; - destination = "/bin/dbus-sway-environment"; - executable = true; - - text = '' - dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway - systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr - systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr - ''; - }; - - # currently, there is some friction between sway and gtk: - # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland - # the suggested way to set gtk settings is with gsettings - # for gsettings to work, we need to tell it where the schemas are - # using the XDG_DATA_DIR environment variable - # run at the end of sway config - configure-gtk = pkgs.writeTextFile { - name = "configure-gtk"; - destination = "/bin/configure-gtk"; - executable = true; - text = let - schema = pkgs.gsettings-desktop-schemas; - datadir = "${schema}/share/gsettings-schemas/${schema.name}"; - in '' - export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS - gnome_schema=org.gnome.desktop.interface - gsettings set $gnome_schema gtk-theme 'Dracula' - ''; - }; - -in - -{ +{ pkgs, ...}: { programs.partition-manager.enable = true; environment.systemPackages = with pkgs; [ #For root diff --git a/modules/user-profiles/defin.nix b/modules/user-profiles/defin.nix index 36b3cbc..58e496e 100644 --- a/modules/user-profiles/defin.nix +++ b/modules/user-profiles/defin.nix @@ -11,12 +11,12 @@ shell = pkgs.nushell; hashedPassword = "$6$UljPNAdxZ22lP3Bc$8VaEAacZxtXM3Zji2IA7Jf5fXs9pFnAVQff1d8IbfFOKCvjibceyopOAjRXa8lXtpOSJgPW1OO1dzOspqhWnz0"; - # oppenssh.authorizedKeys.keyFiles = [ - # (builtins.fetchurl { - # url = "https://gitlab.com/dFinlinson.keys"; - # sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; - # }) - # ]; + openssh.authorizedKeys.keyFiles = [ + (builtins.fetchurl { + url = "https://gitlab.com/dFinlinson.keys"; + sha256 = "05mmvw190j6dp756bsqp3ssjyv2hq6r8cpc03wzvzgf2bhdg4dvb"; + }) + ]; }; }; |