Bun/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change to Firefox, generalize terminal apps, update Forgejo, simplify other files

Browse source
This commit is contained in:
Jimbo 2025-02-22 02:21:44 -05:00
parent 63fc72eeb0
commit eda4cd528f
20 changed files with 81 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/home/programs/gui/default.nix
View file

@ -1,9 +1,10 @@
{ ... }:
{
imports = [
./firefox
./foot
./imv
./librewolf
./looking-glass
./mangohud
./mpv
./obs

20
modules/home/programs/gui/librewolf/default.nix → modules/home/programs/gui/firefox/default.nix
View file

@ -3,7 +3,6 @@
config = lib.mkIf config.home.desktop.enable {
programs.firefox = {
enable = true;
package = pkgs.librewolf;
profiles = let
# FireFox css, based on https://github.com/Dook97/firefox-qutebrowser-userchrome
themeFont = ''
@ -263,25 +262,6 @@
${builtins.readFile ./quteFox.css}
'';
};
Misc = {
id = 2;
extensions = commonExtensions;
search = commonSearch;
bookmarks = commonBookmarks;
settings = commonSettings;
};
};
};
# Fixes
home.file = {
# Symlinks to Librewolf
".librewolf".source = config.lib.file.mkOutOfStoreSymlink "/home/${config.home.username}/.mozilla/firefox";
# Gnome theme
".mozilla/firefox/Misc/chrome".source = fetchTarball {
url = "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/refs/tags/v132.zip";
sha256 = "095sv1ann2v7q5bfy65i118ylhp2vkpbgyf6fz84nd9yrx14rzwm";
};
};
};

0
modules/home/programs/gui/librewolf/quteFox.css → modules/home/programs/gui/firefox/quteFox.css
View file

16
modules/home/programs/gui/looking-glass/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ config, ... }:
{
programs.looking-glass-client = {
enable = config.home.desktop.enable;
settings = {
input = {
rawMouse = true;
escapeKey = 62;
};
spice = {
enable = true;
audio = true;
};
};
};
}

2
modules/home/programs/terminal/default.nix
View file

@ -2,12 +2,12 @@
{
imports = [
./btop
./eza
./fastfetch
./git
./ncmpcpp
./neovim
./nh
./notfound
./ranger
./spotdl
./tmux

10
modules/home/programs/terminal/eza/default.nix Normal file
View file

@ -0,0 +1,10 @@
{ ... }:
{
programs.eza = {
enable = true;
git = true;
icons = "auto";
colors = "always";
extraOptions = [ "--group-directories-first" ];
};
}

4
modules/home/programs/terminal/notfound/default.nix
View file

@ -1,4 +0,0 @@
{ ... }:
{
programs.command-not-found.enable = true;
}

4
modules/home/programs/terminal/ranger/default.nix
View file

@ -35,8 +35,8 @@
command = ''mpv --shuffle --no-audio-display -- "$@"'';
}
{
condition = ''ext x?html?|pdf, has librewolf, X, flag f'';
command = ''librewolf -- "$@"'';
condition = ''ext x?html?|pdf, has firefox, X, flag f'';
command = ''firefox -- "$@"'';
}
{
condition = ''ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f'';

5
modules/home/programs/terminal/zsh/default.nix
View file

@ -7,7 +7,10 @@
oh-my-zsh = {
enable = true;
theme = "agnoster";
plugins = [ "git" ];
plugins = [
"git"
"history"
];
};
initExtra = ''
pfetch

1
modules/home/settings/aliases/default.nix
View file

@ -14,7 +14,6 @@
# Shortcuts
ff = "clear && fastfetch";
ip = "ip -c";
ls = "${pkgs.eza}/bin/eza -a --color=always --group-directories-first --icons";
cat = "${pkgs.bat}/bin/bat --paging never";
copycat = "wl-copy <";
myip = "curl ifconfig.co";

1
modules/home/wms/niri/autostart/default.nix
View file

@ -14,7 +14,6 @@
spawn-at-startup "${pkgs.xwayland-satellite}/bin/xwayland-satellite"
// Foreground
//spawn-at-startup "librewolf" "-p" "Misc" "--name" "MiscBrowser"
spawn-at-startup "thunderbird"
spawn-at-startup "vesktop"
'';

5
modules/home/wms/niri/hotkeys/default.nix
View file

@ -9,9 +9,8 @@
//// Launchers
// Browser
${primeMod}+F1 { spawn "sh" "-c" "librewolf -p Main --name MainBrowser | notify-send \"Main Browser\""; }
${primeMod}+F2 { spawn "sh" "-c" "librewolf -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; }
${primeMod}+F3 { spawn "sh" "-c" "librewolf -p Misc --name MiscBrowser | notify-send \"Miscellaneous Browser\""; }
${primeMod}+F1 { spawn "sh" "-c" "firefox -p Main --name MainBrowser | notify-send \"Main Browser\""; }
${primeMod}+F2 { spawn "sh" "-c" "firefox -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; }
// Virtual machines
${primeMod}+F4 { spawn "sh" "-c" "virt-manager | notify-send \"Virtual Machines\""; }

14
modules/home/wms/niri/rules/default.nix
View file

@ -27,20 +27,16 @@
}
// Etc
window-rule {
match app-id="looking-glass-client"
open-on-workspace "${config.ws.w2a}"
}
window-rule {
match app-id="com.obsproject.Studio"
open-on-workspace "${config.ws.w4a}"
}
//// Layer rules (Uncomment after 0.1.11)
//layer-rule {
// match namespace="^notifications$"
// block-out-from "screencast"
//}
// Layer rules
layer-rule {
match namespace="^notifications$"
block-out-from "screencast"
}
// Everything else
screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"

6
modules/home/wms/programs/waybar/default.nix
View file

@ -15,9 +15,9 @@
all-outputs = true;
tooltip = false;
rewrite = {
"(.*) — LibreWolf" = " $1";
"LibreWolf" = " Firefox";
"(.*) - LibreWolf — Firefox" = "󰗃 $1";
"(.*) — Mozilla Firefox" = " $1";
"Mozilla Firefox" = " Firefox";
"(.*) - Mozilla Firefox — Firefox" = "󰗃 $1";
};
};

6
modules/home/wms/sway/hotkeys/default.nix
View file

@ -12,9 +12,9 @@
## Launchers
# Browser profiles
"${primeMod}+F1" = ''exec librewolf -p Main --name MainBrowser | notify-send "Main Browser"'';
"${primeMod}+F2" = ''exec librewolf -p Alt --name AltBrowser | notify-send "Alternate Browser"'';
"${primeMod}+F3" = ''exec librewolf -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"'';
"${primeMod}+F1" = ''exec firefox -p Main --name MainBrowser | notify-send "Main Browser"'';
"${primeMod}+F2" = ''exec firefox -p Alt --name AltBrowser | notify-send "Alternate Browser"'';
"${primeMod}+F3" = ''exec firefox -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"'';
# Virtual machines
"${primeMod}+F4" = ''exec virt-manager | notify-send "Virtual Machines"'';

1
modules/home/wms/sway/rules/default.nix
View file

@ -65,7 +65,6 @@
{ class = "steam"; }
{ app_id = "heroic"; }
];
"22:${config.ws.w2a}" = [{ app_id = "looking-glass-client"; }];
"44:${config.ws.w4a}" = [{ app_id = "com.obsproject.Studio"; }];
};
focus.newWindow = "focus";

