diff options
| -rw-r--r-- | common.nix (renamed from hosts/common.nix) | 8 | ||||
| -rw-r--r-- | hosts/cez/configuration.nix | 10 | ||||
| -rw-r--r-- | hosts/cez/modules/sshfs.nix (renamed from modules/sshfs.nix) | 0 | ||||
| -rw-r--r-- | hosts/cez/modules/wayland.nix (renamed from modules/wayland.nix) | 4 | ||||
| -rw-r--r-- | hosts/cez/overlays/wmenu.nix (renamed from overlays/wmenu-cez/default.nix) | 2 | ||||
| -rw-r--r-- | hosts/kay/configuration.nix | 2 | ||||
| -rw-r--r-- | overlays/default.nix | 4 | ||||
| -rw-r--r-- | overlays/dwl-sinan.nix (renamed from overlays/dwl-sinan/default.nix) | 0 |
8 files changed, 16 insertions, 14 deletions
diff --git a/hosts/common.nix b/common.nix index 8cc13d8..31fedc9 100644 --- a/hosts/common.nix +++ b/common.nix @@ -7,8 +7,8 @@ let in { imports = [ - ../modules/userdata.nix - ../modules/dev.nix + ./modules/userdata.nix + ./modules/dev.nix ]; # boot @@ -73,7 +73,9 @@ in "flakes" "nix-command" ]; - nixpkgs.overlays = (import ../overlays); + nixpkgs.overlays = [ + (import ./overlays/dwl-sinan.nix) + ]; # sops sops = { diff --git a/hosts/cez/configuration.nix b/hosts/cez/configuration.nix index ac2d2ea..fb991d9 100644 --- a/hosts/cez/configuration.nix +++ b/hosts/cez/configuration.nix @@ -6,9 +6,13 @@ in { imports = [ ./hardware-configuration.nix - ../../modules/wayland.nix - ../../modules/sshfs.nix - ../common.nix + ./modules/wayland.nix + ./modules/sshfs.nix + ../../common.nix + ]; + + nixpkgs.overlays = [ + (import ./overlays/wmenu.nix) ]; boot = { diff --git a/modules/sshfs.nix b/hosts/cez/modules/sshfs.nix index a1f1904..a1f1904 100644 --- a/modules/sshfs.nix +++ b/hosts/cez/modules/sshfs.nix diff --git a/modules/wayland.nix b/hosts/cez/modules/wayland.nix index 7af2f51..98a8540 100644 --- a/modules/wayland.nix +++ b/hosts/cez/modules/wayland.nix @@ -4,12 +4,12 @@ let user = config.userdata.user; in { - imports = [ ./seatd.nix ]; + imports = [ ../../../modules/seatd.nix ]; # pkgs environment.systemPackages = with pkgs; [ dwl-sinan - wmenu-sinan + wmenu pinentry-gnome swaylock swayidle diff --git a/overlays/wmenu-cez/default.nix b/hosts/cez/overlays/wmenu.nix index c304efb..cad340b 100644 --- a/overlays/wmenu-cez/default.nix +++ b/hosts/cez/overlays/wmenu.nix @@ -1,7 +1,7 @@ final: prev: { - wmenu-sinan = prev.wmenu.overrideAttrs (finalAttrs: prevAttrs: + wmenu = prev.wmenu.overrideAttrs (finalAttrs: prevAttrs: { pname = prevAttrs.pname + "-sinan"; postPatch = '' diff --git a/hosts/kay/configuration.nix b/hosts/kay/configuration.nix index 74d49e6..da92a83 100644 --- a/hosts/kay/configuration.nix +++ b/hosts/kay/configuration.nix @@ -3,7 +3,7 @@ { imports = [ ./hardware-configuration.nix - ../common.nix + ../../common.nix ]; networking.hostName = "kay"; diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index b880f32..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -[ - (import ./dwl-sinan) - (import ./wmenu-cez) -] diff --git a/overlays/dwl-sinan/default.nix b/overlays/dwl-sinan.nix index ff5c999..ff5c999 100644 --- a/overlays/dwl-sinan/default.nix +++ b/overlays/dwl-sinan.nix |