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

feat: tweaking niri

Browse source
This commit is contained in:
Nick 2025-05-09 23:12:45 -05:00
parent 0af81166cd
commit c4c07a043a
7 changed files with 107 additions and 103 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 config.nixosModules.crust
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.lix-module.nixosModules.default inputs.lix-module.nixosModules.default
inputs.niri.nixosModules.niri
inputs.nur.modules.nixos.default inputs.nur.modules.nixos.default
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
]; ];

9
modules/home/default.nix
View file

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

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

@ -169,6 +169,7 @@ in
outputs = { outputs = {
"DP-1" = { "DP-1" = {
background-color = makeColour el.base02; background-color = makeColour el.base02;
scale = 1.0;
mode = { mode = {
width = 2560; width = 2560;
height = 1080; height = 1080;
@ -218,7 +219,6 @@ in
let let
windowMatch = c: { windowMatch = c: {
app-id = c; app-id = c;
opacity = 1.0;
}; };
appIDs = [ appIDs = [
"floop" "floop"
@ -231,13 +231,13 @@ in
]; ];
in in
builtins.map windowMatch appIDs; builtins.map windowMatch appIDs;
opacity = 1.0;
} }
{ {
matches = matches =
let let
windowMatch = c: { windowMatch = c: {
app-id = c; app-id = c;
open-on-workspace = workspace0;
}; };
appIDs = [ appIDs = [
"signal" "signal"
@ -245,13 +245,13 @@ in
]; ];
in in
builtins.map windowMatch appIDs; builtins.map windowMatch appIDs;
open-on-workspace = workspace0;
} }
{ {
matches = matches =
let let
windowMatch = c: { windowMatch = c: {
app-id = c; app-id = c;
open-on-workspace = workspace1;
}; };
appIDs = [ appIDs = [
"code" "code"
@ -259,13 +259,13 @@ in
]; ];
in in
builtins.map windowMatch appIDs; builtins.map windowMatch appIDs;
open-on-workspace = workspace1;
} }
{ {
matches = matches =
let let
windowMatch = c: { windowMatch = c: {
app-id = c; app-id = c;
open-on-workspace = workspace2;
}; };
appIDs = [ appIDs = [
"steam" "steam"
@ -273,13 +273,13 @@ in
]; ];
in in
builtins.map windowMatch appIDs; builtins.map windowMatch appIDs;
open-on-workspace = workspace2;
} }
{ {
matches = matches =
let let
windowMatch = c: { windowMatch = c: {
app-id = c; app-id = c;
open-on-workspace = workspace3;
}; };
appIDs = [ appIDs = [
"feishin" "feishin"
@ -287,6 +287,7 @@ in
]; ];
in in
builtins.map windowMatch appIDs; builtins.map windowMatch appIDs;
open-on-workspace = workspace3;
} }
{ {
clip-to-geometry = true; clip-to-geometry = true;

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

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

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

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

6
modules/nixos/default.nix
View file

@ -37,9 +37,9 @@ in
deimos = { deimos = {
imports = builtins.attrValues { imports = builtins.attrValues {
inherit (modules) inherit (modules)
# hypr niri
# wayland wayland
plasma # plasma
sddm sddm
flatpak flatpak
xserver xserver

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

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