diff --git a/README.md b/README.md index ddd62e6..926e236 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ ZaneyOS is a simple way of reproducing my configuration on any NixOS system. Thi -> **This project has a [Wiki](https://zaney.org/zaneyos-2.0/). Find out how to use ZaneyOS here!** -> **I have put a lot of effort into the [documentation](https://zaney.org/zaneyos-2.0/) so it should be accurate. However, please if you notice that something is wrong with it create an issue or reach out to me on Discord.** +> **This project has a [Wiki](https://zaney.org/zaneyos-2.2/). Find out how to use ZaneyOS here!** +> **I have put a lot of effort into the [documentation](https://zaney.org/zaneyos-2.2/) so it should be accurate. However, please if you notice that something is wrong with it create an issue or reach out to me on Discord.** #### 🍖 Requirements - You must be running on NixOS. @@ -38,7 +38,7 @@ ZaneyOS is a simple way of reproducing my configuration on any NixOS system. Thi
-Please do yourself a favor and [read the wiki](https://zaney.org/zaneyos-2.0/). +Please do yourself a favor and [read the wiki](https://zaney.org/zaneyos-2.2/).
diff --git a/config/fonts/JetBrainsMono.ttf b/config/fonts/JetBrainsMono.ttf deleted file mode 100644 index 31e03a2..0000000 Binary files a/config/fonts/JetBrainsMono.ttf and /dev/null differ diff --git a/config/fonts/NotoColorEmoji.ttf b/config/fonts/NotoColorEmoji.ttf deleted file mode 100644 index cf7a47e..0000000 Binary files a/config/fonts/NotoColorEmoji.ttf and /dev/null differ diff --git a/config/fonts/Symbols-Regular.ttf b/config/fonts/Symbols-Regular.ttf deleted file mode 100644 index 7ef73a9..0000000 Binary files a/config/fonts/Symbols-Regular.ttf and /dev/null differ diff --git a/config/fonts/UniSans-Heavy.otf b/config/fonts/UniSans-Heavy.otf deleted file mode 100644 index facd333..0000000 Binary files a/config/fonts/UniSans-Heavy.otf and /dev/null differ diff --git a/hosts/familypc/config.nix b/hosts/familypc/config.nix index c541c61..7ed67ce 100644 --- a/hosts/familypc/config.nix +++ b/hosts/familypc/config.nix @@ -80,12 +80,12 @@ name = "JetBrainsMono Nerd Font Mono"; }; sansSerif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans"; + package = pkgs.montserrat; + name = "Montserrat"; }; serif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; + package = pkgs.montserrat; + name = "Montserrat"; }; sizes = { applications = 12; @@ -303,7 +303,6 @@ fonts = { packages = with pkgs; [ - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) noto-fonts-emoji noto-fonts-cjk font-awesome @@ -313,7 +312,7 @@ }; environment.variables = { - ZANEYOS_VERSION = "2.1"; + ZANEYOS_VERSION = "2.2"; ZANEYOS = "true"; }; @@ -364,7 +363,10 @@ gvfs.enable = true; openssh.enable = true; flatpak.enable = false; - printing.enable = true; + printing = { + enable = true; + drivers = [ pkgs.hplipWithPlugin ]; + }; gnome.gnome-keyring.enable = true; avahi = { enable = true; diff --git a/hosts/familypc/home.nix b/hosts/familypc/home.nix index 44c7cc1..c83fc2c 100644 --- a/hosts/familypc/home.nix +++ b/hosts/familypc/home.nix @@ -6,10 +6,6 @@ ... }: let - finecmdline = pkgs.vimUtils.buildVimPlugin { - name = "fine-cmdline"; - src = inputs.fine-cmdline; - }; inherit (import ./variables.nix) gitUsername gitEmail; in { @@ -41,10 +37,6 @@ in source = ../../config/wlogout; recursive = true; }; - home.file.".local/share/fonts" = { - source = ../../config/fonts; - recursive = true; - }; home.file.".config/ascii-neofetch".source = ../../config/ascii-neofetch; home.file.".face.icon".source = ../../config/face.jpg; home.file.".config/face.jpg".source = ../../config/face.jpg; diff --git a/install-zaneyos.sh b/install-zaneyos.sh index a0045e0..62c50f4 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -84,4 +84,4 @@ echo "-----" echo "ZaneyOS Has Been Setup" echo "Please Edit Your Hosts Files" -echo "Then Run: sudo nixos-rebuild switch --flake .#${hostName}" +echo "Then Run: sudo nixos-rebuild switch --flake ~/zaneyos/#${hostName}"