diff --git a/flake.nix b/flake.nix index ac8e02e..f79b36d 100644 --- a/flake.nix +++ b/flake.nix @@ -85,7 +85,6 @@ inherit system; specialArgs = { inherit inputs outputs system; - inherit (outputs) colors font; flake = self; }; modules = @@ -114,7 +113,7 @@ # in # home-manager.lib.homeManagerConfiguration { # pkgs = nixpkgs.legacyPackages.${system}; - # extraSpecialArgs = {inherit inputs outputs system colors font;}; + # extraSpecialArgs = {inherit inputs outputs system;}; # modules = with outputs.homeManagerModules; [macos]; # }; }; diff --git a/modules/home-manager/foxtrot.nix b/modules/home-manager/foxtrot.nix deleted file mode 100644 index 4e0bdfb..0000000 --- a/modules/home-manager/foxtrot.nix +++ /dev/null @@ -1,33 +0,0 @@ -{outputs, ...}: let - scale = 1.25; -in { - imports = with outputs.homeManagerModules; [ - sway - sway-laptop - # hyprland - ]; - - home = { - stateVersion = "24.05"; - }; - - wayland.windowManager.hyprland = { - settings = { - # See https://wiki.hyprland.org/Configuring/Keywords/ for more - monitor = [ - "eDP-1,2256x1504@60,0x0,${toString scale}" - ]; - }; - }; - - wayland.windowManager.sway = { - config = { - output = { - "BOE 0x0BCA Unknown" = { - mode = "2256x1504@60Hz"; - scale = toString scale; - }; - }; - }; - }; -} diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix index d8527f2..3865c88 100644 --- a/modules/home-manager/sway.nix +++ b/modules/home-manager/sway.nix @@ -8,11 +8,11 @@ ... }: { imports = with outputs.homeManagerModules; [ - linux - waybar - mako - swaylock - linux-desktop + # linux + # waybar + # mako + # swaylock + # linux-desktop ]; programs.wofi = { diff --git a/modules/nixos/daniel.nix b/modules/nixos/daniel.nix index 1f7f6d1..aee4fb8 100644 --- a/modules/nixos/daniel.nix +++ b/modules/nixos/daniel.nix @@ -1,5 +1,14 @@ -{outputs, ...}: { +{ + inputs, + system, + outputs, + ... +}: { home-manager = { + extraSpecialArgs = { + inherit inputs outputs system; + inherit (outputs) colors font; + }; users.daniel = { # TODO: specify an email? accounts.email.accounts = { diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index 33cb47b..ad19178 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -6,7 +6,9 @@ # config, pkgs, ... -}: { +}: let + scale = 1.25; +in { networking.hostName = "foxtrot"; imports = @@ -22,6 +24,38 @@ # hyprland ]); + home-manager.users.daniel = { + imports = with outputs.homeManagerModules; [ + sway + # sway-laptop + # hyprland + ]; + + home = { + stateVersion = "24.05"; + }; + + wayland.windowManager.hyprland = { + settings = { + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + monitor = [ + "eDP-1,2256x1504@60,0x0,${toString scale}" + ]; + }; + }; + + wayland.windowManager.sway = { + config = { + output = { + "BOE 0x0BCA Unknown" = { + mode = "2256x1504@60Hz"; + scale = toString scale; + }; + }; + }; + }; + }; + # use updated ppd for framework 13: # source: https://community.frame.work/t/tracking-ppd-v-tlp-for-amd-ryzen-7040/39423/137?u=lytedev nixpkgs.overlays = [ diff --git a/nixos/router.nix b/nixos/router.nix index c856d0f..c0cb981 100644 --- a/nixos/router.nix +++ b/nixos/router.nix @@ -1,6 +1,5 @@ { flake, - inputs, lib, # outputs, # config,