Compare commits

...

9 commits

Author SHA1 Message Date
Nick
01eeb12ec6 feat: removed desktop from user1's deimos config 2025-03-21 19:36:03 -05:00
Nick
e57fdb85e7 refactor: moved the list inside the helper 2025-03-21 18:53:07 -05:00
Nick
4306036758 feat: added back user1 2025-03-21 18:30:29 -05:00
Nick
0794fe3c65 feat: switched to plasma (hyprland battery sucks) 2025-03-21 18:30:20 -05:00
Nick
c5b5725c7b feat: added some host logic 2025-03-21 18:30:13 -05:00
Nick
31cf224c71 feat: improved touchpad on laptop 2025-03-21 18:29:50 -05:00
Nick
cfe8e57a1e feat: switched to plasma (hyprland battery sucks) 2025-03-21 18:29:34 -05:00
Nick
8dd81e1326 feat: added some host logic 2025-03-21 18:29:14 -05:00
Nick
f462a6f1a7 feat: cleaned up 2025-03-21 18:28:49 -05:00
9 changed files with 50 additions and 30 deletions

View file

@ -98,7 +98,7 @@
deimos = inputs.self.lib.mkLinuxSystem [ deimos = inputs.self.lib.mkLinuxSystem [
./systems/deimos ./systems/deimos
./profiles/user0 ./profiles/user0
# ./profiles/user1 ./profiles/user1
config.nixosModules.deimos config.nixosModules.deimos
config.nixosModules.core config.nixosModules.core
config.nixosModules.mantle config.nixosModules.mantle

View file

@ -3,9 +3,11 @@
inputs, inputs,
self, self,
... ...
}: { }:
{
flake.lib = { flake.lib = {
mkHome = modules: system: mkHome =
modules: system:
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs {
inherit inherit
@ -22,7 +24,8 @@
modules modules
; ;
}; };
mkLinuxSystem = modules: mkLinuxSystem =
modules:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
flake = { flake = {

View file

@ -145,8 +145,8 @@ in
systemMonitor systemMonitor
usbImager usbImager
virtManager virtManager
hypr # hypr
wayland # wayland
theming theming
polychromatic polychromatic
dolphin dolphin
@ -170,9 +170,8 @@ in
scrcpy scrcpy
bitwarden bitwarden
emote emote
desktop # hypr
hypr # wayland
wayland
theming theming
; ;
}; };

View file

@ -1,16 +1,17 @@
{ {
flake, flake,
osConfig,
pkgs, pkgs,
... ...
}: }:
let let
inherit (flake.config.aesthetics.themes) inherit (flake.config.aesthetics.themes) fonts;
fonts inherit (flake.config.machines.devices) deimos;
; hostname = osConfig.networking.hostName;
in in
{ {
confirm-close-surface = false; confirm-close-surface = false;
window-decoration = false; window-decoration = if hostname == deimos.name then true else false;
font-size = fonts.sizes.terminal.size0; font-size = fonts.sizes.terminal.size0;
font-family = fonts.names.name0; font-family = fonts.names.name0;
window-padding-x = 10; window-padding-x = 10;

View file

@ -2,11 +2,19 @@
config, config,
flake, flake,
pkgs, pkgs,
osConfig,
... ...
}: }:
let let
configPath = ./config; configPath = ./config;
settingsPath = import (configPath + /settings.nix) { inherit flake pkgs; }; settingsPath = import (configPath + /settings.nix) {
inherit
flake
config
osConfig
pkgs
;
};
themesPath = import (configPath + /themes.nix) { inherit config flake; }; themesPath = import (configPath + /themes.nix) { inherit config flake; };
in in
{ {

View file

@ -27,13 +27,16 @@ let
ceres ceres
] ]
then then
user0 [
user0
user1
]
else if hostname == charon then else if hostname == charon then
user1 [ user1 ]
else if hostname == venus then else if hostname == venus then
user2 [ user2 ]
else else
""; [ ];
in in
{ {
security = { security = {
@ -43,9 +46,7 @@ in
{ {
keepEnv = true; keepEnv = true;
noPass = true; noPass = true;
users = [ users = userLogic;
userLogic
];
} }
]; ];
}; };

View file

@ -32,10 +32,10 @@ in
deimos = { deimos = {
imports = builtins.attrValues { imports = builtins.attrValues {
inherit (modules) inherit (modules)
hypr # hypr
wayland # wayland
# plasma plasma
# sddm sddm
flatpak flatpak
xserver xserver
; ;

View file

@ -10,11 +10,14 @@
libinput = { libinput = {
enable = true; enable = true;
touchpad = { touchpad = {
tapping = true; scrollMethod = "twofinger";
naturalScrolling = false; naturalScrolling = true;
middleEmulation = true;
accelSpeed = "5";
accelProfile = "adaptive";
disableWhileTyping = true;
}; };
mouse.accelProfile = "flat"; mouse.accelProfile = "flat";
touchpad.accelProfile = "flat";
}; };
}; };
console.useXkbConfig = true; console.useXkbConfig = true;

View file

@ -1,8 +1,13 @@
{ {
pkgs, pkgs,
config,
flake,
... ...
}: }:
let
inherit (flake.config.machines) devices;
hostname = config.networking.hostName;
in
{ {
hardware = { hardware = {
bluetooth = { bluetooth = {
@ -20,5 +25,5 @@
]; ];
}; };
}; };
services.blueman.enable = true; services.blueman.enable = if hostname == devices.deimos.name then false else true;
} }