Skip to content

Commit

Permalink
change for me
Browse files Browse the repository at this point in the history
  • Loading branch information
QixYuanmeng committed Aug 18, 2024
1 parent 160abdd commit d256cf8
Show file tree
Hide file tree
Showing 16 changed files with 141 additions and 189 deletions.
10 changes: 5 additions & 5 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
# my private secrets, it's a private repository, you need to replace it with your own.
# use ssh protocol to authenticate via ssh-agent/ssh-key, and shallow clone to save time
mysecrets = {
url = "git+ssh://[email protected]/ryan4yin/nix-secrets.git?shallow=1";
url = "git+ssh://[email protected]/QixYuanmeng/nix-secrets.git?shallow=1";
flake = false;
};

Expand Down
8 changes: 4 additions & 4 deletions home/base/tui/gpg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
mutableKeys = false;
publicKeys = [
# https://www.gnupg.org/gph/en/manual/x334.html
{
source = "${mysecrets}/public/ryan4yin-gpg-keys-2014-01-27.pub";
trust = 5;
} # ultimate trust, my own keys.
#{
#source = "${mysecrets}/public/ryan4yin-gpg-keys-2014-01-27.pub";
#trust = 5;
#} # ultimate trust, my own keys.
];

# This configuration is based on the tutorial below, it allows for a robust setup
Expand Down
18 changes: 9 additions & 9 deletions home/base/tui/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
in {
programs.bash = {
# load the alias file for work
bashrcExtra = ''
alias_for_work=/etc/agenix/alias-for-work.bash
if [ -f $alias_for_work ]; then
. $alias_for_work
else
echo "No alias file found for work"
fi
'';
# bashrcExtra = ''
# alias_for_work=/etc/agenix/alias-for-work.bash
# if [ -f $alias_for_work ]; then
# . $alias_for_work
# else
# echo "No alias file found for work"
# fi
# '';
};

programs.nushell = {
Expand All @@ -20,7 +20,7 @@ in {
# currently, nushell does not support conditional sourcing of files
# https://github.com/nushell/nushell/issues/8214
extraConfig = ''
source /etc/agenix/alias-for-work.nushell
# source /etc/agenix/alias-for-work.nushell
# completion
use ${nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
use ${nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu *
Expand Down
10 changes: 9 additions & 1 deletion home/linux/gui/base/fcitx5/profile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,22 @@ Name=Other
# Layout
Default Layout=us
# Default Input Method
DefaultIM=rime
DefaultIM=keyboard-us

[Groups/0/Items/0]
# Name
Name=keyboard-us
# Layout
Layout=

[Groups/0/Items/1]
# Name
Name=rime
# Layout
Layout=



[GroupOrder]
0=Other

2 changes: 1 addition & 1 deletion home/linux/gui/base/misc.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# instant messaging
telegram-desktop
discord
#discord
pkgs-unstable.qq # https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/networking/instant-messengers/qq

# remote desktop(rdp connect)
Expand Down
2 changes: 1 addition & 1 deletion home/linux/gui/base/xdg.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
enable = true;
# let `xdg-open` to open the url with the correct application.
defaultApplications = let
browser = ["firefox.desktop"];
browser = ["google-chrome-stable.desktop"];
editor = ["nvim.desktop" "Helix.desktop" "code.desktop" "code-insiders.desktop"];
in {
"application/json" = browser;
Expand Down
1 change: 1 addition & 0 deletions home/linux/gui/hyprland/conf/hyprland.conf
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,4 @@ exec-once=cp ~/.config/fcitx5/profile-bak ~/.config/fcitx5/profile # restore
exec-once=fcitx5 -d --replace # start fcitx5 daemon
bind=ALT,E,exec,pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r

monitor=eDP-1,highres,auto,1.5
50 changes: 25 additions & 25 deletions home/linux/gui/hyprland/values/wayland-apps.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,32 +65,32 @@
# let vscode sync and update its configuration & extensions across devices, using github account.
userSettings = {};
package =
(pkgs.vscode.override
{
isInsiders = true;
# https://wiki.archlinux.org/title/Wayland#Electron
commandLineArgs = [
"--ozone-platform-hint=auto"
"--ozone-platform=wayland"
# make it use GTK_IM_MODULE if it runs with Gtk4, so fcitx5 can work with it.
# (only supported by chromium/chrome at this time, not electron)
"--gtk-version=4"
# make it use text-input-v1, which works for kwin 5.27 and weston
"--enable-wayland-ime"
pkgs.vscode.override
{
#isInsiders = true;
# https://wiki.archlinux.org/title/Wayland#Electron
commandLineArgs = [
"--ozone-platform-hint=auto"
"--ozone-platform=wayland"
# make it use GTK_IM_MODULE if it runs with Gtk4, so fcitx5 can work with it.
# (only supported by chromium/chrome at this time, not electron)
"--gtk-version=4"
# make it use text-input-v1, which works for kwin 5.27 and weston
"--enable-wayland-ime"

# TODO: fix https://github.com/microsoft/vscode/issues/187436
# still not works...
"--password-store=gnome" # use gnome-keyring as password store
];
})
.overrideAttrs (oldAttrs: rec {
# Use VSCode Insiders to fix crash: https://github.com/NixOS/nixpkgs/issues/246509
src = builtins.fetchTarball {
url = "https://update.code.visualstudio.com/latest/linux-x64/insider";
sha256 = "0k2sh7rb6mrx9d6bkk2744ry4g17d13xpnhcisk4akl4x7dn6a83";
};
version = "latest";
});
# TODO: fix https://github.com/microsoft/vscode/issues/187436
# still not works...
"--password-store=gnome" # use gnome-keyring as password store
];
};
# .overrideAttrs (oldAttrs: rec {
# # Use VSCode Insiders to fix crash: https://github.com/NixOS/nixpkgs/issues/246509
# src = builtins.fetchTarball {
# url = "https://update.code.visualstudio.com/latest/linux-x64/insider";
# sha256 = "1b4zsgs5fq6c1b8n4a8xnfcwdq8r1khhd5147b6bzz8fxdj9r0b8";
# };
# version = "latest";
# });
};
};
}
4 changes: 2 additions & 2 deletions hosts/idols-ai/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ in {

networking = {
inherit hostName;
inherit (myvars.networking) defaultGateway nameservers;
inherit (myvars.networking.hostsInterface.${hostName}) interfaces;
inherit (myvars.networking) nameservers;
#inherit (myvars.networking.hostsInterface.${hostName}) interfaces;

# desktop need its cli for status bar
networkmanager.enable = true;
Expand Down
4 changes: 2 additions & 2 deletions hosts/idols-ai/home.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
modules.desktop = {
hyprland = {
nvidia = true;
nvidia = false;
settings = {
# Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info.
# highres: get the best possible resolution
# auto: position automatically
# 1.5: scale to 1.5 times
# bitdepth,10: enable 10 bit support
monitor = "DP-2,highres,auto,1.5,bitdepth,10";
monitor = "DP-1,highres,auto,1,bitdepth,10";
};
};
i3.nvidia = true;
Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/desktop/fonts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# Characters
"FiraCode"
"JetBrainsMono"
"Iosevka"
#"Iosevka"
];
})
julia-mono
Expand Down
1 change: 1 addition & 0 deletions nix-secrets
Submodule nix-secrets added at ce02cc
Loading

0 comments on commit d256cf8

Please sign in to comment.