From 53e2d19bd1970a42976a325ae2bd1690671d8fdc Mon Sep 17 00:00:00 2001 From: twoneis Date: Wed, 13 Mar 2024 17:12:48 +0100 Subject: [PATCH] niri works --- devices/desktop/options.nix | 2 +- modules/system/audio.nix | 2 +- modules/system/bluetooth.nix | 6 ++++++ modules/system/default.nix | 1 + modules/system/home/chat/default.nix | 1 + modules/system/niri/config.kdl | 13 +++++++------ 6 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 modules/system/bluetooth.nix diff --git a/devices/desktop/options.nix b/devices/desktop/options.nix index 990e00e..c0ecb9c 100644 --- a/devices/desktop/options.nix +++ b/devices/desktop/options.nix @@ -1,5 +1,5 @@ { ... }: { - withNiri = false; + withNiri = true; withGnome = true; withNvidia = true; withVM = false; diff --git a/modules/system/audio.nix b/modules/system/audio.nix index 2725221..3d387d0 100644 --- a/modules/system/audio.nix +++ b/modules/system/audio.nix @@ -1,6 +1,6 @@ { ... }: { # Enable sound with pipewire. - sound.enable = true; + sound.enable = false; hardware.pulseaudio.enable = false; services.pipewire = { enable = true; diff --git a/modules/system/bluetooth.nix b/modules/system/bluetooth.nix new file mode 100644 index 0000000..68b065b --- /dev/null +++ b/modules/system/bluetooth.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + services.blueman.enable = true; + environment.systemPackages = with pkgs; [ + blueman + ]; +} diff --git a/modules/system/default.nix b/modules/system/default.nix index 6e08a4d..d7a84f1 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -5,6 +5,7 @@ { pkgs, ... }: { imports = [ ./audio.nix + ./bluetooth.nix ./containers.nix ./distrobox.nix ./fonts.nix diff --git a/modules/system/home/chat/default.nix b/modules/system/home/chat/default.nix index 986d19a..a19f948 100644 --- a/modules/system/home/chat/default.nix +++ b/modules/system/home/chat/default.nix @@ -1,5 +1,6 @@ { pkgs, ... }: { home.packages = with pkgs; [ signal-desktop + fractal ]; } diff --git a/modules/system/niri/config.kdl b/modules/system/niri/config.kdl index 83d45d6..39897ef 100644 --- a/modules/system/niri/config.kdl +++ b/modules/system/niri/config.kdl @@ -116,9 +116,9 @@ layout { // Proportion sets the width as a fraction of the output width, taking gaps into account. // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. // The default preset widths are 1/3, 1/2 and 2/3 of the output. - proportion 0.333 + proportion 0.25 proportion 0.5 - proportion 0.667 + proportion 0.75 // Fixed sets the width in logical pixels exactly. // fixed 1920 @@ -130,7 +130,7 @@ layout { // default-column-width {} // Set gaps around windows in logical pixels. - gaps 8 + gaps 4 // Struts shrink the area occupied by windows, similarly to layer-shell panels. // You can think of them as a kind of outer gaps. They are set in logical pixels. @@ -190,7 +190,7 @@ binds { Mod+T { spawn "alacritty"; } Mod+B { spawn "firefox"; } - Mod+Q { close-window; } + Mod+Backspace { close-window; } Mod+Comma { focus-column-left; } Mod+Period { focus-column-right; } @@ -200,7 +200,7 @@ binds { Mod+Right { focus-column-right; } Mod+Shift+Comma { move-column-left; } - Mod+Shift+Period { move-window-down; } + Mod+Shift+Period { move-column-right; } Mod+Ctrl+Left { move-column-left; } Mod+Ctrl+Down { move-window-down; } Mod+Ctrl+Up { move-window-up; } @@ -214,7 +214,8 @@ binds { // Mod+Ctrl+K { move-window-up-or-to-workspace-up; } Mod+F { maximize-column; } - Mod+C { center-column; } + Mod+K { center-column; } + Mod+Z { switch-preset-column-width; } // Finer width adjustments. // This command can also: