nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: remove unneeded files

Browse source
This commit is contained in:
Guanran Wang 2024-03-26 16:09:37 +08:00
parent f45522129f
commit dd785d8825
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
18 changed files with 1 additions and 2138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
home/applications/firefox/_nixpak.nix
View file

@ -1,52 +0,0 @@
{
inputs,
pkgs,
...
}: let
mkNixPak = inputs.nixpak.lib.nixpak {
inherit (pkgs) lib;
inherit pkgs;
};
firefox = mkNixPak {
config = {
config,
sloth,
...
}: {
app.package = pkgs.firefox;
flatpak.appId = "org.mozilla.firefox";
imports = [
(inputs.nixpak-pkgs + "/pkgs/modules/gui-base.nix")
(inputs.nixpak-pkgs + "/pkgs/modules/network.nix")
];
# Specified in https://github.com/schizofox/schizofox/blob/main/modules/hm/default.nix
# I really don't have any idea what am I doing, it just works™
dbus.policies = {
"org.mozilla.firefox.*" = "own";
#"org.mozilla.firefox_beta.*" = "own";
};
bubblewrap = let
envSuffix = envKey: sloth.concat' (sloth.env envKey);
in {
bind.rw = [
"/tmp/.X11-unix"
(sloth.envOr "XAUTHORITY" "/no-xauth")
(envSuffix "XDG_RUNTIME_DIR" "/dconf")
(sloth.concat' sloth.homeDir "/.mozilla")
(sloth.concat' sloth.homeDir "/Downloads")
];
bind.ro = [
"/etc/localtime"
"/sys/bus/pci"
["${config.app.package}/lib/firefox" "/app/etc/firefox"]
(sloth.concat' sloth.xdgConfigHome "/dconf")
];
};
};
};
in [firefox]

51
home/applications/librewolf/_nixpak.nix
View file

@ -1,51 +0,0 @@
{
inputs,
pkgs,
...
}: let
mkNixPak = inputs.nixpak.lib.nixpak {
inherit (pkgs) lib;
inherit pkgs;
};
librewolf = mkNixPak {
config = {
config,
sloth,
...
}: {
app.package = pkgs.librewolf;
flatpak.appId = "io.gitlab.librewolf-community";
imports = [
(inputs.nixpak-pkgs + "/pkgs/modules/gui-base.nix")
(inputs.nixpak-pkgs + "/pkgs/modules/network.nix")
];
# Specified in https://github.com/schizofox/schizofox/blob/main/modules/hm/default.nix
# I really don't have any idea what am I doing, it just works™
dbus.policies = {
"io.gitlab.librewolf.*" = "own";
};
bubblewrap = let
envSuffix = envKey: sloth.concat' (sloth.env envKey);
in {
bind.rw = [
"/tmp/.X11-unix"
(sloth.envOr "XAUTHORITY" "/no-xauth")
(envSuffix "XDG_RUNTIME_DIR" "/dconf")
(sloth.concat' sloth.homeDir "/.librewolf")
(sloth.concat' sloth.homeDir "/Downloads")
];
bind.ro = [
"/etc/localtime"
"/sys/bus/pci"
["${config.app.package}/lib/librewolf" "/app/etc/librewolf"]
(sloth.concat' sloth.xdgConfigHome "/dconf")
];
};
};
};
in [librewolf]

19
nixos/profiles/common/core/nix/_monitor.nix
View file

@ -1,19 +0,0 @@
{
pkgs,
inputs,
...
}: let
nom = inputs.nix-monitored.packages.${pkgs.stdenv.hostPlatform.system}.default;
in {
nix.package = nom;
nixpkgs.overlays = [
(_self: super: {
nixos-rebuild = super.nixos-rebuild.override {
nix = super.nom;
};
nix-direnv = super.nix-direnv.override {
nix = super.nom;
};
})
];
}

36
nixos/profiles/common/opt-in/_flatpak.nix
View file

@ -1,36 +0,0 @@
{
services.flatpak.enable = true;
services.gnome.core-utilities.enable = false; # remove default gnome pkgs, for example, gnome-music, to use flatpaks instead
# HACKs:
# Flatpak portal bug
# https://github.com/NixOS/nixpkgs/issues/189851#issuecomment-1238907955
systemd.user.extraConfig = "DefaultEnvironment='PATH=/run/current-system/sw/bin'";
# Flatpak icons / fonts
# https://github.com/NixOS/nixpkgs/issues/119433#issuecomment-1326957279
# No longer works, for some reason
#system.fsPackages = with pkgs; [ bindfs ];
#fileSystems = let
# mkRoSymBind = path: {
# device = path;
# fsType = "fuse.bindfs";
# options = [ "ro" "resolve-symlinks" "x-gvfs-hide" ];
# };
# aggregatedIcons = pkgs.buildEnv {
# name = "system-icons";
# paths = config.environment.systemPackages;
# pathsToLink = [ "/share/icons" ];
# };
# aggregatedFonts = pkgs.buildEnv {
# name = "system-fonts";
# paths = config.fonts.packages;
# pathsToLink = [ "/share/fonts" ];
# };
#in {
# # Create an FHS mount to support flatpak host icons/fonts
# #"/usr/share/icons" = mkRoSymBind (aggregatedIcons + "/share/icons");
# "/usr/share/icons" = mkRoSymBind (/run/current-system/sw/share/icons);
# "/usr/share/fonts" = mkRoSymBind (aggregatedFonts + "/share/fonts");
#};
}

55
nixos/profiles/common/opt-in/_hysteria2-server.nix
View file

@ -1,55 +0,0 @@
{
pkgs,
config,
...
}: let
port = 43956;
in {
### Firewall
networking.firewall = {
allowedTCPPorts = [port 80 443];
allowedUDPPorts = [port 80 443];
};
#### sops-nix
sops.secrets."hysteria-config" = {
owner = config.users.users."hysteria".name;
group = config.users.groups."hysteria".name;
restartUnits = ["hysteria-server.service"];
path = "/etc/hysteria/config.yaml";
};
### User running proxy service
users.groups."hysteria" = {};
users.users."hysteria" = {
isSystemUser = true;
group = config.users.groups."hysteria".name;
};
### Proxy service
systemd.services."hysteria-server" = {
description = "Hysteria Server";
after = ["network.target"];
wantedBy = ["multi-user.target"];
serviceConfig = {
Type = "simple";
WorkingDirectory = "/etc/hysteria";
User = [config.users.users."hysteria".name];
Group = [config.users.groups."hysteria".name];
ExecStart = "${pkgs.hysteria}/bin/hysteria server --config /etc/hysteria/config.yaml";
Restart = "on-failure";
CapabilityBoundingSet = [
"CAP_NET_ADMIN"
"CAP_NET_BIND_SERVICE"
"CAP_NET_RAW"
];
AmbientCapabilities = [
"CAP_NET_ADMIN"
"CAP_NET_BIND_SERVICE"
"CAP_NET_RAW"
];
};
};
}

55
nixos/profiles/common/opt-in/_juicity-server.nix
View file

@ -1,55 +0,0 @@
{
pkgs,
config,
...
}: let
port = "33829";
in {
### Firewall
networking.firewall = {
allowedTCPPorts = [port];
allowedUDPPorts = [port];
};
#### sops-nix
sops.secrets."juicity-config" = {
owner = config.users.users."juicity".name;
group = config.users.groups."juicity".name;
restartUnits = ["juicity-server.service"];
path = "/etc/juicity/config.yaml";
};
### User running proxy service
users.groups."juicity" = {};
users.users."juicity" = {
isSystemUser = true;
group = config.users.groups."juicity".name;
};
### Proxy service
systemd.services."juicity-server" = {
description = "Juicity Server";
after = ["network.target"];
wantedBy = ["multi-user.target"];
serviceConfig = {
Type = "simple";
WorkingDirectory = "/etc/juicity";
User = [config.users.users."juicity".name];
Group = [config.users.groups."juicity".name];
ExecStart = "${pkgs.juicity}/bin/juicity-server run -c /etc/juicity/config.json";
Restart = "on-failure";
CapabilityBoundingSet = [
"CAP_NET_ADMIN"
"CAP_NET_BIND_SERVICE"
"CAP_NET_RAW"
];
AmbientCapabilities = [
"CAP_NET_ADMIN"
"CAP_NET_BIND_SERVICE"
"CAP_NET_RAW"
];
};
};
}

7
nixos/profiles/common/opt-in/_legacy-boot.nix
View file

@ -1,7 +0,0 @@
{
boot.loader = {
grub.enable = true;
grub.device = "/dev/vda"; # or "nodev" for efi only
systemd-boot.enable = false;
};
}

4
nixos/profiles/common/opt-in/_virt-manager.nix
View file

@ -1,4 +0,0 @@
{
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
}

3
nixos/profiles/common/opt-in/_virtualbox.nix
View file

@ -1,3 +0,0 @@
{
virtualisation.virtualbox.host.enable = true;
}

2
overlays/default.nix
View file

@ -6,5 +6,5 @@ let
in { in {
nautilus = import ./nautilus.nix {inherit addPatches;}; nautilus = import ./nautilus.nix {inherit addPatches;};
prismlauncher = import ./prismlauncher.nix {inherit addPatches;}; prismlauncher = import ./prismlauncher.nix {inherit addPatches;};
sway = import ./sway/1.9 {inherit addPatches;}; sway = import ./sway.nix {inherit addPatches;};
} }

0
overlays/sway/1.9/default.nix → overlays/sway.nix
View file

1754
overlays/sway/git/0001-Tray-Implement-dbusmenu.patch
View file

File diff suppressed because it is too large Load diff

32
overlays/sway/git/default.nix
View file

@ -1,32 +0,0 @@
_final: prev: {
sway-unwrapped =
(prev.sway-unwrapped.overrideAttrs (old: {
version = "1.10-unstable-2024-03-01";
src = prev.fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = "5e18ed3cf03eee9e83909fede46dd98dff652647";
hash = "sha256-O0Kh+pnB1Hxc0TBZuAMVLkCYY6BBsSesvvYD923zDvo=";
};
patches =
old.patches
++ [
# (rebased) Tray D-Bus Menu
# https://github.com/swaywm/sway/pull/6249
./0001-Tray-Implement-dbusmenu.patch
];
}))
.override {
wlroots = prev.wlroots.overrideAttrs {
version = "1.18.0-unstable-2024-03-05";
src = prev.fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "31c842e5ece93145604c65be1b14c2f8cee24832";
hash = "sha256-otjJDgWBgn1Wk1e46Y3wr/eEvOsQPTP9jjaX9dlFcjA=";
};
};
};
}

1
pkgs/default.nix
View file

@ -7,7 +7,6 @@ pkgs: {
# scripts # scripts
# TODO: Do I really have to inherit `makeScript` for every script? # TODO: Do I really have to inherit `makeScript` for every script?
# NOTE: ./scripts/_bin/* is unused, I probably should to remove them.
lofi = pkgs.callPackage ./scripts/lofi.nix {inherit makeScript;}; lofi = pkgs.callPackage ./scripts/lofi.nix {inherit makeScript;};
screenshot = pkgs.callPackage ./scripts/screenshot.nix {inherit makeScript;}; screenshot = pkgs.callPackage ./scripts/screenshot.nix {inherit makeScript;};
}; };

19
pkgs/scripts/_bin/wrapped-brightnessctl
View file

@ -1,19 +0,0 @@
#!/usr/bin/env bash
# Original Script: https://github.com/ericmurphyxyz/dotfiles/blob/master/.local/bin/changebrightness
send_notification() {
brightness=$(($(brightnessctl get) / 240))
dunstify -a "changebrightness" -u low -r 9991 -h int:value:"$brightness" -i "brightness-$1" "Brightness: $brightness%" -t 2000
}
case $1 in
up)
brightnessctl set +5%
send_notification "$1"
;;
down)
brightnessctl set 5%-
send_notification "$1"
;;
esac

6
pkgs/scripts/_bin/wrapped-mpvpaper
View file

@ -1,6 +0,0 @@
#!/usr/bin/env bash
# this is kinda dumb too
pkill mpvpaper
mpvpaper -o "loop no-audio" "*" "$1"

32
pkgs/scripts/_bin/wrapped-pamixer
View file

@ -1,32 +0,0 @@
#!/usr/bin/env bash
# Original Script: https://github.com/ericmurphyxyz/dotfiles/blob/master/.local/bin/changebrightness
# Increment, decrement, or mute the volume and send a notification
# of the current volume level.
case $1 in
down)
# Set the volume on (if it was muted)
pamixer -u
pamixer -d 5 # --allow-boost
volume=$(pamixer --get-volume)
dunstify -a "changevolume" -u low -r 9993 -h int:value:"$volume" -i "volume-minus" "Volume: ${volume}%" -t 2000
;;
up)
pamixer -u
pamixer -i 5 # --allow-boost
volume=$(pamixer --get-volume)
dunstify -a "changevolume" -u low -r 9993 -h int:value:"$volume" -i "volume-plus" "Volume: ${volume}%" -t 2000
;;
mute)
pamixer -t
if eval "$(pamixer --get-mute)"; then
dunstify -a "changevolume" -u low -r 9993 -u low -i "volume-mute" "Muted" -t 2000
else
volume=$(pamixer --get-volume)
dunstify -a "changevolume" -u low -r 9993 -h int:value:"$volume" -i "volume-high" "Volume: ${volume}%" -t 2000
fi
;;
esac

11
pkgs/scripts/_bin/wrapped-swww
View file

@ -1,11 +0,0 @@
#!/usr/bin/env bash
# fuck this is so dumb
XPOS=$((hyprctl cursorpos) | awk '{print $1}')
YPOS=$(((1080-"$(hyprctl cursorpos | awk '{print $2}')")))
#echo $XPOS $YPOS
pkill mpvpaper
swww img --transition-type grow --transition-pos "$XPOS $YPOS" --transition-fps 60 --transition-duration 1 "$1"