From 2c5db1c0de31ac1b16f77d5b2b7412e1d4e4afc3 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Fri, 16 May 2025 16:06:11 +0300 Subject: Refactored NixOS config to be more modular --- hosts/configuration.nix | 154 ++++++++++++++++++++++++++++++++++++++++++++++++ hosts/desktop.nix | 18 ++---- hosts/home.nix | 14 ----- hosts/lapsktop.nix | 18 ++---- hosts/laptop.nix | 17 ++---- 5 files changed, 168 insertions(+), 53 deletions(-) create mode 100644 hosts/configuration.nix (limited to 'hosts') diff --git a/hosts/configuration.nix b/hosts/configuration.nix new file mode 100644 index 0000000..2e025d6 --- /dev/null +++ b/hosts/configuration.nix @@ -0,0 +1,154 @@ +{ pkgs, inputs, ... }: { + + imports = [ + ../modules/apps.nix + ../modules/kde.nix + ../modules/networking.nix + ../modules/development.nix + ../modules/gaming.nix + inputs.home-manager.nixosModules.default + ]; + + home-manager = { + extraSpecialArgs = { inherit inputs pkgs; }; + useUserPackages = true; + useGlobalPkgs = true; + users = { + "kyren" = import ./home.nix; + }; + }; + + users.users.kyren = { + isNormalUser = true; + description = "Kyren"; + extraGroups = [ "networkmanager" "wheel" ]; + shell = pkgs.zsh; + }; + + programs.zsh.enable = true; + + # Localization + time.timeZone = "Asia/Hebron"; + i18n.defaultLocale = "en_US.UTF-8"; + i18n.supportedLocales = [ + "en_US.UTF-8/UTF-8" + "C.UTF-8/UTF-8" + "en_IL/UTF-8" + ]; + + # Allow sudo without a password if in "wheel" group. + security.sudo.wheelNeedsPassword = false; + + # Bootloader + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.supportedFilesystems = [ "ntfs" ]; # for windows fs + + # Nix Config + system.stateVersion = "24.05"; # DO NOT CHANGE! + nixpkgs.config.allowUnfree = true; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.auto-optimise-store = true; # reduces nix store size + + # Enable dynamic linking of apps that are not in nixpkgs + # Fixes issues with neovim plugins not working + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + stdenv.cc.cc + ]; + + # Enable sound with pipewire. + services.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # ENable CUPS daemon for printing + services.printing.enable = false; + + # Install Flatpak and Flathub + services.flatpak.enable = true; + + # Enable openssh + services.openssh.enable = true; + services.openssh.settings.PasswordAuthentication = false; + + users.users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7P9K9D5RkBk+JCRRS6AtHuTAc6cRpXfRfRMg/Kyren" + ]; + + # Enable KVM/QEMU virtualization + programs.virt-manager.enable = true; + users.groups.libvirtd.members = ["kyren"]; + virtualisation.libvirtd.enable = true; + virtualisation.spiceUSBRedirection.enable = true; + + services.syncthing.enable = true; + services.syncthing = { + group = "users"; + user = "kyren"; + dataDir = "/home/kyren"; + configDir = "/home/kyren/.config/syncthing"; + }; + systemd.tmpfiles.rules = [ + "d /home/kyren/.config/syncthing 0700 kyren users" + ]; + + systemd.timers."git-auto-sync" = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "5m"; + OnUnitActiveSec = "5m"; + Unit = "git-auto-sync.service"; + }; + }; + + systemd.services."git-auto-sync" = { + script = "$HOME/scripts/git-auto-sync.sh"; + path = [ + pkgs.git + pkgs.gh + pkgs.keychain + pkgs.openssh + ]; + serviceConfig = { Type = "oneshot"; User = "kyren"; }; + }; + + systemd.timers."k-sleep-tracker" = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "1m"; + OnUnitActiveSec = "1m"; + Unit = "k-sleep-tracker.service"; + }; + }; + + systemd.services."k-sleep-tracker" = { + script = "$HOME/projects/k/bin/k tracker sleep"; + serviceConfig = { Type = "oneshot"; User = "kyren"; }; + }; + + xdg.desktopEntries = { + "com.ktechpit.whatsie" = { + name = "WhatsApp"; + genericName = "Watsie, unofficial WhatsApp client"; + exec = "whatsie %U"; + terminal = false; + icon = "com.github.eneshecan.WhatsAppForLinux"; + categories = [ "Application" "Network" "WebBrowser" ]; + settings = { + Keywords = "chat;im;messaging;messenger;sms;whatsapp;whatsapp-desktop;whatsie;"; + }; + }; + }; +} diff --git a/hosts/desktop.nix b/hosts/desktop.nix index 1698ad3..a4aae0d 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -1,22 +1,14 @@ -{ pkgs, inputs, ... }: { +{ ... }: { imports = [ ./hardware-configuration-desktop.nix - ../modules/common.nix - ../modules/kde.nix - ../modules/networking.nix + ./configuration.nix ../modules/desktop.nix - inputs.home-manager.nixosModules.default ]; networking.hostName = "kyren-desktop"; - home-manager = { - extraSpecialArgs = { inherit inputs pkgs; }; - useUserPackages = true; - useGlobalPkgs = true; - users = { - "kyren" = import ./home.nix; - }; - }; + development.enable = true; + gaming.enable = true; + } diff --git a/hosts/home.nix b/hosts/home.nix index a9ce356..ef8ecea 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -25,20 +25,6 @@ "$HOME/.local/bin" ]; - xdg.desktopEntries = { - "com.ktechpit.whatsie" = { - name = "WhatsApp"; - genericName = "Watsie, unofficial WhatsApp client"; - exec = "whatsie %U"; - terminal = false; - icon = "com.github.eneshecan.WhatsAppForLinux"; - categories = [ "Application" "Network" "WebBrowser" ]; - settings = { - Keywords = "chat;im;messaging;messenger;sms;whatsapp;whatsapp-desktop;whatsie;"; - }; - }; - }; - # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/hosts/lapsktop.nix b/hosts/lapsktop.nix index bf25017..80346e3 100644 --- a/hosts/lapsktop.nix +++ b/hosts/lapsktop.nix @@ -1,22 +1,14 @@ -{ pkgs, inputs, ... }: { +{ ... }: { imports = [ ./hardware-configuration-laptop.nix - ../modules/common.nix - ../modules/kde.nix - ../modules/networking.nix + ./hardware-configuration-laptop.nix + ./configuration.nix ../modules/laptop.nix - inputs.home-manager.nixosModules.default ]; networking.hostName = "kyren-laptop"; - home-manager = { - extraSpecialArgs = { inherit inputs pkgs; }; - useUserPackages = true; - useGlobalPkgs = true; - users = { - "kyren" = import ./home.nix; - }; - }; + development.enable = true; + } diff --git a/hosts/laptop.nix b/hosts/laptop.nix index bf25017..f4a2603 100644 --- a/hosts/laptop.nix +++ b/hosts/laptop.nix @@ -1,22 +1,13 @@ -{ pkgs, inputs, ... }: { +{ ... }: { imports = [ ./hardware-configuration-laptop.nix - ../modules/common.nix - ../modules/kde.nix - ../modules/networking.nix + ./configuration.nix ../modules/laptop.nix - inputs.home-manager.nixosModules.default ]; networking.hostName = "kyren-laptop"; - home-manager = { - extraSpecialArgs = { inherit inputs pkgs; }; - useUserPackages = true; - useGlobalPkgs = true; - users = { - "kyren" = import ./home.nix; - }; - }; + development.enable = true; + } -- cgit v1.3.1