noa/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/niri'

Browse source
This commit is contained in:
Noa Aarts 2024-11-20 19:35:57 +01:00
commit 3874d7b1b0
Signed by: noa
GPG key ID: 1850932741EFF672
25 changed files with 262 additions and 1116 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hosts/lambdaos/configuration.nix
View file

@ -185,11 +185,6 @@
pinentryPackage = pkgs.pinentry-curses;
};
hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
};
nix-ld.enable = true;
nix-ld.libraries = with pkgs; [
@ -271,16 +266,6 @@
jack.enable = true;
};
fail2ban.enable = true;
greetd = {
enable = false;
settings = rec {
initial_session = {
command = "${pkgs.hyprland}/bin/Hyprland";
user = "noa";
};
default_session = initial_session;
};
};
hardware = {
openrgb = {
enable = true;

129
hosts/muos/configuration.nix
View file

@ -92,38 +92,92 @@
scale = "1";
}
];
extraConfig =
let
hconfig = config.home-manager.users.noa;
in
{
xdg.configFile =
let
wpkgs = inputs.self.packages.${pkgs.system};
in
{
"niri/config.kdl".source = pkgs.substituteAll {
src = ../../extra/niri.kdl;
env = {
kitty = "${pkgs.kitty}/bin/kitty";
launcher = "${wpkgs.wofi-launch}/bin/wofi-launch";
powermenu = "${wpkgs.wofi-power}/bin/wofi-power";
swaylock = "${pkgs.swaylock}/bin/swaylock";
automapaper = lib.strings.concatMapStringsSep "\n" (
command:
(
''spawn-at-startup "${(lib.strings.concatStringsSep ''" "'' (lib.strings.splitString " " command))}"''
)
) hconfig.modules.automapaper.startStrings;
spotify = "spotify";
keepass = "keepassxc";
thunderbird = "thunderbird";
appbar = "${pkgs.waybar}/bin/waybar";
extra = lib.strings.concatStringsSep "\nspawn-at-startup \"" [ "${pkgs.dunst}/bin/dunst\"" ];
extraConfig = {
modules.waybar = {
modules = {
left = [
"niri/workspaces"
"tray"
"niri/window"
];
center = [
"clock"
"custom/spotify"
];
right = [
"custom/vpn"
"wireplumber"
"network"
"cpu"
"memory"
"custom/poweroff"
];
};
enable = lib.mkDefault true;
};
home.packages = with pkgs; [
wl-clipboard
libnotify
playerctl
];
xdg.configFile =
let
spkgs = inputs.self.packages.${pkgs.system};
automapaper-configs = builtins.map (
display:
let
display-shader = pkgs.substituteAll {
src = ../../modules/automapaper/display-with_vars.glsl;
background = nix-colors.lib.conversions.hexToGLSLVec "101012";
foreground = nix-colors.lib.conversions.hexToGLSLVec "192291";
};
state-shader = ../../modules/automapaper/state-game_of_life.glsl;
init-shader = ../../modules/automapaper/init.glsl;
in
(import ../../modules/automapaper/config.nix {
inherit (pkgs) writeTextFile;
inherit
init-shader
state-shader
display-shader
display
;
horizontal = 225;
vertical = 150;
cycles = 2000;
})
) [ "eDP-1" ];
automapaper = lib.strings.concatMapStringsSep "\n" (
file:
''spawn-at-startup "${
inputs.automapaper.packages.${pkgs.system}.automapaper
}/bin/automapaper" "-C" "${file}/config.toml"''
) automapaper-configs;
in
{
# "autostart/spotify.desktop".source = config.lib.file.mkOutOfStoreSymlink "";
"niri/config.kdl".source = pkgs.substituteAll {
src = ../../extra/niri.kdl;
env = {
kitty = "${pkgs.kitty}/bin/kitty";
launcher = "${spkgs.fuzzel-launch}/bin/fuzzel-launch";
powermenu = "${spkgs.fuzzel-power}/bin/fuzzel-power";
swaylock = "${pkgs.swaylock}/bin/swaylock";
automapaper = automapaper;
spotify = "spotify";
keepass = "keepassxc";
thunderbird = "thunderbird";
appbar = "${pkgs.waybar}/bin/waybar";
extra =
"spawn-at-startup \""
+ lib.strings.concatStringsSep "\nspawn-at-startup \"" [
"${pkgs.dunst}/bin/dunst\""
"${pkgs.xwayland-satellite}/bin/xwayland-satellite\""
];
};
};
};
};
};
};
"root" = import ./root.nix;
};
@ -160,11 +214,6 @@
pinentryPackage = pkgs.pinentry-curses;
};
hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
};
niri = {
enable = true;
package = inputs.niri.packages.${pkgs.system}.niri;
@ -233,7 +282,7 @@
services = {
displayManager = {
defaultSession = "hyprland";
defaultSession = "niri";
sddm = {
enable = true;
wayland.enable = true;
@ -251,16 +300,6 @@
pulse.enable = true;
jack.enable = true;
};
greetd = {
enable = false;
settings = rec {
initial_session = {
command = "${pkgs.hyprland}/bin/Hyprland";
user = "noa";
};
default_session = initial_session;
};
};
openssh = {
enable = true;
settings.PasswordAuthentication = false;