19
modules/system/accounts/users/custom/main/default.nix
View file

@ -3,16 +3,17 @@
users.users."${config.sysusers.main}" = {
hashedPassword = config.secrets.mainAccPass;
isNormalUser = true;
openssh.authorizedKeys.keyFiles = [
../../../../../../hosts/tower/id_ed25519.pub
../../../../../../hosts/envy/id_ed25519.pub
../../../../../../hosts/redmond/id_ed25519.pub
../../../../../../hosts/kitty/id_ed25519.pub
../../../../../../hosts/midas/id_ed25519.pub
../../../../../../hosts/prophet/id_ed25519.pub
];
openssh.authorizedKeys.keys = [
(builtins.readFile ../../../../../../hosts/tower/id_ed25519.pub)
(builtins.readFile ../../../../../../hosts/envy/id_ed25519.pub)
(builtins.readFile ../../../../../../hosts/redmond/id_ed25519.pub)
(builtins.readFile ../../../../../../hosts/kitty/id_ed25519.pub)
(builtins.readFile ../../../../../../hosts/midas/id_ed25519.pub)
(builtins.readFile ../../../../../../hosts/prophet/id_ed25519.pub)
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
];
extraGroups = [

2
modules/system/devices/bluetooth/default.nix
View file

@ -9,8 +9,6 @@
};
};
systemd.tmpfiles.rules = [ "f /var/lib/systemd/linger/${config.sysusers.main}" ];
environment.persistence."/persist".directories = [ "/var/lib/bluetooth" ];
};
}

49
modules/system/services/general/libvirtd/default.nix
View file

@ -3,39 +3,30 @@
options.system.libvirtd.enable = lib.mkEnableOption "Enable libvirtd services";
config = lib.mkIf config.system.libvirtd.enable {
virtualisation = {
libvirtd = {
enable = true;
onBoot = "ignore";
onShutdown = "shutdown";
qemu = {
ovmf = {
enable = true;
packages = with pkgs; [ OVMFFull.fd ];
};
swtpm.enable = true;
virtualisation.libvirtd = {
enable = true;
onBoot = "ignore";
onShutdown = "shutdown";
qemu = {
ovmf = {
enable = true;
packages = with pkgs; [ OVMFFull.fd ];
};
vhostUserPackages = with pkgs; [ virtiofsd ];
swtpm.enable = true;
};
};
environment = {
systemPackages = with pkgs; [
virt-manager
virtiofsd
dnsmasq
spice-vdagent
looking-glass-client
];
programs.virt-manager.enable = true;
persistence."/persist".directories = [
"/var/lib/libvirt/dnsmasq"
"/var/lib/libvirt/nwfilter"
"/var/lib/libvirt/qemu"
"/var/lib/libvirt/secrets"
"/var/lib/libvirt/storage"
"/var/lib/libvirt/swtpm"
];
};
environment.persistence."/persist".directories = [
"/var/lib/libvirt/dnsmasq"
"/var/lib/libvirt/nwfilter"
"/var/lib/libvirt/qemu"
"/var/lib/libvirt/secrets"
"/var/lib/libvirt/storage"
"/var/lib/libvirt/swtpm"
];
# Needed to make NAT work
networking.firewall.trustedInterfaces = [
@ -43,6 +34,6 @@
"virbr1"
];
systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 ${config.sysusers.main} libvirtd -" ];
systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 - libvirtd -" ];
};
}

7
modules/system/services/server/forgejo/default.nix
View file

@ -1,10 +1,11 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
{
imports = [ ./nginx ];
config = lib.mkIf config.system.server.enable {
services.forgejo = {
enable = true;
package = pkgs.forgejo;
settings = {
server = {
DOMAIN = "git.${config.domains.p2}";
@ -33,8 +34,6 @@
services.ddclient.domains = [ "git.${config.domains.p2}" ];
environment.persistence."/persist".directories = [
"/var/lib/forgejo"
];
environment.persistence."/persist".directories = [ "/var/lib/forgejo" ];
};
}