diff --git a/apps/gnome.nix b/apps/gnome.nix index de2ed44..346ad87 100644 --- a/apps/gnome.nix +++ b/apps/gnome.nix @@ -40,9 +40,9 @@ in programs.dconf.profiles.user.databases = [ { settings = { - # "org/gnome/mutter" = { - # experimental-features = [ "scale-monitor-framebuffer" ]; - # }; + #"org/gnome/mutter" = { + # experimental-features = [ "scale-monitor-framebuffer" ]; + #}; "org/gnome/settings-daemon/plugins/media-keys" = { custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" @@ -109,7 +109,7 @@ in show-in-lock-screen = false; }; "org/gnome/desktop/session" = { - idle-delay = mkUint32 0; + idle-delay = mkUint32 180; }; "org/gnome/shell/extensions/unite" = { enable-titlebar-actions = true; @@ -125,9 +125,10 @@ in show-window-buttons = "never"; show-window-title = "never"; }; - #"org/gnome/shell/extensions/user-theme" = { - # name = "Mojave-Dark-solid-alt"; - #}; + "org/gnome/shell/extensions/user-theme" = { + name = "Mojave-Dark-solid-alt"; + #name = "Catppuccin-Mocha-Compact-Lavender-Dark"; + }; "org/gnome/shell/weather" = { automatic-location = true; }; diff --git a/apps/work.nix b/apps/work.nix index 475a680..7fef75f 100644 --- a/apps/work.nix +++ b/apps/work.nix @@ -78,8 +78,9 @@ let namespacedWork = pkgs.writeScriptBin "namespaced_work" '' #!/usr/bin/env bash NETNS_NAME="work" - NETNS_NAMESERVER_1="1.1.1.1" - NETNS_NAMESERVER_2="1.1.0.1" + #NETNS_NAMESERVER_1="1.1.1.1" + NETNS_NAMESERVER_1="${inputs.secrets.work.dns1}" + NETNS_NAMESERVER_2="${inputs.secrets.work.dns2}" VETH0_NAME="work0" VETH1_NAME="work1" @@ -291,8 +292,10 @@ let if [[ $choice == "no-remote" ]]; then ${pkgs.gtk3}/bin/gtk-launch kittywork + mkdir -p /etc/netns/work + cat ${hostsNoRemote} > /etc/netns/work/hosts elif [[ $choice == "no-remote-resume" ]]; then - firejail --ignore='include whitelist-run-common.inc' --blacklist='/var/run/nscd' --profile=firefox --hosts-file=${hostsNoRemote} --netns=work firefox -P work -no-remote --class firefoxwork --name firefoxwork + firejail --ignore='include whitelist-run-common.inc' --blacklist='/var/run/nscd' --profile=firefox --hosts-file=${hostsNoRemote} --netns=work --dns=${inputs.secrets.work.dns1} firefox -P work -no-remote --class firefoxwork --name firefoxwork elif [[ $choice == "remote" ]]; then firejail --ignore='include whitelist-run-common.inc' --blacklist='/var/run/nscd' --profile=firefox --hosts-file=${hostsRemote} ${pkgs.firefox}/bin/firefox -P work -no-remote --class firefoxwork --name firefoxwork else diff --git a/home/home.nix b/home/home.nix index aa37ffe..2f13b9b 100644 --- a/home/home.nix +++ b/home/home.nix @@ -122,8 +122,8 @@ hide_window_decorations = "yes"; remote_control_password = "kitty-notification-password-fish ls"; allow_remote_control = "password"; - font_family= "FiraCode Nerd Font"; #FiraCode Nerd Font Ret - font_features = "FiraCodeNF-Reg +ss01 +ss02 +ss06 +ss08 +cv14 +cv03 +tnum"; + font_family= "FiraCode"; #FiraCode Nerd Font Ret + font_features = "FiraCode +ss01 +ss02 +ss06 +ss08 +cv14 +cv03 +tnum"; color0 = "#3F3F3F"; color1 = "#705050"; diff --git a/home/theme.nix b/home/theme.nix index 1c83dfe..0b1a094 100644 --- a/home/theme.nix +++ b/home/theme.nix @@ -13,6 +13,8 @@ let "FiraCode" #"Mononoki" "Iosevka" + "IBMPlexMono" + "NerdFontsSymbolsOnly" ]; }); in { diff --git a/hosts/generic.nix b/hosts/generic.nix index 054bb6e..fa1e456 100644 --- a/hosts/generic.nix +++ b/hosts/generic.nix @@ -133,8 +133,6 @@ in { any-nix-shell fish --info-right | source ''; }; - #just incase: ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source - #tide configure --auto --style=Lean --prompt_colors='16 colors' --show_time=No --lean_prompt_height='Two lines' --prompt_connection=Disconnected --prompt_spacing=Compact --icons='Few icons' --transient=No programs.tmux.enable = true; programs.direnv.enable = true;