pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-12-16 13:28:34 +00:00
parent 883c0c33d0 e0ef310d96
commit 6034bcce0c
6 changed files with 29 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -25,11 +25,11 @@
homeModules = [ homeModules = [
./home/accounts/default.nix ./home/accounts/default.nix
./home/hyprland/default.nix ./home/hyprland/default.nix
./home/nyxt/default.nix
./home/alacritty.nix ./home/alacritty.nix
./home/btop.nix ./home/btop.nix
./home/default.nix ./home/default.nix
./home/emacs.nix ./home/emacs.nix
./home/firefox.nix
./home/media.nix ./home/media.nix
./home/pass.nix ./home/pass.nix
]; ];

2
home/hyprland/config.nix
View file

@ -190,6 +190,7 @@ in ''
bind = SUPER, W, moveworkspacetomonitor, name:web current bind = SUPER, W, moveworkspacetomonitor, name:web current
bind = SUPER, W, workspace, name:web bind = SUPER, W, workspace, name:web
bind = SUPER SHIFT, W, movetoworkspace, 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) windowrule = workspace name:web, (firefox|chromium-browser)
bind = SUPER, T, moveworkspacetomonitor, name:top current bind = SUPER, T, moveworkspacetomonitor, name:top current
@ -201,6 +202,7 @@ in ''
bind = SUPER, A, workspace, name:apps bind = SUPER, A, workspace, name:apps
bind = SUPER SHIFT, A, movetoworkspace, name:apps bind = SUPER SHIFT, A, movetoworkspace, name:apps
windowrule = workspace name:apps, (Signal) windowrule = workspace name:apps, (Signal)
windowrule = workspace name:apps, (WebCord)
windowrule = workspace name:apps, chrome-(.*)-Default windowrule = workspace name:apps, chrome-(.*)-Default
bind = SUPER, F, moveworkspacetomonitor, name:files current bind = SUPER, F, moveworkspacetomonitor, name:files current

32
home/hyprland/default.nix
View file

@ -1,12 +1,5 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [ grim slurp signal-desktop webcord ];
grim
slurp
signal-desktop
webcord
whatsapp-for-linux
teams-for-linux
];
imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ]; imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ];
services = { services = {
avizo.enable = true; avizo.enable = true;
@ -39,18 +32,17 @@
"image/png" = [ "swayimg.desktop" ]; "image/png" = [ "swayimg.desktop" ];
"video/mp4" = [ "mpv.desktop" ]; "video/mp4" = [ "mpv.desktop" ];
"text/csv" = [ "calc.desktop" ]; "text/csv" = [ "calc.desktop" ];
"text/html" = [ "firefox.desktop" ]; "text/html" = [ "nyxt.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ]; "x-scheme-handler/http" = [ "nyxt.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ]; "x-scheme-handler/https" = [ "nyxt.desktop" ];
"x-scheme-handler/about" = [ "firefox.desktop" ]; "x-scheme-handler/about" = [ "nyxt.desktop" ];
"x-scheme-handler/chrome" = [ "firefox.desktop" ]; "x-scheme-handler/chrome" = [ "nyxt.desktop" ];
"x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ]; "application/x-extension-htm" = [ "nyxt.desktop" ];
"application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "nyxt.desktop" ];
"application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "nyxt.desktop" ];
"application/x-extension-shtml" = [ "firefox.desktop" ]; "application/xhtml+xml" = [ "nyxt.desktop" ];
"application/xhtml+xml" = [ "firefox.desktop" ]; "application/x-extension-xhtml" = [ "nyxt.desktop" ];
"application/x-extension-xhtml" = [ "firefox.desktop" ]; "application/x-extension-xht" = [ "nyxt.desktop" ];
"application/x-extension-xht" = [ "firefox.desktop" ];
}; };
associations.added = defaultApplications; associations.added = defaultApplications;
}; };

2
home/hyprland/waybar/default.nix
View file

@ -66,6 +66,7 @@
"Microsoft 365 - (.*)" = "󰏆 $1"; "Microsoft 365 - (.*)" = "󰏆 $1";
"WhatsApp Web" = "󰖣"; "WhatsApp Web" = "󰖣";
"Signal" = "󰒢"; "Signal" = "󰒢";
"(.*)WebCord - (.*)" = "$1󰙯 $2";
"NoMachine - (.*)" = "󰢹 $1"; "NoMachine - (.*)" = "󰢹 $1";
}; };
separate-outputs = true; separate-outputs = true;
@ -76,7 +77,6 @@
"interval" = 1; "interval" = 1;
"player-icons" = { "player-icons" = {
"default" = "󰲸"; "default" = "󰲸";
"ncspot" = "󰓇";
"emms" = ""; "emms" = "";
}; };
"status-icons" = { "status-icons" = {

9
home/media.nix
View file

@ -1,8 +1,5 @@
{ config, lib, pkgs, ... }: { pkgs, ... }: {
programs.mpv = {
{
programs = {
mpv = {
enable = true; enable = true;
scripts = with pkgs.mpvScripts; [ scripts = with pkgs.mpvScripts; [
mpris mpris
@ -14,6 +11,4 @@
webtorrent-mpv-hook webtorrent-mpv-hook
]; ];
}; };
ncspot.enable = true;
};
} }

2
system/desktop.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, user, ... }: { config, pkgs, user, ... }:
{ {
imports = [ ./default.nix ./firefox.nix ./chromium.nix ]; imports = [ ./default.nix ./chromium.nix ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
dex dex
mesa mesa