diff options
| -rw-r--r-- | configuration.nix | 4 | ||||
| -rw-r--r-- | hosts/cez.nix (renamed from hardware/cez.nix) | 8 | ||||
| -rw-r--r-- | hosts/kay.nix (renamed from hardware/kay.nix) | 2 | ||||
| -rw-r--r-- | modules/dev.nix (renamed from features/development.nix) | 2 | ||||
| -rw-r--r-- | modules/kaysshfs.nix (renamed from features/kaysshfs.nix) | 6 | ||||
| -rw-r--r-- | modules/wayland.nix (renamed from features/wayland.nix) | 2 | ||||
| -rw-r--r-- | modules/xdp.nix (renamed from features/xdp.nix) | 2 | ||||
| -rw-r--r-- | overlays/dwl-sinan.nix | 4 | ||||
| -rw-r--r-- | overlays/wmenu-sinan.nix | 4 |
9 files changed, 14 insertions, 20 deletions
diff --git a/configuration.nix b/configuration.nix index 68a6159..9c4febb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, options, ... }: +{ pkgs, options, ... }: let user = "sinan"; @@ -6,7 +6,7 @@ in { imports = [ ./hardware-configuration.nix # hw scan - ./hardware/cez.nix + ./hosts/cez.nix ]; # boot diff --git a/hardware/cez.nix b/hosts/cez.nix index dd46c86..dfac196 100644 --- a/hardware/cez.nix +++ b/hosts/cez.nix @@ -1,10 +1,10 @@ -{ config, ... }: +{ ... }: { imports = [ - ../features/wayland.nix - ../features/kaysshfs.nix - ../features/development.nix + ../modules/wayland.nix + ../modules/kaysshfs.nix + ../modules/dev.nix ]; boot = { diff --git a/hardware/kay.nix b/hosts/kay.nix index a79c1fc..49a17c0 100644 --- a/hardware/kay.nix +++ b/hosts/kay.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ tmux ]; diff --git a/features/development.nix b/modules/dev.nix index 464b2e0..75e0967 100644 --- a/features/development.nix +++ b/modules/dev.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ diff --git a/features/kaysshfs.nix b/modules/kaysshfs.nix index 83cb68e..c526927 100644 --- a/features/kaysshfs.nix +++ b/modules/kaysshfs.nix @@ -1,9 +1,7 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { - system.fsPackages = with pkgs; [ - sshfs - ]; + system.fsPackages = with pkgs; [ sshfs ]; fileSystems."/mnt/kay" = { device = "sinansftp@sinanmohd.com:"; diff --git a/features/wayland.nix b/modules/wayland.nix index 1eb1289..65eb0e0 100644 --- a/features/wayland.nix +++ b/modules/wayland.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { # pkgs diff --git a/features/xdp.nix b/modules/xdp.nix index 98d97a4..a7adfa5 100644 --- a/features/xdp.nix +++ b/modules/xdp.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: let # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist diff --git a/overlays/dwl-sinan.nix b/overlays/dwl-sinan.nix index ff5c999..b3c39b0 100644 --- a/overlays/dwl-sinan.nix +++ b/overlays/dwl-sinan.nix @@ -1,6 +1,4 @@ -final: prev: - -{ +final: prev: { dwl-sinan = prev.dwl.overrideAttrs (finalAttrs: prevAttrs: { pname = prevAttrs.pname + "-sinan"; diff --git a/overlays/wmenu-sinan.nix b/overlays/wmenu-sinan.nix index c304efb..c525ab9 100644 --- a/overlays/wmenu-sinan.nix +++ b/overlays/wmenu-sinan.nix @@ -1,6 +1,4 @@ -final: prev: - -{ +final: prev: { wmenu-sinan = prev.wmenu.overrideAttrs (finalAttrs: prevAttrs: { pname = prevAttrs.pname + "-sinan"; |