Compare commits

..

No commits in common. "e54a445a1404c51afc5182d8ff312fc7050f7e8f" and "f72f772cce2d17dc3b8ec08a13149a560a6570b0" have entirely different histories.

13 changed files with 33 additions and 107 deletions

View file

@ -43,6 +43,7 @@ in
daVinci
mpv
freetube
dissent
discordCanary
vesktop
element
@ -56,16 +57,13 @@ in
systemMonitor
usbImager
virtManager
hypr
wayland
# hypr
# wayland
theming
polychromatic
dolphin
espanso
claudeCode
jamesDsp
zoom
academic
;
};
};

View file

@ -1,11 +0,0 @@
let
importList =
let
content = builtins.readDir ./.;
dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
in
map (name: ./. + "/${name}") dirContent;
in
{
imports = importList;
}

View file

@ -1,11 +0,0 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
jabref
;
};
}

View file

@ -1,11 +0,0 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
paperlib
;
};
}

View file

@ -1,11 +0,0 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
zotero-beta
;
};
}

View file

@ -7,7 +7,8 @@
sponsorblock
ublock-origin
unpaywall
zotero-connector
vimium
side-view
;
};
}

View file

@ -1,9 +1,8 @@
{ flake, osConfig, ... }:
{ flake, ... }:
let
inherit (flake.config.services) instances;
inherit (flake.config.machines) devices;
localhost = instances.web.localhost.address0;
hostname = osConfig.networking.hostName;
inherit (flake.config.services)
instances
;
in
{
"${instances.jellyfin.label}" = {
@ -35,14 +34,7 @@ in
icon = ./icons/sx.png;
urls = [
{
template =
(
if hostname == devices.mars.name then
"http://${localhost}:${toString instances.searx.ports.port0}"
else
"https://${instances.searx.subdomain}.${instances.web.domains.url0}"
)
+ "/search?q={searchTerms}";
template = "https://${instances.searx.subdomain}.${instances.web.domains.url0}/search?q={searchTerms}";
}
];
};

View file

@ -1,4 +1,4 @@
{ flake, osConfig, ... }:
{ flake, ... }:
let
configPath = ./config;
flakedPath = configPath + /flake;
@ -21,7 +21,6 @@ let
// (import (flakedPath + "/${searchEngine}") {
inherit
flake
osConfig
;
})
) { } (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
@ -31,21 +30,20 @@ in
{
search = {
force = true;
default = "SearXNG";
default = "Brave";
engines = aggregatedSearchEngines;
order = [
"AlternativeTo"
"Brave"
"Core Radio"
"Hackage"
"Hoogle"
"Jellyfin"
"SearXNG"
"Nix Home Manager"
"Nix Options"
"Nix Packages"
"Nix Wiki"
"PeerTube"
"SearXNG"
"Sci-Hub"
"Torrent Leech"
"Urban Dictionary"

View file

@ -1,7 +1,6 @@
{
pkgs,
flake,
osConfig,
...
}:
let
@ -15,7 +14,7 @@ in
configPath = ./config;
bookmarksPath = import (configPath + /bookmarks) { inherit flake; };
extensionsPath = import (configPath + /extensions) { inherit pkgs; };
searchPath = import (configPath + /search) { inherit flake osConfig; };
searchPath = import (configPath + /search) { inherit flake; };
settingsPath = import (configPath + /settings);
themesPath = import (configPath + /themes);
in

View file

@ -1,11 +0,0 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
jamesdsp
;
};
}

View file

@ -104,8 +104,8 @@ in
tooltip = false;
format-muted = " Muted";
on-click = "easyeffects";
on-scroll-up = "pactl set-sink-volume @DEFAULT_SINK@ +5%";
on-scroll-down = "pactl set-sink-volume @DEFAULT_SINK@ -5%";
on-scroll-up = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink +5% ; pactl set-sink-volume @DEFAULT_SINK@ 5%";
on-scroll-down = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink -5% ; pactl set-sink-volume @DEFAULT_SINK@ -5%";
scroll-step = 5;
format-icons = {
headphone = "";

View file

@ -10,12 +10,13 @@ in
mullvad
syncthing
ollama
hypr
wayland
# hypr
searx
portals
xserver
flatpak
plasma
sddm
wireGuard
;
};

View file

@ -53,26 +53,23 @@ in
mars = devices.mars;
deimos = devices.deimos;
deviceLogic = if hostname == mars.name then deimos else mars;
vpnServers = [
"CA363"
"CA220"
"CA358"
"CA627"
];
vpnCommands = lib.concatStrings (
lib.imap0 (i: server: ''
vpn${toString i}:
sudo systemctl start wg-quick-Proton-${server}.service
'') vpnServers
);
in
{
text = ''
rebuildboot:
nixos-rebuild boot --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
vpn0:
sudo systemctl start wg-quick-Proton-CA363.service
vpn1:
sudo systemctl start wg-quick-Proton-CA220.service
vpn2:
sudo systemctl start wg-quick-Proton-CA358.service
vpn3:
sudo systemctl start wg-quick-Proton-CA627.service
vpnoff:
sudo systemctl stop wg-quick-Proton-*.service
rebuild:
nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace
@ -88,11 +85,6 @@ in
${deviceLogic.name}:
ssh ${deviceLogic.ip.address0}
vpnoff:
sudo systemctl stop wg-quick-Proton-*.service
${vpnCommands}
'';
};
"./Files/Scripts/list.sh" = {