upRootNutrition/dotfiles
1
0
Fork 0
mirror of https://gitlab.com/upRootNutrition/dotfiles.git synced 2025-06-15 09:35:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: upRootNutrition:5dd2fce8e0566841e001689d6942da7b012fb5af
Branches Tags
upRootNutrition:main
...
compare: upRootNutrition:a128d9b7fa3d10fc3b64ada4d713b151f1804ed8
Branches Tags
upRootNutrition:main

4 commits
5dd2fce8e0 ... a128d9b7fa

Author SHA1 Message Date
Nick
a128d9b7fa feat: niri isn't for me 2025-05-10 00:21:19 -05:00
Nick
c4c07a043a feat: tweaking niri 2025-05-09 23:12:45 -05:00
Nick
0af81166cd feat: added niri 2025-05-09 18:53:41 -05:00
Nick
0e338b0333 feat: added niri 2025-05-09 18:28:38 -05:00
8 changed files with 207 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -112,6 +112,7 @@
config.nixosModules.crust
inputs.home-manager.nixosModules.home-manager
inputs.lix-module.nixosModules.default
inputs.niri.nixosModules.niri
inputs.nur.modules.nixos.default
inputs.sops-nix.nixosModules.sops
];

13
modules/home/default.nix
View file

@ -67,8 +67,8 @@ in
zoom
academic
# hypr
niri
wayland
# niri
# wayland
theming
;
};
@ -188,7 +188,8 @@ in
usbImager
virtManager
# hypr
# wayland
niri
wayland
theming
# polychromatic
dolphin
@ -215,7 +216,8 @@ in
bitwarden
emote
# hypr
# wayland
wayland
niri
theming
;
};
@ -237,6 +239,9 @@ in
videoPlaying
discord
signal
niri
wayland
theming
tools
;
};

1
modules/home/gui/apps/tools/espanso/default.nix
View file

