From f462a6f1a7fb1f8e8039ed4b6175194a7b4e1f36 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 18:28:49 -0500 Subject: [PATCH 1/9] feat: cleaned up --- lib/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 0e5b5b3..4847c23 100755 --- a/lib/default.nix +++ b/lib/default.nix @@ -3,9 +3,11 @@ inputs, self, ... -}: { +}: +{ flake.lib = { - mkHome = modules: system: + mkHome = + modules: system: inputs.home-manager.lib.homeManagerConfiguration { pkgs = import inputs.nixpkgs { inherit @@ -22,7 +24,8 @@ modules ; }; - mkLinuxSystem = modules: + mkLinuxSystem = + modules: inputs.nixpkgs.lib.nixosSystem { specialArgs = { flake = { From 8dd81e1326a78f2c84480f7412f8514c8fdc7945 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 18:29:14 -0500 Subject: [PATCH 2/9] feat: added some host logic --- .../gui/apps/emulators/ghostty/config/settings.nix | 9 +++++---- modules/home/gui/apps/emulators/ghostty/default.nix | 10 +++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/home/gui/apps/emulators/ghostty/config/settings.nix b/modules/home/gui/apps/emulators/ghostty/config/settings.nix index c342831..4ca9e05 100755 --- a/modules/home/gui/apps/emulators/ghostty/config/settings.nix +++ b/modules/home/gui/apps/emulators/ghostty/config/settings.nix @@ -1,16 +1,17 @@ { flake, + osConfig, pkgs, ... }: let - inherit (flake.config.aesthetics.themes) - fonts - ; + inherit (flake.config.aesthetics.themes) fonts; + inherit (flake.config.machines.devices) deimos; + hostname = osConfig.networking.hostName; in { confirm-close-surface = false; - window-decoration = false; + window-decoration = if hostname == deimos.name then true else false; font-size = fonts.sizes.terminal.size0; font-family = fonts.names.name0; window-padding-x = 10; diff --git a/modules/home/gui/apps/emulators/ghostty/default.nix b/modules/home/gui/apps/emulators/ghostty/default.nix index 42d27b5..e1f8e20 100755 --- a/modules/home/gui/apps/emulators/ghostty/default.nix +++ b/modules/home/gui/apps/emulators/ghostty/default.nix @@ -2,11 +2,19 @@ config, flake, pkgs, + osConfig, ... }: let 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; }; in { From cfe8e57a1e3b0380b1aa2756451d93ffafa771d3 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 18:29:34 -0500 Subject: [PATCH 3/9] feat: switched to plasma (hyprland battery sucks) --- modules/home/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index 8cc1307..81b23f7 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -145,8 +145,8 @@ in systemMonitor usbImager virtManager - hypr - wayland + # hypr + # wayland theming polychromatic dolphin @@ -171,8 +171,8 @@ in bitwarden emote desktop - hypr - wayland + # hypr + # wayland theming ; }; From 31cf224c71ccb3a8af8c991a0db2f07172f39bda Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 18:29:50 -0500 Subject: [PATCH 4/9] feat: improved touchpad on laptop --- modules/nixos/desktop/xserver/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/nixos/desktop/xserver/default.nix b/modules/nixos/desktop/xserver/default.nix index 410c748..6fa2898 100755 --- a/modules/nixos/desktop/xserver/default.nix +++ b/modules/nixos/desktop/xserver/default.nix @@ -10,11 +10,14 @@ libinput = { enable = true; touchpad = { - tapping = true; - naturalScrolling = false; + scrollMethod = "twofinger"; + naturalScrolling = true; + middleEmulation = true; + accelSpeed = "5"; + accelProfile = "adaptive"; + disableWhileTyping = true; }; mouse.accelProfile = "flat"; - touchpad.accelProfile = "flat"; }; }; console.useXkbConfig = true; From c5b5725c7b05f04828e52272444e1b8875ef5aef Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 18:30:13 -0500 Subject: [PATCH 5/9] feat: added some host logic --- modules/nixos/hardware/bluetooth/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/nixos/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix index c6d06a1..655e030 100755 --- a/modules/nixos/hardware/bluetooth/default.nix +++ b/modules/nixos/hardware/bluetooth/default.nix @@ -1,8 +1,13 @@ { pkgs, + config, + flake, ... }: - +let + inherit (flake.config.machines) devices; + hostname = config.networking.hostName; +in { hardware = { bluetooth = { @@ -20,5 +25,5 @@ ]; }; }; - services.blueman.enable = true; + services.blueman.enable = if hostname == devices.deimos.name then false else true; } From 0794fe3c65d49a2d0ea9a97506e1d0a6c61f679a Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 18:30:20 -0500 Subject: [PATCH 6/9] feat: switched to plasma (hyprland battery sucks) --- modules/nixos/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index db5df92..cd5ae03 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -32,10 +32,10 @@ in deimos = { imports = builtins.attrValues { inherit (modules) - hypr - wayland - # plasma - # sddm + # hypr + # wayland + plasma + sddm flatpak xserver ; From 4306036758c2f5c0f9b9c9e6eeee7b32d4369954 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 18:30:29 -0500 Subject: [PATCH 7/9] feat: added back user1 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 68607e9..ce5a76d 100755 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ deimos = inputs.self.lib.mkLinuxSystem [ ./systems/deimos ./profiles/user0 - # ./profiles/user1 + ./profiles/user1 config.nixosModules.deimos config.nixosModules.core config.nixosModules.mantle From e57fdb85e7fa97fccac4c761bf9a71aca34d2014 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 18:53:07 -0500 Subject: [PATCH 8/9] refactor: moved the list inside the helper --- modules/nixos/core/doas/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/nixos/core/doas/default.nix b/modules/nixos/core/doas/default.nix index 4534d4a..2b0cc03 100755 --- a/modules/nixos/core/doas/default.nix +++ b/modules/nixos/core/doas/default.nix @@ -27,13 +27,16 @@ let ceres ] then - user0 + [ + user0 + user1 + ] else if hostname == charon then - user1 + [ user1 ] else if hostname == venus then - user2 + [ user2 ] else - ""; + [ ]; in { security = { @@ -43,9 +46,7 @@ in { keepEnv = true; noPass = true; - users = [ - userLogic - ]; + users = userLogic; } ]; }; From 01eeb12ec6c100ad323089c35919e3f84340e3eb Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 21 Mar 2025 19:36:03 -0500 Subject: [PATCH 9/9] feat: removed desktop from user1's deimos config --- modules/home/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/home/default.nix b/modules/home/default.nix index 81b23f7..1dbd48a 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -170,7 +170,6 @@ in scrcpy bitwarden emote - desktop # hypr # wayland theming