vbrandl/nixos-configuration
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix deprecations and breaking changes

Browse Source
This commit is contained in:
Valentin Brandl 2025-05-23 02:09:30 +02:00
parent d2985d8499
commit 381a6f58ae
Signed by: vbrandl
GPG Key ID: 7FB009175885FC76
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
home/lsd.nix
View File

@ -1,6 +1,6 @@
{ ... }: { { ... }: {
programs.lsd = { programs.lsd = {
enable = true; enable = true;
enableAliases = true; enableZshIntegration = true;
}; };
} }

2
home/zsh.nix
View File

@ -35,7 +35,7 @@
GOROOT = "$HOME/go"; GOROOT = "$HOME/go";
PATH = "$PATH:$HOME/.cargo/bin:$GOROOT/bin:$GOPATH/bin"; PATH = "$PATH:$HOME/.cargo/bin:$GOROOT/bin:$GOPATH/bin";
}; };
initExtra = '' initContent = ''
[ -f $HOME/.nix-profile/etc/profile.d/nix.sh ] && . $HOME/.nix-profile/etc/profile.d/nix.sh [ -f $HOME/.nix-profile/etc/profile.d/nix.sh ] && . $HOME/.nix-profile/etc/profile.d/nix.sh
source ${pkgs.antigen}/share/antigen/antigen.zsh source ${pkgs.antigen}/share/antigen/antigen.zsh
# TODO: remove on NixOS # TODO: remove on NixOS

22
machines/common.nix
View File

@ -31,12 +31,6 @@ inputs:
hardware = { hardware = {
# TODO: remove # TODO: remove
enableAllFirmware = true; enableAllFirmware = true;
#pulseaudio = {
# TODO: pipewire
#enable = true;
# stop mumble from muting other processes
#extraConfig = "unload-module module-role-cork";
#};
graphics = { graphics = {
enable = true; enable = true;
# driSupport = true; # driSupport = true;
@ -143,7 +137,6 @@ inputs:
gvfs gvfs
# yubikey packages # yubikey packages
yubikey-manager-qt
yubikey-personalization-gui yubikey-personalization-gui
yubioath-flutter yubioath-flutter
]; ];
@ -170,10 +163,10 @@ inputs:
virtualisation.libvirtd.enable = false; virtualisation.libvirtd.enable = false;
programs.virt-manager.enable = false; programs.virt-manager.enable = false;
#dconf.settings = { #dconf.settings = {
#"org/virt-manager/virt-manager/connections" = { #"org/virt-manager/virt-manager/connections" = {
#autoconnect = ["qemu:///system"]; #autoconnect = ["qemu:///system"];
#uris = ["qemu:///system"]; #uris = ["qemu:///system"];
#}; #};
#}; #};
@ -194,7 +187,7 @@ inputs:
environment.sessionVariables = { environment.sessionVariables = {
XKB_DEFAULT_OPTIONS = "caps:escape"; XKB_DEFAULT_OPTIONS = "caps:escape";
XKB_DEFAULT_LAYOUT = "eu"; XKB_DEFAULT_LAYOUT = "eu";
}; };
# required for i3 # required for i3
@ -204,13 +197,14 @@ inputs:
enableDefaultPackages = true; enableDefaultPackages = true;
packages = with pkgs; [ packages = with pkgs; [
font-awesome font-awesome
nerdfonts
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
powerline-fonts powerline-fonts
material-icons material-icons
]; ]
# TODO: only install selected/needed fonts
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
monospace = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" "FontAwesome" ]; monospace = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" "FontAwesome" ];

2
machines/entertainment.nix
View File

@ -24,7 +24,7 @@ inputs:
# needed for steam # needed for steam
hardware.graphics.enable32Bit = true; hardware.graphics.enable32Bit = true;
hardware.pulseaudio.support32Bit = true; services.pulseaudio.support32Bit = true;
programs.steam.enable = true; programs.steam.enable = true;
} }