mirror of
https://github.com/TheWanderingCrow/CrOS.git
synced 2026-01-11 09:44:08 -05:00
testing
This commit is contained in:
parent
20c0d65b39
commit
439869aa1c
6 changed files with 16 additions and 43 deletions
|
|
@ -1,5 +1,8 @@
|
||||||
{...}: {
|
{...}: {
|
||||||
imports = [
|
imports = [
|
||||||
common/core
|
common/core
|
||||||
|
common/optional/desktops/niri.nix
|
||||||
|
common/optional/desktops/sway
|
||||||
|
common/optional/browsers/firefox.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ in {
|
||||||
#./${platform.nix}
|
#./${platform.nix}
|
||||||
./xdg.nix
|
./xdg.nix
|
||||||
./direnv.nix
|
./direnv.nix
|
||||||
./firefox.nix
|
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -4,19 +4,19 @@
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
imports = [
|
||||||
|
inputs.niri-flake.homeModules.niri
|
||||||
|
];
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
inputs.niri-flake.overlays.niri
|
inputs.niri-flake.overlays.niri
|
||||||
];
|
];
|
||||||
home.packages = [
|
|
||||||
pkgs.niri
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.niri = {
|
programs.niri = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
binds = with config.lib.niri.actions; {
|
binds = with config.lib.niri.actions; {
|
||||||
"Mod+Shift+Slash".action = show-hotkey-overlay;
|
"Mod+Shift+Slash".action = show-hotkey-overlay;
|
||||||
"Mod+Enter" = {
|
"Mod+Return" = {
|
||||||
hotkey-overlay.title = "Open terminal";
|
hotkey-overlay.title = "Open terminal";
|
||||||
action = spawn "foot";
|
action = spawn "foot";
|
||||||
};
|
};
|
||||||
|
|
@ -44,10 +44,7 @@
|
||||||
gaps = 16;
|
gaps = 16;
|
||||||
};
|
};
|
||||||
spawn-at-startup = [
|
spawn-at-startup = [
|
||||||
"waybar"
|
{command = ["waybar"];}
|
||||||
"swaync"
|
|
||||||
"udiskie"
|
|
||||||
"/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
{config, ...}: {
|
{
|
||||||
home.file."${config.xdg.configHome}/sway/sway.conf" = {
|
lib,
|
||||||
source = ./sway.conf;
|
config,
|
||||||
};
|
...
|
||||||
|
}: {
|
||||||
wayland.windowManager.sway = {
|
wayland.windowManager.sway = {
|
||||||
enable = true;
|
enable = true;
|
||||||
systemd.enable = true;
|
config = null;
|
||||||
xwayland = true;
|
extraConfig = builtins.readFile ./sway.conf;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,32 +7,6 @@ exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
|
||||||
exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
||||||
|
|
||||||
|
|
||||||
################
|
|
||||||
### MONITORS ###
|
|
||||||
################
|
|
||||||
|
|
||||||
#include /home/crow/.config/sway/monitors.conf
|
|
||||||
output HDMI-A-1 mode 1920x1080@74.973Hz
|
|
||||||
output HDMI-A-1 pos 0 0
|
|
||||||
output HDMI-A-1 transform 270
|
|
||||||
|
|
||||||
output DP-1 mode 2560x1440@169.831Hz
|
|
||||||
output DP-1 pos 1080 215
|
|
||||||
|
|
||||||
# Backgrounds
|
|
||||||
output HDMI-A-1 background /home/crow/.config/sway/background-2 fill
|
|
||||||
output DP-1 background /home/crow/.config/sway/background-1 fill
|
|
||||||
|
|
||||||
# Assign specific workspaces to specific outputs
|
|
||||||
workspace 1 output HDMI-A-1 # Firefox
|
|
||||||
workspace 2 output HDMI-A-1 # Comms
|
|
||||||
workspace 3 output DP-1 # Terminal
|
|
||||||
workspace 5 output DP-1 # Mudlet
|
|
||||||
|
|
||||||
# Assign wacom tablet to primary monitor
|
|
||||||
input type:tablet_tool map_to_output DP-1
|
|
||||||
|
|
||||||
|
|
||||||
###################
|
###################
|
||||||
### MY PROGRAMS ###
|
### MY PROGRAMS ###
|
||||||
###################
|
###################
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ in {
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
hashedPasswordFile = config.users.users.${hostSpec.username}.hashedPasswordFile;
|
hashedPasswordFile = config.users.users.${hostSpec.username}.hashedPasswordFile;
|
||||||
hashedPassword = config.users.users.${hostSpec.username}.hashedPassword;
|
hashedPassword = config.users.users.${hostSpec.username}.hashedPassword;
|
||||||
|
password = "test";
|
||||||
openssh.authorizedKeys.keys = config.users.users.${hostSpec.username}.openssh.authorizedKeys.keys; # root's ssh keys are mainly used for remote deployment.
|
openssh.authorizedKeys.keys = config.users.users.${hostSpec.username}.openssh.authorizedKeys.keys; # root's ssh keys are mainly used for remote deployment.
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue