mirror of
https://github.com/Theaninova/TheaninovOS.git
synced 2026-10-04 20:51:50 +00:00
update system
This commit is contained in:
@@ -275,19 +275,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
# TODO: include is coming in the next release
|
||||
/*
|
||||
xdg.configFile.niri-config = {
|
||||
enable = osConfig.programs.niri.enable;
|
||||
target = "niri/override.kdl";
|
||||
text = ''
|
||||
include "${config.xdg.configHome}/niri/config.kdl"
|
||||
include "${config.programs.matugen.settings.templates.niri.output_path}"
|
||||
'';
|
||||
};
|
||||
home.sessionVariables.NIRI_CONFIG = "${config.xdg.configHome}/niri/override.kdl";
|
||||
*/
|
||||
|
||||
programs = {
|
||||
kitty.extraConfig = ''
|
||||
include ${config.programs.matugen.settings.templates.kitty.output_path}
|
||||
@@ -404,12 +391,6 @@ in
|
||||
output_path = "${config.xdg.configHome}/vesktop/themes/matugen.theme.css";
|
||||
};
|
||||
}
|
||||
// (lib.optionalAttrs osConfig.programs.niri.enable {
|
||||
niri = {
|
||||
input_path = ./niri.kdl;
|
||||
output_path = "${config.xdg.configHome}/niri/md3-evo.kdl";
|
||||
};
|
||||
})
|
||||
// (lib.optionalAttrs config.programs.kitty.enable {
|
||||
kitty = {
|
||||
input_path = ./kitty.conf;
|
||||
|
||||
@@ -76,10 +76,6 @@ fi
|
||||
systemctl --user daemon-reload &>/dev/null || :
|
||||
systemctl --user restart theme-init.timer &>/dev/null || :
|
||||
|
||||
if command -v niri &>/dev/null; then
|
||||
niri msg action do-screen-transition --delay-ms 500
|
||||
fi
|
||||
|
||||
if [ "$MODE" = "light" ]; then
|
||||
GTK_THEME="adw-gtk3"
|
||||
WALLPAPER=$(dconf read /org/gnome/desktop/background/picture-uri | sed "s/'file:\/\///;s/'//g")
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
./boot/quiet.nix
|
||||
|
||||
./desktops/hyprland.nix
|
||||
./desktops/niri.nix
|
||||
|
||||
./fonts/fira-code.nix
|
||||
./fonts/noto-sans.nix
|
||||
|
||||
@@ -1,164 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
username,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.desktops.niri;
|
||||
in
|
||||
{
|
||||
options.desktops.niri = {
|
||||
enable = lib.mkEnableOption "Enable a DE based on Niri";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.niri.enable = true;
|
||||
|
||||
home-manager.users.${username} = {
|
||||
fonts.fontconfig.enable = true;
|
||||
home = {
|
||||
sessionVariables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
GDK_BACKEND = "wayland";
|
||||
QT_QPA_PLATFORM = "wayland";
|
||||
SDL_VIDEODRIVER = "wayland";
|
||||
};
|
||||
|
||||
packages = with pkgs; [
|
||||
xwayland-satellite
|
||||
# fonts
|
||||
noto-fonts
|
||||
# gnome packages
|
||||
qalculate-gtk
|
||||
evince
|
||||
baobab
|
||||
gnome.gvfs
|
||||
nautilus
|
||||
simple-scan
|
||||
eog
|
||||
ghex
|
||||
gnome-disk-utility
|
||||
# fixes
|
||||
xorg.xrandr
|
||||
];
|
||||
|
||||
pointerCursor = {
|
||||
gtk.enable = true;
|
||||
package = pkgs.capitaine-cursors;
|
||||
name = "capitaine-cursors";
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
niri.settings = {
|
||||
binds = {
|
||||
"Mod+Left".action.focus-column-left = [ ];
|
||||
"Mod+Right".action.focus-column-right = [ ];
|
||||
"Mod+Up".action.focus-window-or-workspace-up = [ ];
|
||||
"Mod+Down".action.focus-window-or-workspace-down = [ ];
|
||||
|
||||
"Mod+WheelScrollUp".action.focus-column-left = [ ];
|
||||
"Mod+WheelScrollDown".action.focus-column-right = [ ];
|
||||
|
||||
"Mod+Shift+Left".action.move-column-left = [ ];
|
||||
"Mod+Shift+Right".action.move-column-right = [ ];
|
||||
"Mod+Shift+Up".action.move-window-up-or-to-workspace-up = [ ];
|
||||
"Mod+Shift+Down".action.move-window-down-or-to-workspace-down = [ ];
|
||||
|
||||
"Mod+C".action.close-window = [ ];
|
||||
/*
|
||||
"Mod+M".action.spawn = [
|
||||
(pkgs.writeShellScript "qalculate" ''
|
||||
if niri msg --json windows | jq -e 'any(.[]; .app_id == "qalculate-gtk")'; then
|
||||
pkill qalculate-gtk
|
||||
else
|
||||
qalculate-gtk &
|
||||
fi
|
||||
'')
|
||||
];
|
||||
*/
|
||||
|
||||
"Mod+T".action.spawn = [ "kitty" ];
|
||||
|
||||
"Mod+V".action.maximize-column = [ ];
|
||||
"Mod+D".action.fullscreen-window = [ ];
|
||||
"Mod+P".action.toggle-window-floating = [ ];
|
||||
|
||||
"Mod+Shift+V".action.screenshot = [ ];
|
||||
# "Mod+Shift+C".action.pick-color = [ ];
|
||||
};
|
||||
overview.zoom = 0.8;
|
||||
window-rules = [
|
||||
{
|
||||
clip-to-geometry = true;
|
||||
tiled-state = true;
|
||||
}
|
||||
{
|
||||
matches = [ { app-id = "neovide"; } ];
|
||||
default-column-width.fixed = 1300;
|
||||
}
|
||||
{
|
||||
matches = [ { app-id = "firefox"; } ];
|
||||
default-column-width.fixed = 1500;
|
||||
}
|
||||
{
|
||||
matches = [ { app-id = "qalculate-gtk"; } ];
|
||||
open-floating = true;
|
||||
default-column-width.fixed = 1000;
|
||||
default-window-height.fixed = 800;
|
||||
default-floating-position = {
|
||||
x = 0;
|
||||
y = 0;
|
||||
relative-to = "bottom";
|
||||
};
|
||||
}
|
||||
];
|
||||
layout = {
|
||||
always-center-single-column = true;
|
||||
center-focused-column = "always";
|
||||
focus-ring.enable = false;
|
||||
border.enable = false;
|
||||
};
|
||||
input = {
|
||||
mouse.accel-profile = "flat";
|
||||
warp-mouse-to-focus.enable = true;
|
||||
focus-follows-mouse = {
|
||||
enable = false;
|
||||
max-scroll-amount = "5%";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
kmscon = {
|
||||
enable = true;
|
||||
config.hwaccel = true;
|
||||
};
|
||||
greetd = {
|
||||
enable = true;
|
||||
greeterManagesPlymouth = false;
|
||||
settings = {
|
||||
initial_session = {
|
||||
command = "${pkgs.niri}/bin/niri-session";
|
||||
user = username;
|
||||
};
|
||||
default_session = {
|
||||
command = "${lib.getExe pkgs.tuigreet} --asterisks --remember --user-menu --cmd '${pkgs.niri}/bin/niri-session'";
|
||||
user = username;
|
||||
};
|
||||
};
|
||||
};
|
||||
dbus = {
|
||||
enable = true;
|
||||
implementation = "broker";
|
||||
};
|
||||
pcscd.enable = true;
|
||||
gvfs.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -36,23 +36,6 @@ in
|
||||
}
|
||||
];
|
||||
};
|
||||
programs.niri.settings.window-rules = [
|
||||
{
|
||||
matches = [
|
||||
{
|
||||
app-id = "firefox";
|
||||
title = "Picture-in-Picture";
|
||||
}
|
||||
];
|
||||
open-focused = false;
|
||||
open-floating = true;
|
||||
default-floating-position = {
|
||||
x = homeConfig.theme.md3-evo.padding;
|
||||
y = homeConfig.theme.md3-evo.padding;
|
||||
relative-to = "top-left";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,15 +26,7 @@ in
|
||||
];
|
||||
}
|
||||
];
|
||||
/*
|
||||
layerrule = [
|
||||
# TODO: Add layer rules for walker
|
||||
"blur, anyrun"
|
||||
"ignorealpha 0.3, anyrun"
|
||||
];
|
||||
*/
|
||||
};
|
||||
programs.niri.settings.binds."Mod+Space".action.spawn = [ (lib.getExe pkgs.walker) ];
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
];
|
||||
|
||||
@@ -71,7 +71,6 @@ in
|
||||
libxi
|
||||
libsm
|
||||
libice
|
||||
gnome2.GConf
|
||||
nspr
|
||||
nss
|
||||
cups
|
||||
@@ -123,9 +122,6 @@ in
|
||||
SDL_mixer
|
||||
SDL2_ttf
|
||||
SDL2_mixer
|
||||
libappindicator-gtk2
|
||||
libdbusmenu-gtk2
|
||||
libindicator-gtk2
|
||||
libcaca
|
||||
libcanberra
|
||||
libgcrypt
|
||||
|
||||
Reference in New Issue
Block a user