wymiller/nix-config-v2
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

things

Browse Source
This commit is contained in:
Wyatt J. Miller
2025-06-24 19:27:32 -04:00
parent a7d2db9c84
commit 2544ef3d94
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -47,7 +47,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = extraSpecialArgs;
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
home-manager.users.${userName} = import ./home;
}
];
@ -70,7 +70,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = extraSpecialArgs;
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
home-manager.users.${userName}.imports = [
./home
];
@ -94,7 +94,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = extraSpecialArgs;
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "server"; };
home-manager.users.${userName}.imports = [
./home
];

2
home/browser.nix
View File

@ -1,7 +1,7 @@
{
role,
pkgs,
lib,
role,
...
}: {
programs.firefox = {

3
home/default.nix
View File

@ -4,6 +4,7 @@
userName,
userEmail,
ghostty,
role,
...
}: let
# Have a file sturcture that holds all the configuration files that can't be configured by Nix
@ -13,7 +14,7 @@
};
in {
# Import sub modules
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty role;}) [
./atuin.nix
./shell.nix
./packages

10
home/sway.nix
View File

@ -1,8 +1,10 @@
{
lib,
pkgs,
role,
...
}: let
isDevel = pkgs.stdenv.isLinux && role == "devel";
dirs = {
defaults = ../defaults;
};
@ -16,7 +18,7 @@
};
in {
wayland.windowManager.sway = {
enable = pkgs.stdenv.isLinux;
enable = isDevel;
extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
xwayland = true;
systemd.enable = true;
@ -29,11 +31,11 @@ in {
xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
programs.rofi.enable = pkgs.stdenv.isLinux;
services.mako.enable = pkgs.stdenv.isLinux;
programs.rofi.enable = isDevel;
services.mako.enable = isDevel;
programs.waybar = {
enable = pkgs.stdenv.isLinux;
enable = isDevel;
systemd.enable = true;
package = pkgs.waybar.overrideAttrs (old: {

10
modules/machine/valefor/configuration.nix
View File

@ -104,9 +104,9 @@
# Add username to groups "wheel" and "video" - more may be added here later
users.users.${userName} = {
extraGroups = ["wheel" "podman" "network"];
openssh.authorizedKeys.keys = ''
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com
'';
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
];
};
# Add Home Assistant service
@ -127,9 +127,5 @@
security.sudo.wheelNeedsPassword = false;
users.users."wyatt".openssh.authorizedKeys.keys = ''
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com
'';
system.stateVersion = "24.11";
}