summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.nix10
-rw-r--r--hosts/hardware-configuration-laptop.nix (renamed from hosts/kyren-laptop/hardware-configuration.nix)0
-rw-r--r--hosts/home.nix (renamed from hosts/kyren-laptop/home.nix)10
-rw-r--r--hosts/lapsktop.nix22
-rw-r--r--hosts/laptop.nix22
-rw-r--r--modules/common.nix (renamed from hosts/kyren-laptop/configuration.nix)222
-rw-r--r--modules/kde.nix17
-rw-r--r--modules/laptop.nix23
-rw-r--r--modules/networking.nix12
9 files changed, 182 insertions, 156 deletions
diff --git a/flake.nix b/flake.nix
index 5a0e834..dd2df2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,10 +12,16 @@
outputs = { self, nixpkgs, ... }@inputs: {
nixosConfigurations = {
- kyren-laptop = nixpkgs.lib.nixosSystem {
+ laptop = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
- ./hosts/kyren-laptop/configuration.nix
+ ./hosts/laptop.nix
+ ];
+ };
+ lapsktop = nixpkgs.lib.nixosSystem {
+ specialArgs = {inherit inputs;};
+ modules = [
+ ./hosts/lapsktop.nix
];
};
};
diff --git a/hosts/kyren-laptop/hardware-configuration.nix b/hosts/hardware-configuration-laptop.nix
index 5dbd889..5dbd889 100644
--- a/hosts/kyren-laptop/hardware-configuration.nix
+++ b/hosts/hardware-configuration-laptop.nix
diff --git a/hosts/kyren-laptop/home.nix b/hosts/home.nix
index dd96a09..2bec371 100644
--- a/hosts/kyren-laptop/home.nix
+++ b/hosts/home.nix
@@ -1,15 +1,9 @@
{ config, pkgs, inputs, ... }: {
+
home.username = "kyren";
home.homeDirectory = "/home/kyren";
- # This value determines the Home Manager release that your configuration is
- # compatible with. This helps avoid breakage when a new Home Manager release
- # introduces backwards incompatible changes.
- #
- # You should not change this value, even if you update Home Manager. If you do
- # want to update the value, then make sure to first check the Home Manager
- # release notes.
- home.stateVersion = "24.05"; # Please read the comment before changing.
+ home.stateVersion = "24.05"; # DO NOT CHANGE
home.packages = with pkgs; [
nerd-fonts.jetbrains-mono
diff --git a/hosts/lapsktop.nix b/hosts/lapsktop.nix
new file mode 100644
index 0000000..c9eea83
--- /dev/null
+++ b/hosts/lapsktop.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, inputs, ... }: {
+
+ imports = [
+ ./hardware-configuration-laptop.nix
+ ../modules/common.nix
+ ../modules/kde.nix
+ ../modules/networking.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;
+ };
+ };
+}
diff --git a/hosts/laptop.nix b/hosts/laptop.nix
new file mode 100644
index 0000000..c9eea83
--- /dev/null
+++ b/hosts/laptop.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, inputs, ... }: {
+
+ imports = [
+ ./hardware-configuration-laptop.nix
+ ../modules/common.nix
+ ../modules/kde.nix
+ ../modules/networking.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;
+ };
+ };
+}
diff --git a/hosts/kyren-laptop/configuration.nix b/modules/common.nix
index 2e86d95..3c5e255 100644
--- a/hosts/kyren-laptop/configuration.nix
+++ b/modules/common.nix
@@ -1,28 +1,34 @@
-{ config, pkgs, inputs, ... }: {
- imports = [
- ./hardware-configuration.nix
- inputs.home-manager.nixosModules.default
- ];
+#--------------------------------------#
+# #
+# Common Config/Packages for system #
+# #
+#--------------------------------------#
- # Bootloader.
- boot.loader.systemd-boot.enable = true;
- boot.loader.efi.canTouchEfiVariables = true;
+{config, pkgs, ...}:
- networking.hostName = "kyren-laptop";
- # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
-
- nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
- # Optimize nix store automatically
- nix.settings.auto-optimise-store=true;
+{
+ # User
+ users.users.kyren = {
+ isNormalUser = true;
+ description = "Kyren";
+ extraGroups = [ "networkmanager" "wheel" ];
+ shell = pkgs.zsh;
+ };
- # Configure network proxy if necessary
- # networking.proxy.default = "http://user:password@proxy:port/";
- # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+ programs.zsh.enable = true;
- # Enable networking
- networking.networkmanager.enable = true;
+ # List packages installed in system profile
+ # Use for apps that need sudo (or have issues thru home-manager)
+ environment.systemPackages = with pkgs; [
+ glib-networking
+ openssl
+ clang
+ clang-tools
+ ghostty
+ glibcLocales
+ ];
+ # Localization
time.timeZone = "Asia/Hebron";
i18n.defaultLocale = "en_US.UTF-8";
i18n.supportedLocales = [
@@ -31,68 +37,28 @@
"en_IL/UTF-8"
];
- # Enable the X11 windowing system.
- # You can disable this if you're only using the Wayland session.
- services.xserver.enable = true;
-
- # Enable the KDE Plasma Desktop Environment.
- services.displayManager.sddm.enable = true;
- services.desktopManager.plasma6.enable = true;
-
- # Configure keymap in X11
- services.xserver.xkb = {
- layout = "us";
- variant = "";
- };
-
- # Enable CUPS to print documents.
- services.printing.enable = false;
-
- # 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 touchpad support (enabled default in most desktopManager).
- # services.xserver.libinput.enable = true;
-
# Allow sudo without a password if in "wheel" group.
security.sudo.wheelNeedsPassword = false;
- # Define a user account. Don't forget to set a password with ‘passwd’.
- users.users.kyren = {
- isNormalUser = true;
- description = "Kyren";
- extraGroups = [ "networkmanager" "wheel" ];
- shell = pkgs.zsh;
- };
-
- home-manager = {
- extraSpecialArgs = { inherit inputs pkgs; };
- useUserPackages = true;
- useGlobalPkgs = true;
- users = {
- "kyren" = import ./home.nix;
- };
- };
+ # Bootloader
+ boot.loader.systemd-boot.enable = true;
+ boot.loader.efi.canTouchEfiVariables = true;
+ boot.supportedFilesystems = [ "ntfs" ];
+ # 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
- # Install firefox.
- programs.firefox.enable = true;
+ # 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
+ ];
- programs.zsh.enable = true;
+ programs.firefox.enable = true;
# Install Steam
programs.steam = {
@@ -103,35 +69,30 @@
};
# Install Docker (without using root access)
- # virtualisation.docker.enable = true;
+ #virtualisation.docker.enable = true;
virtualisation.docker.rootless = {
enable = true;
setSocketVariable = true;
};
- # List packages installed in system profile. Use for apps that need sudo.
- environment.systemPackages = with pkgs; [
- glib-networking
- openssl
- clang
- clang-tools
- ghostty
- glibcLocales
- ];
+ # 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;
- # Enable dynamic linking of applications that are not in nixpkgs (for vim LSPs for example).
- programs.nix-ld.enable = true;
- programs.nix-ld.libraries = with pkgs; [
- stdenv.cc.cc
- ];
+ # 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;
+ };
- # Some programs need SUID wrappers, can be configured further or are
- # started in user sessions.
- # programs.mtr.enable = true;
- # programs.gnupg.agent = {
- # enable = true;
- # enableSSHSupport = true;
- # };
+ # ENable CUPS daemon for printing
+ services.printing.enable = false;
# Install Flatpak and Flathub
services.flatpak.enable = true;
@@ -142,23 +103,26 @@
# Mouse config service (used with piper)
services.ratbagd.enable = true;
- # battery levels notifier
- systemd.timers."battery-notifier" = {
- wantedBy = [ "timers.target" ];
- timerConfig = {
- OnBootSec = "3m";
- OnUnitActiveSec = "3m";
- Unit = "battery-notifier.service";
- };
- };
+ # Enable KVM/QEMU virtualization
+ programs.virt-manager.enable = true;
+ users.groups.libvirtd.members = ["kyren"];
+ virtualisation.libvirtd.enable = true;
+ virtualisation.spiceUSBRedirection.enable = true;
- systemd.services."battery-notifier" = {
- script = "$HOME/scripts/battery_notifier.sh";
- serviceConfig = {
- Type = "oneshot";
- User = "kyren";
- };
+ 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"
+ ];
+
+ # VPN for Vault Hunters to avoid connection issues
+ # Note, will break discord, also tried proton VPN, still has conn issues
+ services.cloudflare-warp.enable = true;
systemd.timers."git-auto-sync" = {
wantedBy = [ "timers.target" ];
@@ -193,38 +157,4 @@
script = "$HOME/projects/k/bin/k tracker sleep";
serviceConfig = { Type = "oneshot"; User = "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"
- ];
-
- services.cloudflare-warp.enable = true;
-
- # Open ports in the firewall.
- # networking.firewall.allowedTCPPorts = [ ... ];
- # networking.firewall.allowedUDPPorts = [ ... ];
- # Or disable the firewall altogether.
- # networking.firewall.enable = false;
-
- # This value determines the NixOS release from which the default
- # settings for stateful data, like file locations and database versions
- # on your system were taken. It‘s perfectly fine and recommended to leave
- # this value at the release version of the first install of this system.
- # Before changing this value read the documentation for this option
- # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
- system.stateVersion = "24.05"; # Did you read the comment?
-
}
diff --git a/modules/kde.nix b/modules/kde.nix
new file mode 100644
index 0000000..833e40d
--- /dev/null
+++ b/modules/kde.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+ # Enable the KDE Plasma Desktop Environment.
+ services.displayManager.sddm.enable = true;
+ services.desktopManager.plasma6.enable = true;
+
+ # Enable the X11 windowing system.
+ # You can disable this if you're only using the Wayland session.
+ services.xserver.enable = true;
+
+ # Configure keymap in X11
+ services.xserver.xkb = {
+ layout = "us";
+ variant = "";
+ };
+}
diff --git a/modules/laptop.nix b/modules/laptop.nix
new file mode 100644
index 0000000..60def67
--- /dev/null
+++ b/modules/laptop.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+
+{
+
+ # battery levels notifier
+ systemd.timers."battery-notifier" = {
+ wantedBy = [ "timers.target" ];
+ timerConfig = {
+ OnBootSec = "3m";
+ OnUnitActiveSec = "3m";
+ Unit = "battery-notifier.service";
+ };
+ };
+
+ systemd.services."battery-notifier" = {
+ script = "$HOME/scripts/battery_notifier.sh";
+ serviceConfig = {
+ Type = "oneshot";
+ User = "kyren";
+ };
+ };
+
+}
diff --git a/modules/networking.nix b/modules/networking.nix
new file mode 100644
index 0000000..6574955
--- /dev/null
+++ b/modules/networking.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+ # Enable networking
+ networking.networkmanager.enable = true;
+
+ # Configure network proxy if necessary
+ # networking.proxy.default = "http://user:password@proxy:port/";
+ # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+ #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
+}
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-07 21:20:02 +0000