emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

small tweaks

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-02-25 12:40:13 -05:00
parent d90c80b61e
commit 8200fed53f
4 changed files with 107 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

88
hosts/eddie/configuration.nix
View file

@ -7,7 +7,6 @@
}:
{
imports = with nix-config.nixosModules; [
./hardware-configuration.nix
./razer-speaker-fix.nix
@ -30,20 +29,20 @@
inputs.emacs-lsp-booster.overlays.default
(final: prev: {
wineWowPackages.stagingFull = nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs (old: {
patches = old.patches ++ [ ../../patches/wine-6006.patch ];
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
});
wineWowPackages.stagingFull =
nix-config.pkgs-stable.wineWowPackages.stagingFull.overrideAttrs
(old: {
patches = old.patches ++ [ ../../patches/wine-6006.patch ];
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
});
})
(final: prev: {
bitwig-studio5-3 =
nix-config.packages.x86_64-linux.bitwig-studio.bitwig-bubblewrap.override {
bitwig-studio =
nix-config.packages.x86_64-linux.bitwig-studio.bitwig-studio5-3-unwrapped;
};
bitwig-studio5-3 = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-bubblewrap.override {
bitwig-studio = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-studio5-3-unwrapped;
};
})
];
};
@ -74,26 +73,29 @@
console = {
earlySetup = true;
colors = with pkgs.lib.nix-rice;
let theme = palette.toRgbShortHex pkgs.rice.colorPalette;
colors =
with pkgs.lib.nix-rice;
let
theme = palette.toRgbShortHex pkgs.rice.colorPalette;
in
with theme; [
# normal.black
# normal.red
# normal.green
# normal.yellow
# normal.blue
# normal.magenta
# normal.cyan
# normal.white
# bright.black
# bright.red
# bright.green
# bright.yellow
# bright.blue
# bright.magenta
# bright.cyan
# bright.white
with theme;
[
# normal.black
# normal.red
# normal.green
# normal.yellow
# normal.blue
# normal.magenta
# normal.cyan
# normal.white
# bright.black
# bright.red
# bright.green
# bright.yellow
# bright.blue
# bright.magenta
# bright.cyan
# bright.white
"282c34"
"e06c75"
@ -111,7 +113,7 @@
"c678dd"
"56b6c2"
"c8ccd4"
];
];
};
environment.systemPackages = with pkgs; [
@ -156,7 +158,13 @@
efi.canTouchEfiVariables = true;
};
kernelPackages = pkgs.linuxPackages_latest;
kernelModules = [ "i2c-dev" "ddcci-backlight" "amd_3d_vcache" "uinput" "amd_pstate=active" ];
kernelModules = [
"i2c-dev"
"ddcci-backlight"
"amd_3d_vcache"
"uinput"
"amd_pstate=active"
];
extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ];
initrd.systemd.enable = true;
initrd.kernelModules = [
@ -335,7 +343,7 @@
enable = true;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --greeting 'welcome >:o' --theme 'button=yellow'";
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --greeting '<~welcome~>' --theme 'button=yellow'";
# --theme 'border=magenta;prompt=green;time=red;action=blue;button=yellow;container=black;input=red'";
user = "greeter";
};
@ -417,12 +425,12 @@
environment.pathsToLink = [ "/share/fish" ];
programs.bash = {
interactiveShellInit = ''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi
'';
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi
'';
};
services.flatpak.enable = true;