Compare commits
6 Commits
593437fa94
...
166c35caec
| Author | SHA1 | Date | |
|---|---|---|---|
|
166c35caec
|
|||
|
c204312423
|
|||
|
ddc5722bbe
|
|||
|
cadd7bd949
|
|||
|
2fbf61c052
|
|||
|
5d699a2d58
|
@ -158,6 +158,8 @@
|
|||||||
"com.usebottles.bottles"
|
"com.usebottles.bottles"
|
||||||
"io.github.lawstorant.boxflat"
|
"io.github.lawstorant.boxflat"
|
||||||
|
|
||||||
|
"org.onlyoffice.desktopeditors"
|
||||||
|
|
||||||
# "com.unity.UnityHub"
|
# "com.unity.UnityHub"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@ -583,9 +583,35 @@ in {
|
|||||||
|
|
||||||
# Floating + unmaximized windows
|
# Floating + unmaximized windows
|
||||||
{
|
{
|
||||||
matches = [{app-id = "com.github.finefindus.eyedropper";}];
|
matches = [
|
||||||
open-floating = true;
|
{app-id = "com.github.finefindus.eyedropper";}
|
||||||
|
{app-id = "re.sonny.Junction";}
|
||||||
|
];
|
||||||
|
|
||||||
open-maximized = false;
|
open-maximized = false;
|
||||||
|
open-floating = true;
|
||||||
|
|
||||||
|
# default-floating-position = {
|
||||||
|
# x = 0;
|
||||||
|
# y = 0;
|
||||||
|
# relative-to = "center";
|
||||||
|
# };
|
||||||
|
}
|
||||||
|
|
||||||
|
# Specific floating windows
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{app-id = "re.sonny.Junction";}
|
||||||
|
];
|
||||||
|
default-column-width.fixed = 500;
|
||||||
|
default-window-height.fixed = 250;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{app-id = "com.github.finefindus.eyedropper";}
|
||||||
|
];
|
||||||
|
default-column-width.fixed = 250;
|
||||||
|
default-window-height.fixed = 500;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Rules for specific windows
|
# Rules for specific windows
|
||||||
|
|||||||
@ -177,6 +177,7 @@ in {
|
|||||||
# celluloid
|
# celluloid
|
||||||
cine
|
cine
|
||||||
eyedropper
|
eyedropper
|
||||||
|
junction
|
||||||
])
|
])
|
||||||
|
|
||||||
# Darwin exclusive packages
|
# Darwin exclusive packages
|
||||||
|
|||||||
@ -85,6 +85,10 @@ in {
|
|||||||
run = ''xdg-open "$@"'';
|
run = ''xdg-open "$@"'';
|
||||||
desc = "Open selection";
|
desc = "Open selection";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
run = ''junction "$@"'';
|
||||||
|
desc = "Open selection in chosen application";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
extract = [
|
extract = [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -9,14 +9,40 @@
|
|||||||
mkCommonNixSettings = username: {
|
mkCommonNixSettings = username: {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nixVersions.stable;
|
package = pkgs.nixVersions.stable;
|
||||||
|
|
||||||
extraOptions = ''
|
extraOptions = ''
|
||||||
experimental-features = nix-command flakes pipe-operators
|
experimental-features = nix-command flakes pipe-operators
|
||||||
'';
|
'';
|
||||||
settings.trusted-users = ["root" username];
|
|
||||||
gc.automatic = false;
|
settings = {
|
||||||
gc.options = "--delete-older-than 5d";
|
trusted-users = ["root" username];
|
||||||
settings.auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
optimise.automatic = true;
|
|
||||||
|
substituters = [
|
||||||
|
"https://cache.nixos.org"
|
||||||
|
"https://nix-community.cachix.org"
|
||||||
|
"https://comfyui.cachix.org"
|
||||||
|
# "https://ai.cachix.org"
|
||||||
|
# "https://app.cachix.org/cache/nixos-rocm"
|
||||||
|
];
|
||||||
|
trusted-public-keys = [
|
||||||
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
"comfyui.cachix.org-1:33mf9VzoIjzVbp0zwj+fT51HG0y31ZTK3nzYZAX0rec="
|
||||||
|
# "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
|
||||||
|
# "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
gc = {
|
||||||
|
automatic = false;
|
||||||
|
options = "--delete-older-than 5d";
|
||||||
|
};
|
||||||
|
|
||||||
|
optimise = {
|
||||||
|
automatic = true;
|
||||||
|
};
|
||||||
|
|
||||||
registry = lib.mapAttrs' (n: v: lib.nameValuePair n {flake = v;}) inputs;
|
registry = lib.mapAttrs' (n: v: lib.nameValuePair n {flake = v;}) inputs;
|
||||||
nixPath = [
|
nixPath = [
|
||||||
"nixpkgs=${inputs.nixpkgs.outPath}"
|
"nixpkgs=${inputs.nixpkgs.outPath}"
|
||||||
@ -49,7 +75,6 @@
|
|||||||
|
|
||||||
# Import the toplevel system configuration module.
|
# Import the toplevel system configuration module.
|
||||||
../system
|
../system
|
||||||
../system/cachix.nix
|
|
||||||
|
|
||||||
# Host specific configuration
|
# Host specific configuration
|
||||||
../system/${hostname}
|
../system/${hostname}
|
||||||
@ -123,9 +148,6 @@
|
|||||||
# to allow installation of unfree software and my own overlays.
|
# to allow installation of unfree software and my own overlays.
|
||||||
{nixpkgs.pkgs = pkgs;}
|
{nixpkgs.pkgs = pkgs;}
|
||||||
|
|
||||||
# Import the toplevel system configuration module.
|
|
||||||
../system/cachix.nix
|
|
||||||
|
|
||||||
# Host specific configuration
|
# Host specific configuration
|
||||||
../system/${hostname}
|
../system/${hostname}
|
||||||
|
|
||||||
|
|||||||
@ -1,16 +0,0 @@
|
|||||||
# WARN: this file will get overwritten by $ cachix use <name>
|
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
folder = ./cachix;
|
|
||||||
toImport = name: value: folder + ("/" + name);
|
|
||||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
|
||||||
imports =
|
|
||||||
lib.mapAttrsToList toImport
|
|
||||||
(lib.filterAttrs filterCaches (builtins.readDir folder));
|
|
||||||
in {
|
|
||||||
inherit imports;
|
|
||||||
nix.settings.substituters = ["https://cache.nixos.org/"];
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
nix.settings = {
|
|
||||||
substituters = [
|
|
||||||
"https://nix-community.cachix.org"
|
|
||||||
# "https://app.cachix.org/cache/nixos-rocm"
|
|
||||||
# "https://ai.cachix.org"
|
|
||||||
];
|
|
||||||
trusted-public-keys = [
|
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
|
||||||
# "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
|
|
||||||
# "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -144,7 +144,7 @@ with mylib.networking; {
|
|||||||
|
|
||||||
documentation = {
|
documentation = {
|
||||||
# NOTE: Disable this while configuring stuff, it's slow
|
# NOTE: Disable this while configuring stuff, it's slow
|
||||||
enable = true;
|
enable = false;
|
||||||
man.enable = config.documentation.enable;
|
man.enable = config.documentation.enable;
|
||||||
man.cache.enable = true; # Slow but needed for neovim man picker
|
man.cache.enable = true; # Slow but needed for neovim man picker
|
||||||
info.enable = config.documentation.enable;
|
info.enable = config.documentation.enable;
|
||||||
|
|||||||
@ -69,7 +69,10 @@ in {
|
|||||||
# https://github.com/nix-community/impermanence/issues/253
|
# https://github.com/nix-community/impermanence/issues/253
|
||||||
(mkRDir "/usr/systemd-placeholder" m755)
|
(mkRDir "/usr/systemd-placeholder" m755)
|
||||||
|
|
||||||
(mkDir "mandb" "/var/cache/man" m755)
|
# TODO: Why does this use the mandb user?
|
||||||
|
# TODO: Why does this apparently conflict with comfyui-nix?
|
||||||
|
# (mkDir "mandb" "/var/cache/man" m755)
|
||||||
|
|
||||||
# (mkRDir "/var/cache/restic-backups-synology" m755)
|
# (mkRDir "/var/cache/restic-backups-synology" m755)
|
||||||
|
|
||||||
(mkRDir "/var/db/sudo" m711)
|
(mkRDir "/var/db/sudo" m711)
|
||||||
|
|||||||
Reference in New Issue
Block a user