feat: refactor with new
This commit is contained in:
parent
d9dfcae4f9
commit
a9979324ba
3 changed files with 20 additions and 57 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
.direnv
|
||||||
|
|
@ -52,7 +52,7 @@
|
||||||
services.mullvad-vpn.package = pkgs.mullvad-vpn;
|
services.mullvad-vpn.package = pkgs.mullvad-vpn;
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "America/Los_Angeles";
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
|
@ -260,6 +260,7 @@
|
||||||
vim
|
vim
|
||||||
docker
|
docker
|
||||||
docker-compose
|
docker-compose
|
||||||
|
nh
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.variables.EDITOR = "helix";
|
environment.variables.EDITOR = "helix";
|
||||||
|
|
@ -294,23 +295,6 @@
|
||||||
name = "docker";
|
name = "docker";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable SearXNG metasearch engine
|
|
||||||
services.searx = {
|
|
||||||
enable = true;
|
|
||||||
redisCreateLocally = true;
|
|
||||||
environmentFile = "/etc/searxng/searxng.env";
|
|
||||||
# Use custom settings.yml file from nix-config
|
|
||||||
settingsFile = ./config/settings.yml;
|
|
||||||
# Override specific settings via NixOS options (these take precedence)
|
|
||||||
settings = {
|
|
||||||
server = {
|
|
||||||
bind_address = "127.0.0.1";
|
|
||||||
port = 8888;
|
|
||||||
# secret_key is set via environmentFile to avoid exposing it in nix store
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# https://wiki.nixos.org/wiki/Appimage#Register_AppImage_files_as_a_binary_type_to_binfmt_misc
|
# https://wiki.nixos.org/wiki/Appimage#Register_AppImage_files_as_a_binary_type_to_binfmt_misc
|
||||||
programs.appimage = {
|
programs.appimage = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -339,20 +323,11 @@
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "25.05"; # Did you read the comment?
|
system.stateVersion = "25.05"; # Did you read the comment?
|
||||||
|
|
||||||
# Create SearXNG environment file with secret key
|
|
||||||
system.activationScripts.searxng-env.text = ''
|
|
||||||
mkdir -p /etc/searxng
|
|
||||||
if [ ! -f /etc/searxng/searxng.env ]; then
|
|
||||||
echo 'SEARXNG_SECRET=78db11dc49971aa8e3c378cd9d05398f9e42c2f4ca5c2cc206183bf0ace4f237' > /etc/searxng/searxng.env
|
|
||||||
chmod 600 /etc/searxng/searxng.env
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Set user profile picture for GNOME
|
# Set user profile picture for GNOME
|
||||||
system.activationScripts.script.text = ''
|
system.activationScripts.script.text = ''
|
||||||
mkdir -p /var/lib/AccountsService/{icons,users}
|
mkdir -p /var/lib/AccountsService/{icons,users}
|
||||||
if [ -f /home/jet/Documents/nixos-config/cat.png ]; then
|
if [ -f /home/jet/Documents/nix-config/cat.png ]; then
|
||||||
cp /home/jet/Documents/nixos-config/cat.png /var/lib/AccountsService/icons/jet
|
cp /home/jet/Documents/nix-config/cat.png /var/lib/AccountsService/icons/jet
|
||||||
echo -e "[User]\nIcon=/var/lib/AccountsService/icons/jet\n" > /var/lib/AccountsService/users/jet
|
echo -e "[User]\nIcon=/var/lib/AccountsService/icons/jet\n" > /var/lib/AccountsService/users/jet
|
||||||
chown root:root /var/lib/AccountsService/users/jet
|
chown root:root /var/lib/AccountsService/users/jet
|
||||||
chmod 0600 /var/lib/AccountsService/users/jet
|
chmod 0600 /var/lib/AccountsService/users/jet
|
||||||
|
|
|
||||||
43
home.nix
43
home.nix
|
|
@ -1,7 +1,7 @@
|
||||||
{ config, pkgs, inputs, lib, ... }:
|
{ config, pkgs, inputs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ inputs.zen-browser.homeModules.twilight-official ];
|
imports = [ inputs.zen-browser.homeModules.default ];
|
||||||
|
|
||||||
home.username = "jet";
|
home.username = "jet";
|
||||||
home.stateVersion = "23.05";
|
home.stateVersion = "23.05";
|
||||||
|
|
@ -19,9 +19,9 @@
|
||||||
};
|
};
|
||||||
"org/gnome/desktop/background" = {
|
"org/gnome/desktop/background" = {
|
||||||
picture-uri =
|
picture-uri =
|
||||||
"file:///home/jet/Documents/nixos-config/cat.png";
|
"file:///home/jet/Documents/nix-config/cat.png";
|
||||||
picture-uri-dark =
|
picture-uri-dark =
|
||||||
"file:///home/jet/Documents/nixos-config/cat.png";
|
"file:///home/jet/Documents/nix-config/cat.png";
|
||||||
picture-options = "wallpaper";
|
picture-options = "wallpaper";
|
||||||
};
|
};
|
||||||
"org/gnome/settings-daemon/plugins/power" = {
|
"org/gnome/settings-daemon/plugins/power" = {
|
||||||
|
|
@ -41,6 +41,9 @@
|
||||||
enabled-extensions = [
|
enabled-extensions = [
|
||||||
"hidetopbar@mathieu.bidon.ca"
|
"hidetopbar@mathieu.bidon.ca"
|
||||||
"wifiqrcode@glerro.pm.me"
|
"wifiqrcode@glerro.pm.me"
|
||||||
|
"system-monitor@paradoxxx.zero.gmail.com"
|
||||||
|
"clipboard-indicator@tudmotu.com"
|
||||||
|
"emoji-copy@felipeftn"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -57,7 +60,6 @@
|
||||||
nerd-fonts.commit-mono
|
nerd-fonts.commit-mono
|
||||||
qbittorrent-enhanced
|
qbittorrent-enhanced
|
||||||
gimp3
|
gimp3
|
||||||
obs-studio
|
|
||||||
inkscape
|
inkscape
|
||||||
bat
|
bat
|
||||||
zoxide
|
zoxide
|
||||||
|
|
@ -67,25 +69,24 @@
|
||||||
direnv
|
direnv
|
||||||
gnomeExtensions.hide-top-bar
|
gnomeExtensions.hide-top-bar
|
||||||
gnomeExtensions.wifi-qrcode
|
gnomeExtensions.wifi-qrcode
|
||||||
|
gnomeExtensions.system-monitor-next
|
||||||
|
gnomeExtensions.clipboard-indicator
|
||||||
|
gnomeExtensions.emoji-copy
|
||||||
signal-desktop
|
signal-desktop
|
||||||
tree
|
tree
|
||||||
figma-agent
|
|
||||||
figma-linux
|
|
||||||
google-chrome
|
google-chrome
|
||||||
tor-browser
|
|
||||||
mullvad-vpn
|
mullvad-vpn
|
||||||
font-manager
|
font-manager
|
||||||
handbrake
|
|
||||||
steam
|
steam
|
||||||
appimage-run
|
appimage-run
|
||||||
gh
|
gh
|
||||||
beeper
|
beeper
|
||||||
antigravity-fhs
|
antigravity-fhs
|
||||||
prusa-slicer
|
|
||||||
printrun
|
|
||||||
mkp224o
|
mkp224o
|
||||||
libreoffice-qt-fresh
|
|
||||||
claude-code
|
claude-code
|
||||||
|
logseq
|
||||||
|
element-desktop
|
||||||
|
zulip
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -188,7 +189,7 @@
|
||||||
jn = "jj new";
|
jn = "jj new";
|
||||||
jdiff = "jj diff";
|
jdiff = "jj diff";
|
||||||
jsq = "jj squash";
|
jsq = "jj squash";
|
||||||
ns = "sudo nixos-rebuild switch --flake ~/Documents/nix-config#jet";
|
nhs = "nh os switch .";
|
||||||
nd = "nix develop";
|
nd = "nix develop";
|
||||||
h = "hx";
|
h = "hx";
|
||||||
vanity = "mkp224o-amd64-64-24k -d noisebridgevanitytor noisebridge{2..7}";
|
vanity = "mkp224o-amd64-64-24k -d noisebridgevanitytor noisebridge{2..7}";
|
||||||
|
|
@ -218,6 +219,7 @@
|
||||||
programs.jujutsu = {
|
programs.jujutsu = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
remotes.origin.auto-track-bookmarks = "glob:*";
|
||||||
user = {
|
user = {
|
||||||
email = "jetthomaspham@gmail.com";
|
email = "jetthomaspham@gmail.com";
|
||||||
name = "Jet Pham";
|
name = "Jet Pham";
|
||||||
|
|
@ -231,7 +233,6 @@
|
||||||
|
|
||||||
git = {
|
git = {
|
||||||
sign-on-push = true;
|
sign-on-push = true;
|
||||||
push-new-bookmarks = true;
|
|
||||||
};
|
};
|
||||||
ui = {
|
ui = {
|
||||||
default-command = "log";
|
default-command = "log";
|
||||||
|
|
@ -249,20 +250,6 @@
|
||||||
"zen.theme.border-radius" = 0;
|
"zen.theme.border-radius" = 0;
|
||||||
"zen.theme.content-element-separation" = 0;
|
"zen.theme.content-element-separation" = 0;
|
||||||
};
|
};
|
||||||
# Add SearXNG as default search engine
|
|
||||||
SearchEngines = {
|
|
||||||
Default = "SearXNG";
|
|
||||||
Add = [
|
|
||||||
{
|
|
||||||
Name = "SearXNG";
|
|
||||||
URLTemplate = "http://127.0.0.1:8888/search?q={searchTerms}";
|
|
||||||
Method = "GET";
|
|
||||||
IconURL = "http://127.0.0.1:8888/static/themes/simple/img/searxng.png";
|
|
||||||
Alias = "sx";
|
|
||||||
Description = "SearXNG - Privacy-respecting metasearch engine";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -282,7 +269,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
entries = [
|
entries = [
|
||||||
"${pkgs.kitty}/share/applications/kitty.desktop"
|
"${pkgs.kitty}/share/applications/kitty.desktop"
|
||||||
"${config.programs.zen-browser.package}/share/applications/zen-twilight.desktop"
|
"${config.programs.zen-browser.package}/share/applications/zen.desktop"
|
||||||
|
|
||||||
"${pkgs.beeper}/share/applications/beepertexts.desktop"
|
"${pkgs.beeper}/share/applications/beepertexts.desktop"
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue