Merge remote-tracking branch 'origin/main'

This commit is contained in:
Daniel Flanagan 2024-04-01 15:01:16 -05:00
commit 2daa90de72
5 changed files with 24 additions and 7 deletions

View File

@ -35,6 +35,8 @@
# style = "adwaita-dark";
};
programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-qt;
programs.dconf.enable = true;
services.dbus.enable = true;

View File

@ -30,7 +30,7 @@
};
# I'm currently leaning Plasma since 6.0 released, so we use that pinentry
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
# programs.gnupg.agent.pinentryPackage = pkgs.pinen;
services.dbus.enable = true;

View File

@ -163,6 +163,13 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
User = "daniel"; # might have to run as me for git ssh access to the repo
};
};
networking = {
extraHosts = ''
::1 nix.h.lyte.dev
127.0.0.1 nix.h.lyte.dev
'';
};
}
{
services.headscale = {

View File

@ -23,7 +23,7 @@
home-manager.users.daniel = {
imports = with outputs.homeManagerModules; [
linux-desktop
sway
];
};

View File

@ -14,7 +14,8 @@
inputs.hardware.nixosModules.common-pc-laptop-ssd
desktop-usage
podman
gnome
# gnome
kde-plasma
postgres
wifi
];
@ -23,10 +24,15 @@
systemPackages = with pkgs; [
spotify
discord
obs-studio
variety # wallpaper switcher that I use with GNOME
sops
slack
godot_4
fractal
prismlauncher
variety
radeontop
sops
obs-studio
xh
];
};
@ -51,7 +57,7 @@
sway
pass
firefox-no-tabs
wallpaper-manager
# wallpaper-manager
# sway-laptop
# hyprland
];
@ -59,6 +65,8 @@
home = {
stateVersion = "24.05";
};
services.mako.enable = lib.mkForce false; # don't use mako when using plasma
};
swapDevices = [