Compare commits
1 Commits
home-assis
...
ucode-addi
Author | SHA1 | Date | |
---|---|---|---|
8c942769e3 |
@ -1,5 +0,0 @@
|
||||
return {
|
||||
{
|
||||
'andweeb/presence.nvim',
|
||||
}
|
||||
}
|
@ -12,6 +12,7 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
ghostty.url = "github:ghostty-org/ghostty";
|
||||
ucodenix.url = "github:e-tho/ucodenix";
|
||||
};
|
||||
|
||||
outputs = inputs @ {
|
||||
@ -21,6 +22,7 @@
|
||||
darwin,
|
||||
home-manager,
|
||||
ghostty,
|
||||
ucodenix,
|
||||
...
|
||||
}: let
|
||||
userName = "wyatt";
|
||||
@ -47,7 +49,7 @@
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.users.${userName} = import ./home;
|
||||
}
|
||||
];
|
||||
@ -63,6 +65,7 @@
|
||||
};
|
||||
modules = [
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
ucodenix.nixosModules.default
|
||||
./modules/common
|
||||
./modules/machine/cloud
|
||||
|
||||
@ -70,7 +73,7 @@
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.users.${userName}.imports = [
|
||||
./home
|
||||
];
|
||||
@ -94,7 +97,7 @@
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "server"; };
|
||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||
home-manager.users.${userName}.imports = [
|
||||
./home
|
||||
];
|
||||
|
@ -1,5 +1,4 @@
|
||||
{
|
||||
role,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
@ -10,7 +9,7 @@
|
||||
};
|
||||
|
||||
programs.chromium = {
|
||||
enable = pkgs.stdenv.isLinux && role == "devel";
|
||||
enable = pkgs.stdenv.isLinux;
|
||||
package = pkgs.ungoogled-chromium.override {
|
||||
enableWideVine = true;
|
||||
commandLineArgs = [
|
||||
@ -40,15 +39,13 @@
|
||||
# ublock origin
|
||||
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
|
||||
sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
|
||||
# sha256 = lib.fakeSha256;
|
||||
version = "1.64.0";
|
||||
version = "1.63.2";
|
||||
})
|
||||
(createChromiumExtension {
|
||||
# bitwarden
|
||||
id = "nngceckbapebfimnlniiiahkandclblb";
|
||||
sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
|
||||
# sha256 = lib.fakeSha256;
|
||||
version = "2025.5.0";
|
||||
version = "2025.3.1";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
@ -4,7 +4,6 @@
|
||||
userName,
|
||||
userEmail,
|
||||
ghostty,
|
||||
role,
|
||||
...
|
||||
}: let
|
||||
# Have a file sturcture that holds all the configuration files that can't be configured by Nix
|
||||
@ -14,7 +13,7 @@
|
||||
};
|
||||
in {
|
||||
# Import sub modules
|
||||
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty role;}) [
|
||||
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
|
||||
./atuin.nix
|
||||
./shell.nix
|
||||
./packages
|
||||
|
@ -17,7 +17,6 @@
|
||||
push.autoSetupRemote = true;
|
||||
pull.merge = true;
|
||||
merge.tool = "nvimdiff";
|
||||
mergetool.keepBackup = false;
|
||||
};
|
||||
|
||||
ignores = [
|
||||
|
@ -1,10 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
role,
|
||||
...
|
||||
}: let
|
||||
isDevel = pkgs.stdenv.isLinux && role == "devel";
|
||||
dirs = {
|
||||
defaults = ../defaults;
|
||||
};
|
||||
@ -18,7 +16,7 @@
|
||||
};
|
||||
in {
|
||||
wayland.windowManager.sway = {
|
||||
enable = isDevel;
|
||||
enable = pkgs.stdenv.isLinux;
|
||||
extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
|
||||
xwayland = true;
|
||||
systemd.enable = true;
|
||||
@ -31,11 +29,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 = isDevel;
|
||||
services.mako.enable = isDevel;
|
||||
programs.rofi.enable = pkgs.stdenv.isLinux;
|
||||
services.mako.enable = pkgs.stdenv.isLinux;
|
||||
|
||||
programs.waybar = {
|
||||
enable = isDevel;
|
||||
enable = pkgs.stdenv.isLinux;
|
||||
systemd.enable = true;
|
||||
|
||||
package = pkgs.waybar.overrideAttrs (old: {
|
||||
|
@ -24,6 +24,7 @@ in {
|
||||
../../graphics
|
||||
../../pwrMgmt
|
||||
../../networking/core.nix
|
||||
../../security/sudo.nix
|
||||
../../sound/pipewire.nix
|
||||
../../sound/shairport.nix
|
||||
../../virtualization/podman.nix
|
||||
@ -176,5 +177,10 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
# security.sudo.needsPassword = false;
|
||||
|
||||
# Enable microcode updates
|
||||
services.ucodenix.enable = true;
|
||||
|
||||
system.stateVersion = "24.11";
|
||||
}
|
||||
|
@ -87,12 +87,7 @@
|
||||
|
||||
# Core networking module (see ../../networking/core.nix)
|
||||
network = {
|
||||
firewall = {
|
||||
enable = true;
|
||||
tcpPorts = {
|
||||
allowedPorts = [8123];
|
||||
};
|
||||
};
|
||||
firewall.enable = true;
|
||||
networkManager.enable = true;
|
||||
};
|
||||
|
||||
@ -102,37 +97,7 @@
|
||||
};
|
||||
|
||||
# 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"
|
||||
];
|
||||
};
|
||||
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
|
||||
];
|
||||
|
||||
# Add Home Assistant service
|
||||
services.home-assistant = {
|
||||
enable = true;
|
||||
extraComponents = [
|
||||
"esphome"
|
||||
"met"
|
||||
"radio_browser"
|
||||
"homeassistant_hardware"
|
||||
"zha"
|
||||
"group"
|
||||
"mikrotik"
|
||||
];
|
||||
config = {
|
||||
# Includes dependencies for a basic setup
|
||||
# https://www.home-assistant.io/integrations/default_config/
|
||||
default_config = {};
|
||||
};
|
||||
};
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
users.users.${userName}.extraGroups = ["wheel" "podman" "network"];
|
||||
|
||||
system.stateVersion = "24.11";
|
||||
}
|
||||
|
@ -1,3 +1,4 @@
|
||||
# FIXME: this file is broken but i don't know what is wrong with it
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
|
Reference in New Issue
Block a user