diff --git a/flake.nix b/flake.nix index 080e486..10b2b59 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,8 @@ ./hosts/fenix ./variables.nix { config.var.username = "maya"; - config.var.timezone = "Etc/GMT-8"; }; + config.var.timezone = "Etc/GMT-8"; + config.var.hostname = "fenix"; } home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = { inherit inputs; diff --git a/home/default.nix b/home/default.nix index 9986c9f..f83d162 100644 --- a/home/default.nix +++ b/home/default.nix @@ -9,15 +9,15 @@ stateVersion = "26.05"; shell.enableBashIntegration = true; file = { - ".config/waybar/config".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/newflake/home/waybar/cyberhack" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/newflake/home/waybar/modern"); - ".config/waybar/style.css".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/newflake/home/waybar/cyberhack.css" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/newflake/home/waybar/modern.css"); + ".config/waybar/config".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/cyberhack" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern"); + ".config/waybar/style.css".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/cyberhack.css" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern.css"); }; }; programs.home-manager.enable = true; programs.foot = { enable = true; - settings.main.font = "monospace:size=20"; + settings.main.font = (if vars.user == "alyx" then "monospace:size=20" else "monospace:size=12"); settings.colors.alpha = "0.9"; }; @@ -49,7 +49,7 @@ enable = true; settings = { user.name = vars.user; - user.email = "blankfornow"; + user.email = (if vars.user == "alyx" then "alyxwren@proton.me" else "beanigit@protonmail.com"); commit.gpgsign = true; gpg.format = "ssh"; user.signingKey = "~/.ssh/id_ed25519.pub"; @@ -62,10 +62,13 @@ wayland.windowManager.sway.package = pkgs.swayfx; wayland.windowManager.sway.config = null; wayland.windowManager.sway.extraConfig = '' - include ${config.home.homeDirectory}/newflake/home/wms/sway + include ~/.config/nixos/home/wms/sway ''; wayland.windowManager.sway.checkConfig = false; programs.obs-studio.enable = true; + home.packages = with pkgs; [ + fzf + ]; } diff --git a/home/waybar/modern.css b/home/waybar/modern.css index 9063802..6e21022 100644 --- a/home/waybar/modern.css +++ b/home/waybar/modern.css @@ -26,6 +26,7 @@ @define-color crust #11111b; /* forgive me, above is the contents of catppuccin mocha's waybar css file */ * { + color: #ffffff; font-family: Iosevka NF; } window#waybar { diff --git a/hosts/generic.nix b/hosts/generic.nix index b4f667b..42fcb3a 100644 --- a/hosts/generic.nix +++ b/hosts/generic.nix @@ -113,5 +113,13 @@ ]; + fonts.packages = with pkgs; [ + jetbrains-mono + nerd-fonts.iosevka + noto-fonts + noto-fonts-cjk-sans + noto-fonts-color-emoji + ]; + system.stateVersion = "26.05"; } diff --git a/result b/result new file mode 120000 index 0000000..b301a28 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/arzirp1xdasc0y4dx8rakfs878ps2qwa-nixos-system-fenix-26.05.20260220.6125858 \ No newline at end of file