@ -5,6 +5,7 @@
{
services.espanso = {
enable = true;
package = pkgs.espanso-wayland;
matches = {
base = {
matches = [

162
modules/home/gui/desktop/niri/default.nix
View file

@ -64,7 +64,8 @@ in
{ command = [ "easyeffects -r" ]; }
{ command = [ "vesktop" ]; }
{ command = [ "signal" ]; }
{ command = [ "floorp" ]; }
{ command = [ "feishin" ]; }
{ command = [ "zeditor" ]; }
];
animations = {
@ -123,7 +124,7 @@ in
"Super+t".action = niri.spawn "zeditor";
"Super+b".action = niri.spawn "floorp";
"Super+x".action = niri.spawn "freetube";
"Super+v".action = niri.spawn "discordcanary";
"Super+v".action = niri.spawn "vesktop";
"Super+m".action = niri.spawn "element-desktop";
"Super+d".action = niri.spawn "ghostty";
"Super+p".action = niri.spawn "bitwarden";
@ -149,8 +150,8 @@ in
"Super+5".action = niri.focus-workspace workspace4;
"Super+c".action = niri.focus-column-or-monitor-left;
"Super+a".action = niri.focus-window-or-monitor-up;
"Super+e".action = niri.focus-window-or-monitor-down;
"Super+a".action = niri.focus-window-or-workspace-up;
"Super+e".action = niri.focus-window-or-workspace-down;
"Super+i".action = niri.focus-column-or-monitor-right;
"Super+Shift+t".action = niri.spawn "ghostty";
@ -160,11 +161,16 @@ in
"Ctrl+Alt+c".action = niri.move-column-left;
"Ctrl+Alt+i".action = niri.move-column-right;
"Ctrl+Alt+f".action = niri.set-column-width "-10%";
"Ctrl+Alt+o".action = niri.set-column-width "+10%";
};
hotkey-overlay.skip-at-startup = true;
outputs = {
"DP-1" = {
background-color = makeColour el.base02;
scale = 1.0;
mode = {
width = 2560;
height = 1080;
@ -189,76 +195,104 @@ in
is-floating = true;
is-focused = true;
};
appIDs = [
".blueman-manager-wrapped"
"org.gnome.Calculator"
"com.github.wwmm.easyeffects"
"emote"
"mpv"
"vlc"
"org.nomacs.ImageLounge"
"flameshot"
"^.protonvpn-app-wrapped$"
"^Picture-in-Picture$"
"^Discord Popout$"
"^Enter name of file to save to…$"
"^File Upload$"
".scrcpy-wrapped"
"^Battle.net$"
];
in
[
(windowMatch ".blueman-manager-wrapped")
(windowMatch "org.gnome.Calculator")
(windowMatch "com.github.wwmm.easyeffects")
(windowMatch "emote")
(windowMatch "mpv")
(windowMatch "vlc")
(windowMatch "org.nomacs.ImageLounge")
(windowMatch "flameshot")
(windowMatch "^.protonvpn-app-wrapped$")
(windowMatch "^Picture-in-Picture$")
(windowMatch "^Discord Popout$")
(windowMatch "^Enter name of file to save to…$")
(windowMatch "^File Upload$")
(windowMatch ".scrcpy-wrapped")
(windowMatch "^Battle.net$")
];
builtins.map windowMatch appIDs;
}
{
matches = [
{ app-id = "floop"; }
{ app-id = "org.kde.kdenlive"; }
{ app-id = "krita"; }
{ app-id = "mpv"; }
{ app-id = "vlc"; }
{ app-id = "Brave-browser"; }
{ app-id = "org.kde.okular"; }
];
matches =
let
windowMatch = c: {
app-id = c;
};
appIDs = [
"floop"
"org.kde.kdenlive"
"krita"
"mpv"
"vlc"
"Brave-browser"
"org.kde.okular"
];
in
builtins.map windowMatch appIDs;
opacity = 1.0;
}
{
matches = [
{ app-id = "signal"; }
{ app-id = "vesktop"; }
];
matches =
let
windowMatch = c: {
app-id = c;
};
appIDs = [
"signal"
"vesktop"
];
in
builtins.map windowMatch appIDs;
open-on-workspace = workspace0;
}
{
matches = [
{ app-id = "code"; }
{ app-id = "zeditor"; }
];
matches =
let
windowMatch = c: {
app-id = c;
};
appIDs = [
"code"
"zeditor"
];
in
builtins.map windowMatch appIDs;
open-on-workspace = workspace1;
}
{
matches = [
{ app-id = "steam"; }
{ app-id = "org.kde.kdenlive"; }
];
matches =
let
windowMatch = c: {
app-id = c;
};
appIDs = [
"steam"
"org.kde.kdenlive"
];
in
builtins.map windowMatch appIDs;
open-on-workspace = workspace2;
}
{
matches = [
{ app-id = "feishin"; }
{ app-id = ".scrcpy-wrapped"; }
];
matches =
let
windowMatch = c: {
app-id = c;
};
appIDs = [
"feishin"
".scrcpy-wrapped"
];
in
builtins.map windowMatch appIDs;
open-on-workspace = workspace3;
}
{
clip-to-geometry = true;
focus-ring = {
active.color = makeColour el.base0E;
inactive.color = makeColour el.base02;
};
border = {
width = 1;
active.color = makeColour el.base0E;
inactive.color = makeColour el.base02;
};
focus-ring.enable = false;
geometry-corner-radius =
let
radius = 10.0;
@ -273,14 +307,16 @@ in
];
layout = {
default-column-width = {
proportion = 0.5;
};
border = {
enable = true;
width = 2;
active.color = makeColour el.base0E;
inactive.color = makeColour el.base02;
};
gaps = 10;
focus-ring.enable = true;
# struts = {
# top = 0;
# bottom = 0;
# left = 0;
# right = 0;
# };
shadow = {
enable = true;
color = el.base11;
@ -292,7 +328,7 @@ in
};
workspaces = {
default = {
${workspace0} = {
name = workspace0;
};
${workspace1} = {

46
modules/home/gui/desktop/wayland/waybar/config/settings.nix
View file

@ -12,12 +12,13 @@ in
margin-left = 5;
margin-right = 5;
modules-left = [
"custom/launcher"
"hyprland/workspaces"
"custom/weather"
# "niri/workspaces"
];
modules-center = [
"custom/weather"
# "custom/launcher"
"clock"
];
modules-right = [
@ -29,7 +30,7 @@ in
"pulseaudio"
# "network"
"battery"
"clock"
# "clock"
];
clock = {
@ -44,29 +45,20 @@ in
format-alt = " {:%d/%m}";
};
"hyprland/workspaces" = {
active-only = false;
disable-scroll = true;
format = "{icon}";
on-click = "activate";
format-icons = {
"1" = "◉";
"2" = "◉";
"3" = "◉";
"4" = "◉";
"5" = "◉";
urgent = "";
default = "◉";
sort-by-number = true;
};
persistent-workspaces = {
"1" = [ ];
"2" = [ ];
"3" = [ ];
"4" = [ ];
"5" = [ ];
};
};
# "niri/workspaces" = {
# active-only = false;
# disable-scroll = true;
# format = "{icon}";
# on-click = "activate";
# format-icons = {
# # focused = "◉";
# # active = "◉";
# # empty = "◯";
# # urgent = "";
# # default = "◯";
# # sort-by-number = true;
# };
# };
memory = {
format = "󰟜 {}%";

135
modules/home/gui/desktop/wayland/waybar/config/style.nix
View file

@ -40,82 +40,87 @@ let
in
''
* {
min-height: 0px;
font-family: ${custom.font};
font-weight: ${custom.font_weight};
}
window#waybar {
background: #${custom.background_2};
color: #${custom.background_3};
border: 2px solid;
border-radius: 30px;
border-color: #${custom.text_color};
min-height: 100px;
opacity: ${custom.opacityBg};
* {
min-height: 30px;
border-radius: 0;
font-family: ${custom.font};
font-weight: ${custom.font_weight};
}
#workspaces {
font-size: 18px;
padding-left: 15px;
margin-bottom: 2px;
}
#workspaces button {
color: #${custom.button_color};
padding: 5px;
opacity: ${custom.opacityBt};
}
#workspaces button.empty {
color: #${custom.background_3};
}
#workspaces button.active {
color: #${custom.text_color};
}
window#waybar {
background: #${custom.background_2};
color: #${custom.text_color};
border: 2px solid;
border-radius: 30px;
border-color: #${custom.text_color};
opacity: ${custom.opacityBg};
}
#tray, #pulseaudio, #privacy, #cpu, #memory, #disk, #clock {
font-size: ${custom.font_size};
color: #${custom.text_color};
padding-right: 10px;
}
#workspaces {
font-size: 18px;
padding-left: 15px;
margin-bottom: 2px;
}
#workspaces button {
color: #${custom.button_color};
padding: 5px 0px 5px 0px;
}
#workspaces button.active {
color: #${custom.text_color};
}
#workspaces button.empty {
color: #${custom.button_color};
}
#workspaces button.focused {
color: #${custom.text_color};
}
#privacy {
}
#tray, #pulseaudio, #privacy, #cpu, #memory, #disk, #clock {
font-size: ${custom.font_size};
color: #${custom.text_color};
padding-right: 10px;
}
#cpu {
}
#privacy {
}
#memory {
}
#cpu {
}
#disk {
}
#memory {
}
#tray {
}
#disk {
}
#pulseaudio {
}
#tray {
}
#clock {
}
#pulseaudio {
}
#battery {
font-size: ${custom.font_size};
color: #${custom.text_color};
padding-right: 10px;
}
#clock {
font-size: 14px;
}
#custom-launcher {
font-size: 20px;
color: #${custom.text_color};
font-weight: ${custom.font_weight};
padding-left: 10px;
}
#battery {
font-size: ${custom.font_size};
color: #${custom.text_color};
padding-right: 10px;
}
#custom-weather {
font-size: 14px;
color: #${custom.text_color};
font-weight: ${custom.font_weight};
}
#custom-launcher {
font-size: 20px;
color: #${custom.text_color};
font-weight: ${custom.font_weight};
padding-left: 10px;
padding-right: 10px;
}
#custom-weather {
font-size: 14px;
color: #${custom.text_color};
font-weight: ${custom.font_weight};
padding-left: 10px;
}
''

14
modules/nixos/default.nix
View file

@ -10,11 +10,11 @@ in
mullvad
syncthing
ollama
# plasma
# sddm
plasma
sddm
# hypr
niri
wayland
# niri
# wayland
searx
portals
xserver
@ -37,9 +37,9 @@ in
deimos = {
imports = builtins.attrValues {
inherit (modules)
# hypr
# wayland
plasma
niri
wayland
# plasma
sddm
flatpak
xserver

2
modules/nixos/desktop/wayland/greetd/default.nix
View file

@ -21,7 +21,7 @@ in
{
services = {
greetd = {
enable = true;
enable = false;
vt = 7;
settings = {
default_session = {