Merge branch 'master' into release-24.11
Some checks are pending
nix-build / adjustor-build (push) Waiting to run
nix-build / clean-install-build (push) Waiting to run
nix-build / emudeck-build (push) Waiting to run
nix-build / hhd-ui-build (push) Waiting to run
nix-build / rofi-bluetooth-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / pacifidlog-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-build / slateport-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run

This commit is contained in:
Aly Raffauf 2024-11-26 19:18:57 -05:00 committed by GitHub
commit 04cc7e5344
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 12 deletions

View file

@ -409,11 +409,11 @@
]
},
"locked": {
"lastModified": 1731736013,
"narHash": "sha256-AYB3yeogE9vtBuSStdFFmGR0kzGuumW4nrpdlcuZ/As=",
"lastModified": 1732648910,
"narHash": "sha256-1F83DUfEHnCZpGY4UOlWaamWoDx8eZ9tHaUF51p2hng=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "a2c6d8d1acce49de8dc7ed951428aae901908316",
"rev": "e86d2ad72094354326887bd6fe156f327d63d491",
"type": "github"
},
"original": {

View file

@ -15,8 +15,8 @@
floating.criteria = [{app_id = "Bitwarden";} {app_id = "org.keepassxc.KeePassXC";}];
gaps = {
smartBorders = "on";
smartGaps = true;
# smartBorders = "on";
# smartGaps = true;
};
input."type:keyboard".xkb_options = "caps:ctrl_modifier";
@ -75,14 +75,14 @@
input.kb_options = "ctrl:nocaps";
windowrulev2 = [
"bordersize 0,floating:0,onworkspace:f[1]"
"bordersize 0,floating:0,onworkspace:w[tv1]"
# "bordersize 0,floating:0,onworkspace:f[1]"
# "bordersize 0,floating:0,onworkspace:w[tv1]"
"center(1),class:(Bitwarden)"
"center(1),class:(org.keepassxc.KeePassXC)"
"float,class:(Bitwarden)"
"float,class:(org.keepassxc.KeePassXC)"
"rounding 0,floating:0,onworkspace:f[1]"
"rounding 0,floating:0,onworkspace:w[tv1]"
# "rounding 0,floating:0,onworkspace:f[1]"
# "rounding 0,floating:0,onworkspace:w[tv1]"
"size 80% 80%,class:(Bitwarden)"
"size 80% 80%,class:(org.keepassxc.KeePassXC)"
"workspace special:magic,class:(org.gnome.Fractal)"
@ -90,9 +90,9 @@
];
workspace = [
"f[1],gapsout:0,gapsin:0"
# "f[1],gapsout:0,gapsin:0"
"special:magic,on-created-empty:${lib.getExe pkgs.fractal}"
"w[tv1],gapsout:0,gapsin:0"
# "w[tv1],gapsout:0,gapsin:0"
];
};
};

View file

@ -13,7 +13,7 @@ self: {
packages = with pkgs; [
fractal
libreoffice-fresh
libreoffice-still
plexamp
teams-for-linux
trayscale