laptop config confirmed building and seems working

This commit is contained in:
krizej 2024-08-02 00:10:45 +02:00
parent 2402a649a5
commit 509f409616
6 changed files with 49 additions and 43 deletions

BIN
files/black.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View file

@ -7,12 +7,11 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
]; ];
}; };
# "laptop" = inputs.nixpkgs.lib.nixosSystem { "laptop" = inputs.nixpkgs.lib.nixosSystem {
# modules = [ modules = [
# ./laptop ./laptop
# ../modules ../modules
# # { nixpkgs.overlays = [ nur.overlay ]; } inputs.home-manager.nixosModules.home-manager
# # nur.nixosModules.nur ];
# ]; };
# };
} }

View file

@ -104,6 +104,10 @@
"1" = monitors.primary; "1" = monitors.primary;
"2" = monitors.secondary; "2" = monitors.secondary;
}; };
communicators = {
autostart = true;
workspace = "2";
};
}; };
ssh = { ssh = {

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -13,13 +13,21 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
home-manager.users.${user}.home.packages = with pkgs; [ home-manager.users.${user}.home = {
pamixer packages = with pkgs; [
yt-dlp pamixer
aseprite yt-dlp
cloc aseprite
viu cloc
]; viu
];
file = {
# for some reason no background is set at all by default
# which means i get the last "frame" of the login screen as my bg
".background-image".source = ../../files/black.png;
};
};
chuj = { chuj = {
system = { system = {
@ -31,7 +39,6 @@
home-manager.enable = true; home-manager.enable = true;
stuff = { stuff = {
xserver.enable = true;
sddm.enable = true; sddm.enable = true;
alacritty.enable = true; alacritty.enable = true;
vim.enable = true; vim.enable = true;
@ -44,6 +51,12 @@
documentation.enable = true; documentation.enable = true;
theme.enable = true; theme.enable = true;
printing.enable = true; printing.enable = true;
i3.enable = true;
xserver = {
enable = true;
libinput = true;
};
gaming = { gaming = {
enable = true; enable = true;
@ -57,14 +70,6 @@
}; };
}; };
i3 = {
enable = true;
communicators = {
autostart = false;
workspace = null;
};
};
ssh = { ssh = {
enable = true; enable = true;
keys = { keys = {

View file

@ -14,11 +14,11 @@ in {
options = { options = {
autostart = mkOption { autostart = mkOption {
type = types.bool; type = types.bool;
default = true; default = false;
}; };
workspace = mkOption { workspace = mkOption {
type = types.str; type = types.str;
default = "2"; default = "";
}; };
}; };
}; };
@ -34,7 +34,7 @@ in {
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
enable = true; enable = true;
config = rec { config = rec {
assigns = mkIf (cfg.communicators.workspace != null) { assigns = mkIf (cfg.communicators.workspace != "") {
${cfg.communicators.workspace} = [ ${cfg.communicators.workspace} = [
{ class = "discord"; } { class = "discord"; }
{ class = "SchildiChat"; } { class = "SchildiChat"; }

View file

@ -4,6 +4,7 @@
in { in {
options.chuj.stuff.xserver = { options.chuj.stuff.xserver = {
enable = mkEnableOption "xserver"; enable = mkEnableOption "xserver";
libinput = mkEnableOption "libinput";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -27,17 +28,14 @@ in {
xdotool xdotool
]; ];
# https://www.reddit.com/r/linux_gaming/comments/1dkbh5t/games_behaving_differently_on_xorg_than_on/ services.libinput = if cfg.libinput then {
# FUCK YOU LIBINPUT enable = true;
services.libinput.enable = lib.mkForce false; touchpad = {
# services.libinput = { naturalScrolling = false; # it's reversed on my laptop for some reason
# enable = true; tapping = true;
# touchpad = { tappingButtonMap = "lmr";
# naturalScrolling = false; # it's reversed on my laptop for some reason scrollMethod = "edge";
# tapping = true; };
# tappingButtonMap = "lmr"; } else { enable = lib.mkForce false; }; # fuck you
# scrollMethod = "edge";
# };
# };
}; };
} }