From 63c07f9548dd3c2ff60c5824a6c332bde02592fe Mon Sep 17 00:00:00 2001 From: Atridad Lahiji Date: Wed, 20 Aug 2025 13:34:21 -0600 Subject: [PATCH] 1755718461 --- configuration.nix | 11 ++--------- modules/aliases.nix | 3 --- modules/audio.nix | 10 ++++------ modules/desktop.nix | 3 --- modules/networking.nix | 10 +--------- modules/packages.nix | 4 ++-- modules/programs.nix | 6 +++--- modules/users.nix | 6 +++--- 8 files changed, 15 insertions(+), 38 deletions(-) diff --git a/configuration.nix b/configuration.nix index db42a5e..eb424fb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,10 +2,9 @@ { imports = [ - # Include the results of the hardware scan ./hardware-configuration.nix - # Import modular configuration files + # Import Modules ./modules/boot.nix ./modules/networking.nix ./modules/locale.nix @@ -19,11 +18,5 @@ ./modules/aliases.nix ]; - # 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 = "25.05"; # Did you read the comment? + system.stateVersion = "25.05"; } diff --git a/modules/aliases.nix b/modules/aliases.nix index a1c34e1..995db98 100644 --- a/modules/aliases.nix +++ b/modules/aliases.nix @@ -2,9 +2,6 @@ { environment.shellAliases = { - # Help command - shows all available nix commands - "nix:help" = "echo '\nšŸ”§ NixOS Configuration Commands:\n\nšŸ“‹ Basic Operations:\n nix:rebuild - Rebuild and switch to new configuration\n nix:conf:edit - Edit the main configuration file\n nix:conf:sync - Sync local config to /etc/nixos/ without rebuild\n\nšŸ“ Module Editing:\n nix:edit:boot - Edit boot configuration\n nix:edit:net - Edit networking configuration\n nix:edit:desktop - Edit desktop configuration\n nix:edit:audio - Edit audio configuration\n nix:edit:users - Edit user configuration\n nix:edit:pkgs - Edit packages configuration\n nix:edit:programs - Edit programs configuration\n nix:edit:hardware - Edit hardware configuration\n nix:edit:services - Edit services configuration\n nix:edit:aliases - Edit aliases configuration\n\nšŸ”„ Git Operations:\n nix:conf:push - Copy config to /etc/nixos/, commit changes, and push to remote\n nix:conf:pull - Pull latest changes from remote and sync to /etc/nixos/\n\nšŸ’” Use nix:help to see this list anytime!\n'"; - # Basic operations "nix:rebuild" = "sudo nixos-rebuild switch"; "nix:conf:edit" = "sudo nano ~/Developer/lavitz/configuration.nix"; diff --git a/modules/audio.nix b/modules/audio.nix index 382fc70..f372845 100644 --- a/modules/audio.nix +++ b/modules/audio.nix @@ -1,19 +1,17 @@ { config, pkgs, ... }: { - # Enable sound with pipewire + # Pulse Audio services.pulseaudio.enable = false; security.rtkit.enable = true; + + # Pipewire 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; + media-session.enable = true; }; } \ No newline at end of file diff --git a/modules/desktop.nix b/modules/desktop.nix index ae808d0..1a09b0b 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -16,7 +16,4 @@ # Enable CUPS to print documents services.printing.enable = true; - - # Enable touchpad support (enabled default in most desktopManager) - # services.xserver.libinput.enable = true; } \ No newline at end of file diff --git a/modules/networking.nix b/modules/networking.nix index 860617d..87b16df 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -1,13 +1,7 @@ { config, pkgs, ... }: { - # Networking configuration - networking.hostName = "lavitz"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + networking.hostName = "lavitz"; # Enable networking networking.networkmanager.enable = true; @@ -15,6 +9,4 @@ # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; } \ No newline at end of file diff --git a/modules/packages.nix b/modules/packages.nix index bf08ec5..7f4d350 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -16,7 +16,7 @@ in environment.systemPackages = # Packages from the stable channel (pkgs) with pkgs; [ - # Browsers and communication + # Browsers and comms ungoogled-chromium discord signal-desktop-bin @@ -61,7 +61,7 @@ in # GNOME extensions gnomeExtensions.appindicator ] - # Packages from the unstable channel (unstablePkgs) + # Unstable packages ++ (with unstablePkgs; [ onlyoffice-desktopeditors ]); diff --git a/modules/programs.nix b/modules/programs.nix index aaa4736..8f6dbb4 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -4,9 +4,9 @@ # Steam programs.steam = { enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; }; programs.noisetorch.enable = true; diff --git a/modules/users.nix b/modules/users.nix index 4c78072..7c6533e 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -1,18 +1,18 @@ { config, pkgs, ... }: { - # Define groups + # Groups users.groups.plugdev = { gid = 69420; }; - # Define a user account. Don't forget to set a password with 'passwd'. + # User Accounts users.users.atridad = { isNormalUser = true; description = "Atridad"; extraGroups = [ "networkmanager" "wheel" "docker" "plugdev" ]; packages = with pkgs; [ - # thunderbird + thunderbird ]; }; }