diff --git a/hosts/fungus/home-manager.nix b/hosts/fungus/home-manager.nix index 2f414d2..9110720 100644 --- a/hosts/fungus/home-manager.nix +++ b/hosts/fungus/home-manager.nix @@ -1,29 +1,9 @@ { conifg, pkgs, ... }: { imports = [ - ../../home-manager/hyprland.nix - ../../home-manager/tofi.nix ../../home-manager/direnv.nix ]; home.packages = with pkgs; [ - vscode - vivaldi - discord - helvum - obs-studio - superfile - plemoljp - plemoljp-nf - prismlauncher - scrcpy - tetrio-desktop - kicad - blender-hip - gimp - inkscape - obsidian - zed-editor - easyeffects ]; programs.git = { enable = true; diff --git a/hosts/fungus/nixos.nix b/hosts/fungus/nixos.nix index 5925e48..750e92e 100644 --- a/hosts/fungus/nixos.nix +++ b/hosts/fungus/nixos.nix @@ -19,7 +19,9 @@ environment.systemPackages = with pkgs; [ ]; - boot.loader.systemd-boot.enable = true; + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.useOSProber = true; boot.loader.efi.canTouchEfiVariables = true; users.users.${username} = { @@ -28,6 +30,8 @@ ]; shell = pkgs.fish; openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBd45JtvgM44KUqhp3Xl2Wtt6rmxU13c/84YLyGKigkG hare@nixos" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZTkjrLwH+jsSHF/LI23+WPQ9rff9vWBH1VaxSjNADIIKDY7vGkWWRUCImt8QTzied3mNFv+EyZ8igiJdm5tEO1KkrWUqTZk5Ut79LTQftB23SDNC8XzuHKxwaKHdwZIP065biRFUqNYHu8h0EHKbQ3Djj6cZYBcEL1JOc0wtm4jmuW6Fp3rCn/ZCo0g3Kg7SfY4cpf4fJTB97bIjPJzG7JSSOuTkJcDQzFrySUPOpgrt5+iSqKJ/tQtfxLHcNq8AMrh1fH6sUzaJLmMs/7V9LTbsbILTY4YQj5FF07dBqEJBwvZ9sRTPPzl/HSdVmp9OlCZnryPbjTKJmK1Nxx+tOZfh4IY3mWWnEegvDNCYwKJu+d+zeqDaSUMx0kpAnK9PLSI0By8FtboRVvSFSce6FouiUhEzJyKXAr3E1JCgQXdLcTTb66rbBcauuqhuieKDGPpz45EbFi83uHNeDodi5b75h5r1Nn+oJmzagwUAoyw4gCCbiYwTAe3GA79LK7kE= hare@hr-r620" ]; }; programs.nix-ld.enable = true; @@ -36,6 +40,7 @@ networking.firewall.allowedTCPPorts = [ 22 + 25565 ]; networking.firewall.allowedUDPPorts = [ ]; }