From 408b7c50f0495b6b07bb6c8a60e13e201e24559c Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 19 Oct 2026 22:50:11 +0200 Subject: [PATCH 1/8] fixup user --- modules/system/core/user.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index fcd59f2..a2e7a1e 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -2,6 +2,7 @@ flake.nixosModules.user = { imports = [ inputs.home-manager.nixosModules.home-manager + inputs.home-manager.flakeModules.home-manager ]; users.users."lucy" = { isNormalUser = true; @@ -14,6 +15,12 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.lucy = { + home.username = "lucy"; + home.homeDirectory = "/home/lucy"; + home.stateVersion = "26.05"; + programs.home-manager.enable = true; + }; home-manager.sharedModules = with self.homeModules; [ nixcord ghostty From 2eb92dc3ffdebafc25cd922de2a8d8af71c404f2 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 19 Oct 2026 23:02:35 +0200 Subject: [PATCH 2/8] Revert "fixup user" This reverts commit 408b7c50f0495b6b07bb6c8a60e13e201e24559c. --- modules/system/core/user.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index a2e7a1e..fcd59f2 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -2,7 +2,6 @@ flake.nixosModules.user = { imports = [ inputs.home-manager.nixosModules.home-manager - inputs.home-manager.flakeModules.home-manager ]; users.users."lucy" = { isNormalUser = true; @@ -15,12 +14,6 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; - home-manager.users.lucy = { - home.username = "lucy"; - home.homeDirectory = "/home/lucy"; - home.stateVersion = "26.05"; - programs.home-manager.enable = true; - }; home-manager.sharedModules = with self.homeModules; [ nixcord ghostty From 63d9c50b5e7fdc82e7c6da3c1f3905666bcc695e Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 19 Oct 2026 23:56:45 +0200 Subject: [PATCH 3/8] fixup home manager config and add fuzzel --- flake.nix | 7 +++++- modules/#default.nix# | 40 ++++++++++++++++++++++++++++++++ modules/home/#home.nix# | 3 +++ modules/home/programs/emacs.nix | 2 +- modules/home/programs/fuzzel.nix | 12 ++++++++++ modules/home/stylix/targets.nix | 3 +-- modules/system/core/packages.nix | 8 ------- modules/system/core/user.nix | 7 ++++++ 8 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 modules/#default.nix# create mode 100644 modules/home/#home.nix# create mode 100644 modules/home/programs/fuzzel.nix diff --git a/flake.nix b/flake.nix index fcb0283..e1e33f8 100644 --- a/flake.nix +++ b/flake.nix @@ -25,5 +25,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); + outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { + imports = [ + inputs.home-manager.flakeModules.home-manager + (inputs.import-tree ./modules) + ]; + }; } diff --git a/modules/#default.nix# b/modules/#default.nix# new file mode 100644 index 0000000..85c0349 --- /dev/null +++ b/modules/#default.nix# @@ -0,0 +1,40 @@ +{ + self, + inputs, + ... +}: +let + mods = with self.nixosModules; [ + user + packages + agenix + boot + core + easyroam + myStylix + stylixTargets + /etc/nixos/hardware-configuration.nix + ]; +in +{ + flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem { + modules = + with self.nixosModules; + [ + { + config.dualBoot = true; + config.networking.hostName = "nerv"; + } + ] + ++ mods; + }; + flake.nixosConfigurations.seele = inputs.nixpkgs.lib.nixosSystem { + modules = [ + { + config.networking.hostName = "seele"; + } + ] + ++ mods; + }; + +} diff --git a/modules/home/#home.nix# b/modules/home/#home.nix# new file mode 100644 index 0000000..90ed547 --- /dev/null +++ b/modules/home/#home.nix# @@ -0,0 +1,3 @@ +{inputs, ...} : { + +} \ No newline at end of file diff --git a/modules/home/programs/emacs.nix b/modules/home/programs/emacs.nix index 476844c..f8d6d78 100644 --- a/modules/home/programs/emacs.nix +++ b/modules/home/programs/emacs.nix @@ -3,7 +3,7 @@ flake.homeModules.emacs = { pkgs, ... }: { programs.emacs = { enable = true; - packages = pkgs.emacs-pgtk; + package = pkgs.emacs-pgtk; extraConfig = '' ;; -*- lexical-binding: t; -*- (setq make-backup-files nil) diff --git a/modules/home/programs/fuzzel.nix b/modules/home/programs/fuzzel.nix new file mode 100644 index 0000000..4b6eb2e --- /dev/null +++ b/modules/home/programs/fuzzel.nix @@ -0,0 +1,12 @@ +{...}: { + flake.homeModules.fuzzel = { + programs.fuzzel = { + enable = true; + settings = { + main = { + dpi_aware = "no"; + }; + }; + }; + }; +} diff --git a/modules/home/stylix/targets.nix b/modules/home/stylix/targets.nix index 89761d1..4e89ec7 100644 --- a/modules/home/stylix/targets.nix +++ b/modules/home/stylix/targets.nix @@ -1,11 +1,10 @@ {inputs, ...}: { flake.homeModules.homeStylix = { - imports = [ inputs.stylix.homeModules.stylix ]; stylix.targets = { ghostty.enable = true; fuzzel.enable = true; gtk.enable = true; - niri.enable = true; + emacs.enable = true; }; }; } diff --git a/modules/system/core/packages.nix b/modules/system/core/packages.nix index 7fc0c36..d40f18c 100644 --- a/modules/system/core/packages.nix +++ b/modules/system/core/packages.nix @@ -6,22 +6,16 @@ stow ufetch rbw - emacs-pgtk - tinty pinentry-gnome3 - git nixd nixfmt xournalpp rnote btop chromium - fuzzel quickshell wl-clipboard adw-gtk3 - papirus-icon-theme - apple-cursor polkit_gnome xwayland-satellite nemo @@ -38,8 +32,6 @@ jq nmgui kdePackages.qtdeclarative - ghostty - rnote gsettings-desktop-schemas glib ]; diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index fcd59f2..c5a4cf3 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -14,12 +14,19 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.lucy = { + home.username = "lucy"; + home.homeDirectory = "/home/lucy"; + home.stateVersion = "25.11"; + + }; home-manager.sharedModules = with self.homeModules; [ nixcord ghostty niri emacs homeStylix + fuzzel ]; }; } From 03ea8da475e0644bfc9e7364c6bab89a6b677a03 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 20 Oct 2026 00:07:20 +0200 Subject: [PATCH 4/8] add git module --- modules/#default.nix# | 40 ------------------------------- modules/default.nix | 9 +++++-- modules/home/programs/ghostty.nix | 1 + modules/home/programs/git.nix | 9 +++++++ modules/system/core/user.nix | 3 ++- modules/system/stylix/default.nix | 4 ++-- modules/system/stylix/fonts.nix | 25 +++++++++++++++++++ 7 files changed, 46 insertions(+), 45 deletions(-) delete mode 100644 modules/#default.nix# create mode 100644 modules/home/programs/git.nix create mode 100644 modules/system/stylix/fonts.nix diff --git a/modules/#default.nix# b/modules/#default.nix# deleted file mode 100644 index 85c0349..0000000 --- a/modules/#default.nix# +++ /dev/null @@ -1,40 +0,0 @@ -{ - self, - inputs, - ... -}: -let - mods = with self.nixosModules; [ - user - packages - agenix - boot - core - easyroam - myStylix - stylixTargets - /etc/nixos/hardware-configuration.nix - ]; -in -{ - flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem { - modules = - with self.nixosModules; - [ - { - config.dualBoot = true; - config.networking.hostName = "nerv"; - } - ] - ++ mods; - }; - flake.nixosConfigurations.seele = inputs.nixpkgs.lib.nixosSystem { - modules = [ - { - config.networking.hostName = "seele"; - } - ] - ++ mods; - }; - -} diff --git a/modules/default.nix b/modules/default.nix index fee437d..b6b8792 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,14 +5,19 @@ }: let mods = with self.nixosModules; [ - user - packages agenix boot core easyroam + git myStylix + packages + pipewire + programs stylixTargets + tlp + user + zsh /etc/nixos/hardware-configuration.nix ]; in diff --git a/modules/home/programs/ghostty.nix b/modules/home/programs/ghostty.nix index abe638a..38b3914 100644 --- a/modules/home/programs/ghostty.nix +++ b/modules/home/programs/ghostty.nix @@ -3,6 +3,7 @@ programs.ghostty = { enable = true; enableZshIntegration = true; + systemd.enable = true; settings = { window-padding-x = 15; window-padding-y = 15; diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix new file mode 100644 index 0000000..8ea7529 --- /dev/null +++ b/modules/home/programs/git.nix @@ -0,0 +1,9 @@ +{ ... }: { + flake.homeModules.git = { + programs.git = { + enable = true; + userName = "lucy"; + userEmail = "lucykaufmann@protonmail.com"; + }; + }; +} diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index c5a4cf3..ea1b077 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -1,9 +1,10 @@ { inputs, self, ... }: { - flake.nixosModules.user = { + flake.nixosModules.user = { pkgs, ... }: { imports = [ inputs.home-manager.nixosModules.home-manager ]; users.users."lucy" = { + shell = pkgs.zsh; isNormalUser = true; description = "lucy"; extraGroups = [ diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix index cd8cf28..ed37f8e 100644 --- a/modules/system/stylix/default.nix +++ b/modules/system/stylix/default.nix @@ -2,11 +2,11 @@ flake.nixosModules.myStylix = { pkgs, ... }: { imports = [ inputs.stylix.nixosModules.stylix + stylix_fonts ]; stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; - + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; }; }; } diff --git a/modules/system/stylix/fonts.nix b/modules/system/stylix/fonts.nix new file mode 100644 index 0000000..8995166 --- /dev/null +++ b/modules/system/stylix/fonts.nix @@ -0,0 +1,25 @@ +{ ... }: { + flake.nixosModules.stylix_fonts = { pkgs, ... }: { + stylix.fonts = { + serif = { + package = config.stylix.fonts.monospace.package; + name = config.stylix.fonts.monospace.name; + }; + + sansSerif = { + package = config.stylix.fonts.monospace.package; + name = config.stylix.fonts.monospace.name; + }; + + monospace = { + package = pkgs.iosevka; + name = "DejaVu Sans Mono"; + }; + + emoji = { + package = pkgs.noto-fonts-color-emoji; + name = "Noto Color Emoji"; + }; + }; + }; +} From b0c2c2e7809aded7dba8fd51ef32338b22de8394 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 20 Oct 2026 00:10:56 +0200 Subject: [PATCH 5/8] add base_services modules --- modules/default.nix | 3 ++- modules/home/programs/git.nix | 6 ++++-- modules/system/core/user.nix | 1 + modules/system/services/base.nix | 5 +++++ modules/system/stylix/default.nix | 1 - modules/system/stylix/fonts.nix | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 modules/system/services/base.nix diff --git a/modules/default.nix b/modules/default.nix index b6b8792..1a07e2a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -6,15 +6,16 @@ let mods = with self.nixosModules; [ agenix + base_services boot core easyroam - git myStylix packages pipewire programs stylixTargets + stylix_fonts tlp user zsh diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix index 8ea7529..cc73877 100644 --- a/modules/home/programs/git.nix +++ b/modules/home/programs/git.nix @@ -2,8 +2,10 @@ flake.homeModules.git = { programs.git = { enable = true; - userName = "lucy"; - userEmail = "lucykaufmann@protonmail.com"; + settings = { + user.name = "lucy"; + user.email = "lucykaufmann@protonmail.com"; + }; }; }; } diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index ea1b077..2de9142 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -26,6 +26,7 @@ ghostty niri emacs + git homeStylix fuzzel ]; diff --git a/modules/system/services/base.nix b/modules/system/services/base.nix new file mode 100644 index 0000000..da34c8c --- /dev/null +++ b/modules/system/services/base.nix @@ -0,0 +1,5 @@ +{ ... }: { + flake.nixosModules.base_services = { + services.upower.enable = true; + }; +} diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix index ed37f8e..335844b 100644 --- a/modules/system/stylix/default.nix +++ b/modules/system/stylix/default.nix @@ -2,7 +2,6 @@ flake.nixosModules.myStylix = { pkgs, ... }: { imports = [ inputs.stylix.nixosModules.stylix - stylix_fonts ]; stylix = { enable = true; diff --git a/modules/system/stylix/fonts.nix b/modules/system/stylix/fonts.nix index 8995166..d059197 100644 --- a/modules/system/stylix/fonts.nix +++ b/modules/system/stylix/fonts.nix @@ -1,5 +1,5 @@ { ... }: { - flake.nixosModules.stylix_fonts = { pkgs, ... }: { + flake.nixosModules.stylix_fonts = { pkgs, config, ... }: { stylix.fonts = { serif = { package = config.stylix.fonts.monospace.package; From 9afa94aebfc2487dae6cc7b900225048ac6ba99e Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 20 Oct 2026 00:17:43 +0200 Subject: [PATCH 6/8] add icon scheme to stylix --- modules/home/stylix/targets.nix | 1 + modules/system/stylix/default.nix | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/home/stylix/targets.nix b/modules/home/stylix/targets.nix index 4e89ec7..3708b27 100644 --- a/modules/home/stylix/targets.nix +++ b/modules/home/stylix/targets.nix @@ -5,6 +5,7 @@ fuzzel.enable = true; gtk.enable = true; emacs.enable = true; + nixcord.enable = true; }; }; } diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix index 335844b..137c8cd 100644 --- a/modules/system/stylix/default.nix +++ b/modules/system/stylix/default.nix @@ -5,7 +5,18 @@ ]; stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + cursor = { + name = "macOS"; + package = pkgs.apple_cursor; + size = 24; + }; + icons = { + enable = true; + dark = "Papirus-Dark"; + light = "Papirus-Light"; + package = pkgs.papirus-icon-theme; + }; }; }; } From e22083fd39075ca7b725c383e4ed336574ddcbfb Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 20 Oct 2026 00:24:17 +0200 Subject: [PATCH 7/8] update font names --- modules/home/programs/ghostty.nix | 1 + modules/system/core/core.nix | 12 +++++++++++- modules/system/stylix/default.nix | 2 +- modules/system/stylix/fonts.nix | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/home/programs/ghostty.nix b/modules/home/programs/ghostty.nix index 38b3914..33c4cb3 100644 --- a/modules/home/programs/ghostty.nix +++ b/modules/home/programs/ghostty.nix @@ -5,6 +5,7 @@ enableZshIntegration = true; systemd.enable = true; settings = { + quit-after-last-window-closed = false; window-padding-x = 15; window-padding-y = 15; confirm-close-surface = false; diff --git a/modules/system/core/core.nix b/modules/system/core/core.nix index 9f8ff35..5e41653 100644 --- a/modules/system/core/core.nix +++ b/modules/system/core/core.nix @@ -1,5 +1,15 @@ { ... }: { flake.nixosModules.core = { + hardware.bluetooth = { + enable = true; + powerOnBoot = false; + input.General.ClassicBondedOnly = false; + settings = { + General = { + Experimental = true; + }; + }; + }; time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "en_US.UTF-8"; i18n.extraLocaleSettings = { @@ -16,7 +26,7 @@ security = { rtkit.enable = true; polkit.enable = true; # polkit -# polkit.enablePkexecWrapper = true; + # polkit.enablePkexecWrapper = true; }; networking.networkmanager.enable = true; nix.settings.experimental-features = [ diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix index 137c8cd..b4ccdb0 100644 --- a/modules/system/stylix/default.nix +++ b/modules/system/stylix/default.nix @@ -8,7 +8,7 @@ base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; cursor = { name = "macOS"; - package = pkgs.apple_cursor; + package = pkgs.apple-cursor; size = 24; }; icons = { diff --git a/modules/system/stylix/fonts.nix b/modules/system/stylix/fonts.nix index d059197..c8025a6 100644 --- a/modules/system/stylix/fonts.nix +++ b/modules/system/stylix/fonts.nix @@ -13,7 +13,7 @@ monospace = { package = pkgs.iosevka; - name = "DejaVu Sans Mono"; + name = "Iosevka"; }; emoji = { From 079787e8093155f73bd6b32c3ec761f4b19799a6 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 20 Oct 2026 00:33:09 +0200 Subject: [PATCH 8/8] add blueman --- modules/system/core/core.nix | 2 +- modules/system/services/base.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/system/core/core.nix b/modules/system/core/core.nix index 5e41653..430c611 100644 --- a/modules/system/core/core.nix +++ b/modules/system/core/core.nix @@ -26,7 +26,7 @@ security = { rtkit.enable = true; polkit.enable = true; # polkit - # polkit.enablePkexecWrapper = true; + polkit.enablePkexecWrapper = true; }; networking.networkmanager.enable = true; nix.settings.experimental-features = [ diff --git a/modules/system/services/base.nix b/modules/system/services/base.nix index da34c8c..27dabb7 100644 --- a/modules/system/services/base.nix +++ b/modules/system/services/base.nix @@ -1,5 +1,6 @@ { ... }: { flake.nixosModules.base_services = { services.upower.enable = true; + services.blueman.enable = true; }; }