mirror of
https://github.com/donovanglover/nix-config.git
synced 2024-11-14 20:33:59 +01:00
Move remaining home-manager stuff to home.nix
This commit is contained in:
parent
9e11cb4278
commit
2c281b8529
97
flake.nix
97
flake.nix
@ -21,103 +21,6 @@
|
||||
}
|
||||
stylix.nixosModules.stylix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
users.users.user = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" ];
|
||||
};
|
||||
home-manager.users.user = { pkgs, ... }: {
|
||||
home.username = "user";
|
||||
home.homeDirectory = "/home/user";
|
||||
home.packages = [ pkgs.httpie ];
|
||||
home.stateVersion = "22.11";
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
config = {
|
||||
screenshot-format = "png";
|
||||
profile = "gpu-hq";
|
||||
scale = "ewa_lanczossharp";
|
||||
cscale = "ewa_lanczossharp";
|
||||
video-sync = "display-resample";
|
||||
interpolation = true;
|
||||
tscale = "oversample";
|
||||
sub-auto = "fuzzy";
|
||||
sub-font = "Noto Sans CJK JP Medium";
|
||||
sub-blur = 10;
|
||||
sub-file-paths = "subs:subtitles:字幕";
|
||||
fullscreen = "yes";
|
||||
title = "\${filename} - mpv";
|
||||
script-opts =
|
||||
"osc-title=\${filename},osc-boxalpha=150,osc-showfullscreen=no,osc-boxvideo=yes";
|
||||
osc = "no";
|
||||
osd-on-seek = "no";
|
||||
osd-bar = "no";
|
||||
osd-bar-w = 30;
|
||||
osd-bar-h = "0.2";
|
||||
osd-duration = 750;
|
||||
really-quiet = "yes";
|
||||
};
|
||||
scripts = [ pkgs.mpvScripts.thumbnail ];
|
||||
};
|
||||
programs.librewolf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
"middlemouse.paste" = false;
|
||||
"browser.download.useDownloadDir" = true;
|
||||
"ui.use_activity_cursor" = true;
|
||||
"browser.tabs.insertAfterCurrent" = true;
|
||||
};
|
||||
};
|
||||
programs.chromium = {
|
||||
enable = true;
|
||||
package = pkgs."ungoogled-chromium";
|
||||
commandLineArgs = [ "--ozone-platform-hint=auto" ];
|
||||
extensions = [{ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; }];
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
include = { path = "~/.gituser"; };
|
||||
commit = { gpgsign = true; };
|
||||
core = {
|
||||
editor = "nvim";
|
||||
autocrlf = false;
|
||||
quotePath = false;
|
||||
};
|
||||
web = { browser = "librewolf"; };
|
||||
push = { default = "simple"; };
|
||||
branch = { autosetuprebase = "always"; };
|
||||
init = { defaultBranch = "master"; };
|
||||
rerere = { enabled = true; };
|
||||
color = { ui = true; };
|
||||
alias = {
|
||||
contrib = "shortlog -n -s";
|
||||
remotes = "remote -v";
|
||||
praise = "blame";
|
||||
verify = "log --show-signature";
|
||||
};
|
||||
"color \"diff-highlight\"" = {
|
||||
oldNormal = "red bold";
|
||||
oldHighlight = "red bold";
|
||||
newNormal = "green bold";
|
||||
newHighlight = "green bold";
|
||||
};
|
||||
"color \"diff\"" = {
|
||||
meta = "yellow";
|
||||
frag = "magenta bold";
|
||||
commit = "yellow bold";
|
||||
old = "red bold";
|
||||
new = "green bold";
|
||||
whitespace = "red reverse";
|
||||
};
|
||||
};
|
||||
diff-so-fancy = { enable = true; };
|
||||
};
|
||||
programs.lf = { enable = true; };
|
||||
services.udiskie.enable = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
93
home.nix
93
home.nix
@ -1,6 +1,16 @@
|
||||
{ config, lib, nixpkgs, home-manager, hyprland, ... }: {
|
||||
users.users.user = {
|
||||
isNormalUser = true;
|
||||
password = "user";
|
||||
extraGroups = [ "wheel" "networkmanager" ];
|
||||
};
|
||||
imports = [ home-manager.nixosModule ];
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.user = { pkgs, ... }: {
|
||||
home.username = "user";
|
||||
home.homeDirectory = "/home/user";
|
||||
home.packages = [ pkgs.httpie ];
|
||||
home.stateVersion = "22.11";
|
||||
xdg = { userDirs = { enable = true; }; };
|
||||
home.file.".icons/default/index.theme".text = ''
|
||||
[icon theme]
|
||||
@ -549,5 +559,88 @@
|
||||
color title-focus black blue bold
|
||||
color title-blur black blue bold
|
||||
'';
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
config = {
|
||||
screenshot-format = "png";
|
||||
profile = "gpu-hq";
|
||||
scale = "ewa_lanczossharp";
|
||||
cscale = "ewa_lanczossharp";
|
||||
video-sync = "display-resample";
|
||||
interpolation = true;
|
||||
tscale = "oversample";
|
||||
sub-auto = "fuzzy";
|
||||
sub-font = "Noto Sans CJK JP Medium";
|
||||
sub-blur = 10;
|
||||
sub-file-paths = "subs:subtitles:字幕";
|
||||
fullscreen = "yes";
|
||||
title = "\${filename} - mpv";
|
||||
script-opts =
|
||||
"osc-title=\${filename},osc-boxalpha=150,osc-showfullscreen=no,osc-boxvideo=yes";
|
||||
osc = "no";
|
||||
osd-on-seek = "no";
|
||||
osd-bar = "no";
|
||||
osd-bar-w = 30;
|
||||
osd-bar-h = "0.2";
|
||||
osd-duration = 750;
|
||||
really-quiet = "yes";
|
||||
};
|
||||
scripts = [ pkgs.mpvScripts.thumbnail ];
|
||||
};
|
||||
programs.librewolf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
"middlemouse.paste" = false;
|
||||
"browser.download.useDownloadDir" = true;
|
||||
"ui.use_activity_cursor" = true;
|
||||
"browser.tabs.insertAfterCurrent" = true;
|
||||
};
|
||||
};
|
||||
programs.chromium = {
|
||||
enable = true;
|
||||
package = pkgs."ungoogled-chromium";
|
||||
commandLineArgs = [ "--ozone-platform-hint=auto" ];
|
||||
extensions = [{ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; }];
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
include = { path = "~/.gituser"; };
|
||||
commit = { gpgsign = true; };
|
||||
core = {
|
||||
editor = "nvim";
|
||||
autocrlf = false;
|
||||
quotePath = false;
|
||||
};
|
||||
web = { browser = "librewolf"; };
|
||||
push = { default = "simple"; };
|
||||
branch = { autosetuprebase = "always"; };
|
||||
init = { defaultBranch = "master"; };
|
||||
rerere = { enabled = true; };
|
||||
color = { ui = true; };
|
||||
alias = {
|
||||
contrib = "shortlog -n -s";
|
||||
remotes = "remote -v";
|
||||
praise = "blame";
|
||||
verify = "log --show-signature";
|
||||
};
|
||||
"color \"diff-highlight\"" = {
|
||||
oldNormal = "red bold";
|
||||
oldHighlight = "red bold";
|
||||
newNormal = "green bold";
|
||||
newHighlight = "green bold";
|
||||
};
|
||||
"color \"diff\"" = {
|
||||
meta = "yellow";
|
||||
frag = "magenta bold";
|
||||
commit = "yellow bold";
|
||||
old = "red bold";
|
||||
new = "green bold";
|
||||
whitespace = "red reverse";
|
||||
};
|
||||
};
|
||||
diff-so-fancy = { enable = true; };
|
||||
};
|
||||
services.udiskie.enable = true;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user