mass update

This commit is contained in:
Sense T
2023-06-26 06:18:07 +08:00
parent 683a772bc4
commit 8781b2d636
8 changed files with 217 additions and 109 deletions

View File

@@ -1,8 +1,13 @@
{pkgs, ...}: {
home = import ./home.nix;
programs = import ./programs.nix;
services = import ./services.nix;
systemd.user.services = import ./systemd.nix;
imports = [
./home.nix
./programs.nix
./services.nix
];
systemd.user.services = {
# TODO: Podman
};
i18n.inputMethod.enabled = "fcitx5";
i18n.inputMethod.fcitx5.addons = with pkgs; [

View File

@@ -1,44 +1,46 @@
{pkgs, ...}: {
stateVersion = "23.05"; # Static
username = "GPD User";
homeDirectory = "/home/user";
home = {
stateVersion = "23.05"; # Static
username = "GPD User";
homeDirectory = "/home/user";
packages = with pkgs; [
btop
bat
thefuck
ranger
icdiff
podman
jdk17
rofi
rofi-rbw
];
packages = with pkgs; [
btop
bat
thefuck
ranger
icdiff
podman
jdk17
rofi
rofi-rbw
];
sessionPath = {
".local/bin"
"Applications"
}
sessionPath = [
".local/bin"
"Applications"
];
shellAliases = {
cao = "fuck";
top = "btop";
ls = "ls --color=auto";
cat = "bat -p --paging=never -u";
diff="icdiff";
};
shellAliases = {
cao = "fuck";
top = "btop";
ls = "ls --color=auto";
cat = "bat -p --paging=never -u";
diff="icdiff";
};
file = {
# hyprland
".config/hypr/hyprland.conf".source = ./files/hyprland.conf;
file = {
# hyprland
".config/hypr/hyprland.conf".source = ./files/hyprland.conf;
# Use flatseal to change permissions.
".local/share/fonts".source = /run/current-system/sw/share/X11/fonts
# Use flatseal to change permissions.
".local/share/fonts".source = /run/current-system/sw/share/X11/fonts;
# Fix flatpak fonts
".local/share/flatpak/overrides/global".text = ''
[Context]
filesystems=~/.local/share/fonts:ro;~/.icons;
'';
# Fix flatpak fonts
".local/share/flatpak/overrides/global".text = ''
[Context]
filesystems=~/.local/share/fonts:ro;~/.icons;
'';
};
};
}

View File

@@ -1,63 +1,65 @@
{pkgs, ...}: {
home-manager.enable = true;
programs = {
home-manager.enable = true;
vim = {
enable = true;
defaultEditor = true;
};
zsh = {
enable = true;
enableSyntaxHighlighting = true;
oh-my-zsh = {
vim = {
enable = true;
plugins = [ "sudo" "git" "golang" "thefuck" "kubectl" "emoji" "pip" "npm" "yarn" "vscode" ];
theme = "agnoster";
};
};
waybar = {
enable = true;
systemd.enable = true;
# see https://github.com/theCode-Breaker/riverwm/blob/main/waybar/river/config-river
# https://blog.cascade.moe/posts/hyprland-configure/
settings = {
mainBar = import ./config/waybar.nix;
defaultEditor = true;
};
style = import ./config/waybar-style.nix;
};
zsh = {
enable = true;
enableSyntaxHighlighting = true;
kitty = {
enable = true;
font = {
name = "Powerline";
size = 12;
oh-my-zsh = {
enable = true;
plugins = [ "sudo" "git" "golang" "thefuck" "kubectl" "emoji" "pip" "npm" "yarn" "vscode" ];
theme = "agnoster";
};
};
keybindings = {
"ctrl+c" = "copy_or_interrupt";
"ctrl+v" = "paste_from_clipboard";
waybar = {
enable = true;
systemd.enable = true;
# see https://github.com/theCode-Breaker/riverwm/blob/main/waybar/river/config-river
# https://blog.cascade.moe/posts/hyprland-configure/
settings = {
mainBar = import ./config/waybar.nix;
};
style = import ./config/waybar-style.nix;
};
shellIntegration = {
enableZshIntegration = true;
enableBashIntegration = true;
kitty = {
enable = true;
font = {
name = "Powerline";
size = 12;
};
keybindings = {
"ctrl+c" = "copy_or_interrupt";
"ctrl+v" = "paste_from_clipboard";
};
shellIntegration = {
enableZshIntegration = true;
enableBashIntegration = true;
};
settings = {
background_opacity = 0.8;
};
};
settings = {
background_opacity = 0.8;
};
};
rbw = {
enable = true;
settings = {
base_url = "https://pass.sense-t.eu.org";
email = "sense-t@sense-t.eu.org";
lock_timeout = 300;
pinentry = "gnome3";
rbw = {
enable = true;
settings = {
base_url = "https://pass.sense-t.eu.org";
email = "sense-t@sense-t.eu.org";
lock_timeout = 300;
pinentry = "gnome3";
};
};
};
}

View File

@@ -1,19 +1,21 @@
{
dunst = {
enable = true;
settings = {
global = {
width = 300;
height = 300;
offset = "30x50";
origin = "top-right";
notification_limit = 10;
progress_bar = true;
transparency = 20;
corner_radius = 8;
services = {
dunst = {
enable = true;
settings = {
global = {
width = 300;
height = 300;
offset = "30x50";
origin = "top-right";
notification_limit = 10;
progress_bar = true;
transparency = 20;
corner_radius = 8;
};
};
};
};
network-manager-applet.enable = true;
network-manager-applet.enable = true;
};
}

View File

@@ -1,4 +0,0 @@
# Will used for podman
{
}