From 629d3d6f6cd4a75c0725d8fb0024a1c4cf1efde4 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Thu, 23 May 2024 22:31:30 +0200 Subject: [PATCH] update sternchen --- flake.nix | 145 ++++++++++++--------- nixos/components/gui/noti.nix | 1 + nixos/homes/root/default.nix | 3 +- nixos/homes/tina/default.nix | 1 + nixos/homes/tina/kde.nix | 3 + nixos/homes/tina/packages.nix | 4 +- nixos/homes/tina/stylix.nix | 1 + nixos/machines/sternchen/configuration.nix | 37 +++--- 8 files changed, 113 insertions(+), 82 deletions(-) create mode 100644 nixos/homes/tina/kde.nix diff --git a/flake.nix b/flake.nix index 27a57c2..823d98a 100644 --- a/flake.nix +++ b/flake.nix @@ -337,72 +337,89 @@ home-manager.users.mainUser = import ./nixos/homes/tina; home-manager.users.root = import ./nixos/homes/root; } + # todo : strange overrides, this should be an option kinda an be changed on another level (the homes/ folders or something) + ({ lib, ... }: { + home-manager.users = { + mainUser = { + programs.atuin.enable = lib.mkForce false; + }; + root = { + programs.atuin.enable = lib.mkForce false; + + }; + }; + }) ]; }; - cream = nixosConfigurationSetup { - name = "cream"; - modules = [ - nixos-hardware.nixosModules.framework-12th-gen-intel - retiolum.nixosModules.retiolum - private_assets.nixosModules.cream - homeManagerModules - { home-manager.users.mainUser.gui.enable = true; } - { - home-manager.users.mainUser = import ./nixos/homes/palo; - home-manager.users.root = import ./nixos/homes/root; - } - ]; - }; - cherry = nixosConfigurationSetup { - name = "cherry"; - modules = [ - nixos-hardware.nixosModules.framework-13th-gen-intel - homeManagerModules - { home-manager.users.mainUser.gui.enable = true; } - { - home-manager.users.mainUser = import ./nixos/homes/palo; - home-manager.users.root = import ./nixos/homes/root; - } - ]; - }; - chungus = nixosConfigurationSetup { - name = "chungus"; - modules = [ - homeManagerModules - retiolum.nixosModules.retiolum - private_assets.nixosModules.chungus - { - home-manager.users.mainUser = import ./nixos/homes/palo; - home-manager.users.root = import ./nixos/homes/root; - } - ]; - }; - orbi = nixosConfigurationSetup { - name = "orbi"; - host = "95.216.66.212"; - modules = [ - homeManagerModules - srvos.nixosModules.hardware-hetzner-online-intel - srvos.nixosModules.server - srvos.nixosModules.mixins-terminfo - { home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; } - { - home-manager.users.mainUser = import ./nixos/homes/palo; - home-manager.users.root = import ./nixos/homes/root; - } - ]; - }; - robi = nixosConfigurationSetup { - name = "robi"; - modules = [ - homeManagerModules - { home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; } - { - home-manager.users.mainUser = import ./nixos/homes/palo; - home-manager.users.root = import ./nixos/homes/root; - } - ]; - }; + cream = nixosConfigurationSetup + { + name = "cream"; + modules = [ + nixos-hardware.nixosModules.framework-12th-gen-intel + retiolum.nixosModules.retiolum + private_assets.nixosModules.cream + homeManagerModules + { home-manager.users.mainUser.gui.enable = true; } + { + home-manager.users.mainUser = import ./nixos/homes/palo; + home-manager.users.root = import ./nixos/homes/root; + } + ]; + }; + cherry = nixosConfigurationSetup + { + name = "cherry"; + modules = [ + nixos-hardware.nixosModules.framework-13th-gen-intel + homeManagerModules + { home-manager.users.mainUser.gui.enable = true; } + { + home-manager.users.mainUser = import ./nixos/homes/palo; + home-manager.users.root = import ./nixos/homes/root; + } + ]; + }; + chungus = nixosConfigurationSetup + { + name = "chungus"; + modules = [ + homeManagerModules + retiolum.nixosModules.retiolum + private_assets.nixosModules.chungus + { + home-manager.users.mainUser = import ./nixos/homes/palo; + home-manager.users.root = import ./nixos/homes/root; + } + ]; + }; + orbi = nixosConfigurationSetup + { + name = "orbi"; + host = "95.216.66.212"; + modules = [ + homeManagerModules + srvos.nixosModules.hardware-hetzner-online-intel + srvos.nixosModules.server + srvos.nixosModules.mixins-terminfo + { home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; } + { + home-manager.users.mainUser = import ./nixos/homes/palo; + home-manager.users.root = import ./nixos/homes/root; + } + ]; + }; + robi = nixosConfigurationSetup + { + name = "robi"; + modules = [ + homeManagerModules + { home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; } + { + home-manager.users.mainUser = import ./nixos/homes/palo; + home-manager.users.root = import ./nixos/homes/root; + } + ]; + }; }; }; } diff --git a/nixos/components/gui/noti.nix b/nixos/components/gui/noti.nix index eebdce1..63eaa0e 100644 --- a/nixos/components/gui/noti.nix +++ b/nixos/components/gui/noti.nix @@ -7,6 +7,7 @@ with lib; default = config.components.gui.enable; }; + # todo : put this in `/homes` config = mkIf (config.components.gui.noti.enable) { sops.secrets.pushover_user_key = { }; diff --git a/nixos/homes/root/default.nix b/nixos/homes/root/default.nix index 8cc8a9e..ddd8947 100644 --- a/nixos/homes/root/default.nix +++ b/nixos/homes/root/default.nix @@ -1,7 +1,8 @@ { imports = [ ../common - ../palo/doom-emacs.nix + # todo : this must be optional, sometimes I don't want to compile the whole emacs eco system. + #../palo/doom-emacs.nix ]; gui.enable = false; diff --git a/nixos/homes/tina/default.nix b/nixos/homes/tina/default.nix index 1a52feb..817b5f0 100644 --- a/nixos/homes/tina/default.nix +++ b/nixos/homes/tina/default.nix @@ -5,5 +5,6 @@ ./stylix.nix ./logseq.nix ./packages.nix + ./kde.nix ]; } diff --git a/nixos/homes/tina/kde.nix b/nixos/homes/tina/kde.nix new file mode 100644 index 0000000..c8b65c2 --- /dev/null +++ b/nixos/homes/tina/kde.nix @@ -0,0 +1,3 @@ +{ + stylix.targets.kde.enable = true; +} diff --git a/nixos/homes/tina/packages.nix b/nixos/homes/tina/packages.nix index b41d674..0243162 100644 --- a/nixos/homes/tina/packages.nix +++ b/nixos/homes/tina/packages.nix @@ -25,8 +25,10 @@ with lib; pdfarranger calibre + ]; - }; + + }; } diff --git a/nixos/homes/tina/stylix.nix b/nixos/homes/tina/stylix.nix index d78070b..fe45fe5 100644 --- a/nixos/homes/tina/stylix.nix +++ b/nixos/homes/tina/stylix.nix @@ -5,6 +5,7 @@ stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml"; + stylix.fonts = { serif = { package = pkgs.ubuntu_font_family; diff --git a/nixos/machines/sternchen/configuration.nix b/nixos/machines/sternchen/configuration.nix index 8d290f0..2930f8a 100644 --- a/nixos/machines/sternchen/configuration.nix +++ b/nixos/machines/sternchen/configuration.nix @@ -16,10 +16,12 @@ system.stateVersion = "23.11"; # for calibre server - networking.firewall.allowedTCPPorts = [ 8080 ]; + networking.firewall.allowedTCPPorts = [ 8080 ]; components.gui.enable = true; components.gui.kmonad.enable = false; + components.gui.style.enable = false; # installes nerd-fonts which seem not to work. + components.gui.noti.enable = false; components.terminal.enable = true; components.network.enable = true; @@ -27,27 +29,30 @@ components.mainUser.enable = true; components.monitor.enable = false; - users.users.mainUser.extraGroups = [ "adbusers" "video" ]; + + users.users.mainUser.extraGroups = [ "video" ]; + home-manager.users.mainUser.home.git-pull.enable = false; + users.users.mainUser.name = lib.mkForce "tina"; users.users.mainUser.home = lib.mkForce "/home/tina"; services.browser.enable = false; - security.wrappers = { - pmount = { - source = "${pkgs.pmount}/bin/pmount"; - setuid = true; - owner = "root"; - group = "root"; - }; - pumount = { - source = "${pkgs.pmount}/bin/pumount"; - setuid = true; - owner = "root"; - group = "root"; - }; - }; + #security.wrappers = { + # pmount = { + # source = "${pkgs.pmount}/bin/pmount"; + # setuid = true; + # owner = "root"; + # group = "root"; + # }; + # pumount = { + # source = "${pkgs.pmount}/bin/pumount"; + # setuid = true; + # owner = "root"; + # group = "root"; + # }; + #}; # keyboard fiddling i18n.defaultLocale = "de_DE.UTF-8";