martials/nixos-configuration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🧹 Mpv loop config, moved fish aliases to proper files

Browse Source
This commit is contained in:
Martin Berg Alstad 2025-02-02 15:06:34 +01:00
parent bd2f725029
commit 76ebdad3ce
Signed by: martials
GPG Key ID: 706F53DD087A91DE
9 changed files with 113 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
home-manager/default.nix
View File

@ -26,7 +26,7 @@ in
./rofi
./wlogout
./hyprland
./spicetify.nix
./spicetify.nix # TODO env conflict on latest version
./yazi
];
@ -34,9 +34,7 @@ in
enable = true;
settings = {
# Prefer dark mode for all GTK apps
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
};
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
};
};

107
home-manager/fastfetch.nix
View File

@ -1,57 +1,60 @@
{
programs.fastfetch = {
enable = true;
settings = {
logo = {
source = "${../Catppuccin.png}";
type = "kitty";
height = 18;
padding.top = 2;
programs = {
fish.shellAliases.fetch = "fastfetch";
fastfetch = {
enable = true;
settings = {
logo = {
source = "${../Catppuccin.png}";
type = "kitty";
height = 18;
padding.top = 2;
};
display.separator = " ";
modules =
let
keyColor = "34";
module = type: key: {
inherit type key keyColor;
};
formatModule = type: key: format: {
inherit
type
key
format
keyColor
;
};
in
[
"break"
"break"
{
type = "title";
keyWidth = 10;
}
"break"
(module "os" " ")
(module "kernel" " ")
(formatModule "packages" " " "{} (nixpkgs)")
(module "shell" " ")
(module "terminal" " ")
(module "wm" " ")
(module "theme" " ")
(module "cursor" " ")
(module "terminalfont" " ")
(module "uptime" " ")
(formatModule "datetime" " " "{1}-{3}-{11}")
(module "cpu" " ")
(module "gpu" "󰤽 ")
(module "sound" " ")
(module "lm" " ")
"break"
"colors"
"break"
"break"
];
};
display.separator = " ";
modules =
let
keyColor = "34";
module = type: key: {
inherit type key keyColor;
};
formatModule = type: key: format: {
inherit
type
key
format
keyColor
;
};
in
[
"break"
"break"
{
type = "title";
keyWidth = 10;
}
"break"
(module "os" " ")
(module "kernel" " ")
(formatModule "packages" " " "{} (nixpkgs)")
(module "shell" " ")
(module "terminal" " ")
(module "wm" " ")
(module "theme" " ")
(module "cursor" " ")
(module "terminalfont" " ")
(module "uptime" " ")
(formatModule "datetime" " " "{1}-{3}-{11}")
(module "cpu" " ")
(module "gpu" "󰤽 ")
(module "sound" " ")
(module "lm" " ")
"break"
"colors"
"break"
"break"
];
};
};
}

8
home-manager/fish.nix
View File

@ -17,6 +17,11 @@ in
programs = {
fish = {
enable = true;
# Start starship when creating a new shell
interactiveShellInit = ''
starship init fish | source
fortune | cowsay -f tux
'';
plugins = [
{
# !! to get the previous command
@ -30,6 +35,9 @@ in
};
}
];
shellAliases = {
nix-shell = "nix-shell --run fish"; # Start nix-shells using fishcd
};
};
starship = {

20
home-manager/kitty.nix
View File

@ -8,14 +8,18 @@ in
flavor = theme.flavor;
};
programs.kitty = {
enable = common.default.terminal == "kitty";
font.name = theme.nerdFont;
settings = {
background_blur = 5;
background_opacity = 0.8;
confirm_os_window_close = 0;
window_padding_width = 10;
programs = {
# Transfer shell config to target device
fish.shellAliases.ssh = "kitty +kitten ssh";
kitty = {
enable = common.default.terminal == "kitty";
font.name = theme.nerdFont;
settings = {
background_blur = 5;
background_opacity = 0.8;
confirm_os_window_close = 0;
window_padding_width = 10;
};
};
};
}

23
home-manager/mpv.nix
View File

@ -8,13 +8,22 @@
flavor = theme.flavor;
};
programs.mpv = {
enable = true;
config = {
hwdec = "auto-safe";
vo = "gpu";
profile = "gpu-hq";
gpu-context = "wayland";
programs = {
fish.shellAliases.mpvl = "mpv --profile=loop";
mpv = {
enable = true;
config = {
hwdec = "auto-safe";
vo = "gpu";
profile = "gpu-hq";
gpu-context = "wayland";
};
profiles = {
loop = {
loop-playlist = "inf";
loop-file = "inf";
};
};
};
};
}

2
modules/default.nix
View File

@ -10,8 +10,8 @@
./hyprland
./sddm.nix
./security.nix
./shell.nix
./steam.nix
./terminal
./qt.nix
];
}

19
modules/shell.nix Normal file
View File

@ -0,0 +1,19 @@
# For Fish dotfiles, see: /home-manager/fish.nix
{ pkgs, ... }:
{
programs = {
bash = {
# Starts the OS using Bash, then starts fish if it's not running
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
'';
};
fish.enable = true;
};
}

11
modules/terminal/default.nix
View File

@ -1,11 +0,0 @@
{ pkgs, ... }:
{
imports = [
./shell.nix
];
environment.systemPackages = with pkgs; [
kitty
];
}

32
modules/terminal/shell.nix
View File

@ -1,32 +0,0 @@
# For Fish dotfiles, see: /home-manager/fish.nix and home-manager/starship.nix
{ pkgs, ... }:
{
programs = {
bash = {
# Starts the OS using Bash, then starts fish if it's not running
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
'';
};
fish = {
enable = true;
# Start starship when creating a new shell
interactiveShellInit = ''
starship init fish | source
fortune | cowsay -f tux
'';
shellAliases = {
# Transfer shell config to target device
ssh = "kitty +kitten ssh";
nix-shell = "nix-shell --run fish"; # Start nix-shells using fishcd
fetch = "fastfetch";
};
};
};
}