diff options
-rw-r--r-- | home-manager/addons/sway-config.nix (renamed from home-manager/sway-config.nix) | 0 | ||||
-rw-r--r-- | home-manager/addons/sway.nix | 25 | ||||
-rw-r--r-- | home-manager/home.nix | 12 | ||||
-rw-r--r-- | nixos/configuration.nix | 6 |
4 files changed, 26 insertions, 17 deletions
diff --git a/home-manager/sway-config.nix b/home-manager/addons/sway-config.nix index c53fb56..c53fb56 100644 --- a/home-manager/sway-config.nix +++ b/home-manager/addons/sway-config.nix diff --git a/home-manager/addons/sway.nix b/home-manager/addons/sway.nix new file mode 100644 index 0000000..e4b3544 --- /dev/null +++ b/home-manager/addons/sway.nix @@ -0,0 +1,25 @@ +{ config, pkgs, theme, ... }: { + home.file = { + ".config/sway/config" = (import ./sway-config.nix {inherit pkgs;}); + }; + + services = { + dunst.enable = true; + + kanshi = { + enable = true; + }; + }; + + programs = { + foot = { + enable = true; + server.enable = true; + }; + }; + + + home.packages = with pkgs; [ + wl-clipboard + ]; +} diff --git a/home-manager/home.nix b/home-manager/home.nix index 100e67d..0db0917 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -18,6 +18,7 @@ in { #./addons/firefox.nix #./addons/alacritty.nix #./addons/xresources.nix + ./addons/sway.nix ]; colorScheme = schemeFromYaml "lux-scheme" (builtins.readFile lux-scheme); @@ -35,7 +36,6 @@ in { ]; home.packages = [ - pkgs.picom pkgs.libnotify pkgs.dmenu-bluetooth @@ -67,8 +67,6 @@ in { #pinentry-program /run/current-system/sw/bin/pinentry pinentry-program /run/current-system/sw/bin/pinentry-gtk-2 ''; - - ".config/sway/config" = (import ./sway-config.nix {inherit pkgs;}); }; dconf = { @@ -103,14 +101,6 @@ in { #}; }; - services = { - dunst.enable = true; - - kanshi = { - enable = true; - }; - }; - programs = { bash = { enable = true; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f55d352..c93ae81 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -251,7 +251,6 @@ # Heavy lazygit - foot firefox gnome.nautilus pika-backup @@ -277,7 +276,6 @@ libreoffice-qt mercury-browser dconf - wl-clipboard # Gnome Apps without Gnome gnome.adwaita-icon-theme libsecret gnome.seahorse @@ -297,10 +295,6 @@ heroic gogdl wdisplays - - # TEMP - jq - sway ] ++ [ #(pkgs.nnn.override { withNerdIcons = true; }) #(pkgs.unstable.callPackage ../pkgs/heroic-launcher { |