diff --git a/common/globals.nix b/common/globals.nix index baa25bb..1c9e149 100644 --- a/common/globals.nix +++ b/common/globals.nix @@ -9,13 +9,13 @@ zsh.prompt = "\n%B%F{cyan}%m:%F{blue}%~\n%F{green}$ %f%"; zsh.rprompt = "%B%F{red}%*%f%b"; - timezone = "America/Vancouver"; + timezone = "America/Edmonton"; username = "willem"; wallpapers = import ./wallpapers.nix; - sshAuthorizedKeyFiles = [./sshpubkeys/willem-nixbox ./sshpubkeys/willem-thinkpad ./sshpubkeys/willem-zeus]; + sshAuthorizedKeyFiles = [./sshpubkeys/willem-nixbox ./sshpubkeys/willem-thinkpad ./sshpubkeys/willem-zeus ./sshpubkeys/willem-evrlaptop]; zerotier.networks = ["17d709436ca2929d"]; } diff --git a/common/sshpubkeys/willem-evrlaptop b/common/sshpubkeys/willem-evrlaptop new file mode 100644 index 0000000..bbeff43 --- /dev/null +++ b/common/sshpubkeys/willem-evrlaptop @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDIN4HCNvddK9tFW8szanz5Msd6h4l6XzjWAdnSMJeR6 evr\wleitso@SPOL2186861 diff --git a/home/default.nix b/home/default.nix index d96ddfd..51f977c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -9,13 +9,9 @@ ./programs/default.nix ./modules/nix/pkgs-config.nix ./modules/nix/use-flake-pkgs.nix - ../common/stylix.nix inputs.nix-index-database.hmModules.nix-index - inputs.stylix.homeManagerModules.stylix ]; - stylix.enable = true; - home = { username = globals.username; diff --git a/home/packages.nix b/home/packages.nix index 839e093..8d8048e 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -3,57 +3,33 @@ lib, inputs, ... -}: let - node-packages = with pkgs.nodePackages; [ - bash-language-server - prettier +}: { + home.packages = with pkgs; [ + bash + bat + cachix + coreutils + curl + devenv + fd + findutils + gawk + jq + nix-tree + nix-zsh-completions + nixfmt-classic + nixpkgs-fmt + nmap + openssh + pass-git-helper + pinentry-curses + pv + ripgrep + rsync + sqlite + tealdeer + unzip + yq + zsh-completions ]; - fenix-rust = pkgs.fenix.combine (with pkgs.fenix; [ - latest.toolchain - targets.thumbv7em-none-eabihf.latest.rust-std - ]); - extras = [fenix-rust] ++ node-packages; -in { - home.packages = - (with pkgs; [ - alejandra - bash - bat - black - cachix - coreutils - curl - docker - docker-compose - dotnet-sdk - fd - findutils - gawk - git-crypt - jq - nix-tree - nix-zsh-completions - nixfmt-classic - nixpkgs-fmt - nmap - nodejs - omnisharp-roslyn - openssh - pass-git-helper - pinentry-curses - pv - ripgrep - rsync - shellcheck - shfmt - sqlite - tealdeer - unzip - vhdl-ls - yq - vhdl-ls - vscode-langservers-extracted - zsh-completions - ]) - ++ extras; } diff --git a/nixos/profiles/hyprland.nix b/nixos/profiles/hyprland.nix index 2aafeb1..3ac6187 100644 --- a/nixos/profiles/hyprland.nix +++ b/nixos/profiles/hyprland.nix @@ -11,6 +11,8 @@ in { ../modules/lemurs.nix ]; + programs.steam.enable = true; + programs.hyprland.enable = true; programs.hyprland.package = hyprpkgs.hyprland; programs.hyprland.portalPackage = hyprpkgs.xdg-desktop-portal-hyprland;