diff --git a/flake.nix b/flake.nix index d9a814f..27a57c2 100644 --- a/flake.nix +++ b/flake.nix @@ -326,11 +326,17 @@ { sternchen = nixosConfigurationSetup { name = "sternchen"; - host = "sternchen.secret"; + #host = "sternchen.secret"; #host = "192.168.178.25"; + host = "sternchen"; modules = [ nixos-hardware.nixosModules.lenovo-thinkpad-x220 homeManagerModules + { home-manager.users.mainUser.gui.enable = true; } + { + home-manager.users.mainUser = import ./nixos/homes/tina; + home-manager.users.root = import ./nixos/homes/root; + } ]; }; cream = nixosConfigurationSetup { diff --git a/nixos/homes/tina/default.nix b/nixos/homes/tina/default.nix index 8b13789..1a52feb 100644 --- a/nixos/homes/tina/default.nix +++ b/nixos/homes/tina/default.nix @@ -1 +1,9 @@ - +{ pkgs, ... }: +{ + imports = [ + ../common + ./stylix.nix + ./logseq.nix + ./packages.nix + ]; +} diff --git a/nixos/homes/tina/logseq.nix b/nixos/homes/tina/logseq.nix new file mode 100644 index 0000000..64b4d00 --- /dev/null +++ b/nixos/homes/tina/logseq.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: +with pkgs; +with lib; +{ + config = mkIf config.gui.enable { + home.packages = [ + logseq + ]; + home.file.".config/Logseq/Preferences".source = (pkgs.formats.json { }).generate "LogseqPreferences.json" + { + spellcheck = { + dictionaries = [ "en-US" "de-DE" ]; + dictionary = ""; + }; + }; + }; + +} diff --git a/nixos/homes/tina/packages.nix b/nixos/homes/tina/packages.nix new file mode 100644 index 0000000..b41d674 --- /dev/null +++ b/nixos/homes/tina/packages.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, ... }: +with pkgs; +with lib; +{ + + config = mkIf config.gui.enable { + + home.packages = [ + + tor-browser-bundle-bin + #(tor-browser-bundle-bin.overrideAttrs (old: rec { + # version = "11.0.1"; + # name = "tor-browser-bundle-${version}"; + # src = pkgs.fetchurl { + # url = "https://dist.torproject.org/torbrowser/11.0.1/tor-browser-linux64-11.0.1_en-US.tar.xz"; + # sha256 = "1ah69jmfgik063f9gkvyv9d4k706pqihmzc4k7cc95zyd17v8wrs"; + # }; + #})) + + bitwarden + + unstable.yt-dlp + + # office + pdfarranger + calibre + + ]; + + }; + +} diff --git a/nixos/homes/tina/stylix.nix b/nixos/homes/tina/stylix.nix new file mode 100644 index 0000000..d78070b --- /dev/null +++ b/nixos/homes/tina/stylix.nix @@ -0,0 +1,27 @@ +{ pkgs, config, ... }: +{ + + stylix.targets.swaylock.enable = config.gui.enable; + + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml"; + + stylix.fonts = { + serif = { + package = pkgs.ubuntu_font_family; + name = "Ubuntu"; + }; + sansSerif = { + package = pkgs.ubuntu_font_family; + name = "Ubuntu"; + }; + monospace = { + package = pkgs.jetbrains-mono; + name = "JetBrains Mono"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + +} diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index 35f7d3e..4ae1b77 100644 --- a/nixos/machines/cream/configuration.nix +++ b/nixos/machines/cream/configuration.nix @@ -19,6 +19,8 @@ ]; + system.stateVersion = "22.11"; + sops.secrets.pushover_user_key = { }; sops.secrets.pushover_api_key = { }; @@ -142,6 +144,5 @@ enable = true; }; - system.stateVersion = "22.11"; } diff --git a/nixos/machines/sternchen/configuration.nix b/nixos/machines/sternchen/configuration.nix index d2d4320..8d290f0 100644 --- a/nixos/machines/sternchen/configuration.nix +++ b/nixos/machines/sternchen/configuration.nix @@ -4,9 +4,7 @@ ../../components ../../modules - ./hardware-configuration.nix - ./packages.nix ./syncthing.nix ./tinc.nix @@ -15,6 +13,10 @@ sops.defaultSopsFile = ../../secrets/sternchen.yaml; networking.hostName = "sternchen"; + system.stateVersion = "23.11"; + + # for calibre server + networking.firewall.allowedTCPPorts = [ 8080 ]; components.gui.enable = true; components.gui.kmonad.enable = false; @@ -23,6 +25,7 @@ components.network.enable = true; components.network.wifi.enable = true; components.mainUser.enable = true; + components.monitor.enable = false; users.users.mainUser.extraGroups = [ "adbusers" "video" ]; home-manager.users.mainUser.home.git-pull.enable = false;