diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/common.nix | 2 | ||||
| -rw-r--r-- | nixos/lindy.nix | 5 | ||||
| -rw-r--r-- | nixos/wayfire.nix | 26 | ||||
| -rw-r--r-- | nixos/wmonly.nix | 8 |
4 files changed, 24 insertions, 17 deletions
diff --git a/nixos/common.nix b/nixos/common.nix index 525a49e..b0eaab2 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -166,7 +166,7 @@ # ---- config for japanese (thx functor.tokyo) - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ profont symbola font-awesome diff --git a/nixos/lindy.nix b/nixos/lindy.nix index c9331fa..a1f59c4 100644 --- a/nixos/lindy.nix +++ b/nixos/lindy.nix @@ -4,10 +4,11 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ./common.nix - ./kde.nix + #./kde.nix #./95theme.nix #./gnome.nix #./fdn-vpn.nix + ./wayfire.nix ]; networking.hostName = "lindy"; @@ -108,7 +109,7 @@ Komaru UUID=caf8496f-006b-4762-bb20-506d4c7bdb51 /nix/persist/root/komaru_key # ---- immutable user config ---- users.mutableUsers = false; - users.users.lx.passwordFile = "/home/lx/.password"; + users.users.lx.hashedPasswordFile = "/home/lx/.password"; users.users.lx.uid = 1000; # ---- diff --git a/nixos/wayfire.nix b/nixos/wayfire.nix index 772902d..10ae1f6 100644 --- a/nixos/wayfire.nix +++ b/nixos/wayfire.nix @@ -9,24 +9,22 @@ security.pam.services.swaylock = {}; environment.systemPackages = with pkgs; [ - wayfire-with-plugins - wayfirePlugins.wcm - wayfirePlugins.wf-shell - waybar - alacritty - swaylock + # ---- wayfire ---- + #wayfire-with-plugins + #wayfirePlugins.wcm + #wayfirePlugins.wf-shell + # ---- sway ---- swayfx swaybg - swayimg bemenu + swayimg - gnome.adwaita-icon-theme - - gnome.nautilus - gnome.eog - gnome.gedit - gnome.file-roller - evince + # ---- common utils ---- + xdg-desktop-portal-wlr + waybar + alacritty + swaylock + wdisplays ]; } diff --git a/nixos/wmonly.nix b/nixos/wmonly.nix index d45c176..2f1b2f1 100644 --- a/nixos/wmonly.nix +++ b/nixos/wmonly.nix @@ -15,7 +15,15 @@ dmenu feh acpi + playerctl libreoffice-still geany + gnome.nautilus + gnome.eog + gnome.gedit + gnome.file-roller + evince + + gnome.adwaita-icon-theme ]; } |