Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos
This commit is contained in:
commit
6034bcce0c
|
@ -25,11 +25,11 @@
|
|||
homeModules = [
|
||||
./home/accounts/default.nix
|
||||
./home/hyprland/default.nix
|
||||
./home/nyxt/default.nix
|
||||
./home/alacritty.nix
|
||||
./home/btop.nix
|
||||
./home/default.nix
|
||||
./home/emacs.nix
|
||||
./home/firefox.nix
|
||||
./home/media.nix
|
||||
./home/pass.nix
|
||||
];
|
||||
|
|
|
@ -190,6 +190,7 @@ in ''
|
|||
bind = SUPER, W, moveworkspacetomonitor, name:web current
|
||||
bind = SUPER, W, workspace, name:web
|
||||
bind = SUPER SHIFT, W, movetoworkspace, name:web
|
||||
bind = SUPER ALT, W, exec, [workspace name:web] nyxt
|
||||
windowrule = workspace name:web, (firefox|chromium-browser)
|
||||
|
||||
bind = SUPER, T, moveworkspacetomonitor, name:top current
|
||||
|
@ -201,6 +202,7 @@ in ''
|
|||
bind = SUPER, A, workspace, name:apps
|
||||
bind = SUPER SHIFT, A, movetoworkspace, name:apps
|
||||
windowrule = workspace name:apps, (Signal)
|
||||
windowrule = workspace name:apps, (WebCord)
|
||||
windowrule = workspace name:apps, chrome-(.*)-Default
|
||||
|
||||
bind = SUPER, F, moveworkspacetomonitor, name:files current
|
||||
|
|
|
@ -1,12 +1,5 @@
|
|||
{ config, lib, pkgs, ... }: {
|
||||
home.packages = with pkgs; [
|
||||
grim
|
||||
slurp
|
||||
signal-desktop
|
||||
webcord
|
||||
whatsapp-for-linux
|
||||
teams-for-linux
|
||||
];
|
||||
home.packages = with pkgs; [ grim slurp signal-desktop webcord ];
|
||||
imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ];
|
||||
services = {
|
||||
avizo.enable = true;
|
||||
|
@ -39,18 +32,17 @@
|
|||
"image/png" = [ "swayimg.desktop" ];
|
||||
"video/mp4" = [ "mpv.desktop" ];
|
||||
"text/csv" = [ "calc.desktop" ];
|
||||
"text/html" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/http" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/https" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/about" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/chrome" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ];
|
||||
"application/x-extension-htm" = [ "firefox.desktop" ];
|
||||
"application/x-extension-html" = [ "firefox.desktop" ];
|
||||
"application/x-extension-shtml" = [ "firefox.desktop" ];
|
||||
"application/xhtml+xml" = [ "firefox.desktop" ];
|
||||
"application/x-extension-xhtml" = [ "firefox.desktop" ];
|
||||
"application/x-extension-xht" = [ "firefox.desktop" ];
|
||||
"text/html" = [ "nyxt.desktop" ];
|
||||
"x-scheme-handler/http" = [ "nyxt.desktop" ];
|
||||
"x-scheme-handler/https" = [ "nyxt.desktop" ];
|
||||
"x-scheme-handler/about" = [ "nyxt.desktop" ];
|
||||
"x-scheme-handler/chrome" = [ "nyxt.desktop" ];
|
||||
"application/x-extension-htm" = [ "nyxt.desktop" ];
|
||||
"application/x-extension-html" = [ "nyxt.desktop" ];
|
||||
"application/x-extension-shtml" = [ "nyxt.desktop" ];
|
||||
"application/xhtml+xml" = [ "nyxt.desktop" ];
|
||||
"application/x-extension-xhtml" = [ "nyxt.desktop" ];
|
||||
"application/x-extension-xht" = [ "nyxt.desktop" ];
|
||||
};
|
||||
associations.added = defaultApplications;
|
||||
};
|
||||
|
|
|
@ -66,6 +66,7 @@
|
|||
"Microsoft 365 - (.*)" = " $1";
|
||||
"WhatsApp Web" = "";
|
||||
"Signal" = "";
|
||||
"(.*)WebCord - (.*)" = "$1 $2";
|
||||
"NoMachine - (.*)" = " $1";
|
||||
};
|
||||
separate-outputs = true;
|
||||
|
@ -76,7 +77,6 @@
|
|||
"interval" = 1;
|
||||
"player-icons" = {
|
||||
"default" = "";
|
||||
"ncspot" = "";
|
||||
"emms" = "";
|
||||
};
|
||||
"status-icons" = {
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs = {
|
||||
mpv = {
|
||||
{ pkgs, ... }: {
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
scripts = with pkgs.mpvScripts; [
|
||||
mpris
|
||||
|
@ -14,6 +11,4 @@
|
|||
webtorrent-mpv-hook
|
||||
];
|
||||
};
|
||||
ncspot.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ config, pkgs, user, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./default.nix ./firefox.nix ./chromium.nix ];
|
||||
imports = [ ./default.nix ./chromium.nix ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
dex
|
||||
mesa
|
||||
|
|
Loading…
Reference in a new issue