diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 96f3799..e1824ef 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -201,6 +201,12 @@ ]; }; + users.users.roy = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + hashedPassword = "$y$j9T$G2m/EwKgOjFKZPeOuhOIk.$totgh8uu5yizRLnLA9SdBkRrJeGHowXYfkayn7r/Rs1"; + }; + users.users.root = { hashedPassword = "$y$j9T$IjaP0KIfdpEvlLtOn.u0T/$0MJDaFEdSu6zSJ04CF1dtorD6IVgbN3vmDiiwGwwqr5"; openssh.authorizedKeys.keys = [ @@ -234,6 +240,24 @@ wget ]; + fonts.packages = with pkgs; [ + nerd-fonts.mononoki + nerd-fonts.ubuntu-mono + ]; + + programs = { + hyprland = { + enable = true; + xwayland.enable = true; + }; + waybar.enable = true; + fish.enable = true; + fuse.userAllowOther = true; + }; + + environment.variables = { + EDITOR = "nvim"; + }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/nixos/flake.nix b/nixos/flake.nix index 2b3ad16..b8a4abe 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -3,6 +3,10 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixvim = = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; quasiSecrets.url = "git+ssh://git@github.com/RoyDumblauskas/server-semi-secrets?shallow=1"; home-manager = { url = "github:nix-community/home-manager/release-25.05"; @@ -17,6 +21,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; impermanence.url = "github:nix-community/impermanence"; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # This is a path to the services I've declared. # It just happens to be stored in the same repository (relative), # but could well be a separate repository @@ -25,7 +33,7 @@ mc-service.url = "path:../homelab-services/mc-service"; }; - outputs = { self, nixpkgs, home-manager, disko, sops-nix, quasiSecrets, impermanence, tests-service, minio-service, mc-service }@inputs: + outputs = { self, nixpkgs, nixvim, home-manager, disko, sops-nix, quasiSecrets, impermanence, firefox-addons, tests-service, minio-service, mc-service }@inputs: let nodes = [ { @@ -60,6 +68,14 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.sysAdmin = ./home.nix; + home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.roy = { ... }: { + imports = [ + ./home-roy.nix + nixvim.homeManagerModules.nixvim + sops-nix.homeManagerModules.sops + ]; + }; } ]; };