From 6b90a8083e9ddf427d9469165ff19ff1eab86749 Mon Sep 17 00:00:00 2001
From: Maciej Jur <maciej@kamoshi.org>
Date: Mon, 10 Jun 2024 20:14:38 +0200
Subject: [PATCH] nixos: enable alsa

---
 nixos/msi/configuration.nix | 69 +++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/nixos/msi/configuration.nix b/nixos/msi/configuration.nix
index cee73b2..8a24a31 100644
--- a/nixos/msi/configuration.nix
+++ b/nixos/msi/configuration.nix
@@ -4,7 +4,27 @@
 
 { config, lib, pkgs, ... }:
 let
-  unstable = import "/nix/var/nix/profiles/per-user/root/channels/unstable" {};
+  unstable = import <unstable> {};
+  packages = (with pkgs; [
+    vim
+    git
+    curl
+    wget
+    gnumake
+    gcc
+    nodejs_22
+    # Language servers
+    lua-language-server # Lua
+    nixd                # Nix
+    # Neovim
+    wl-clipboard
+    tree-sitter
+    ripgrep
+    fd
+    unzip
+  ]) ++ (with unstable; [
+    neovim
+  ]);
 in
 {
   imports =
@@ -32,18 +52,15 @@ in
     };
   };
 
-  networking.hostName = "nixos"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  # Networking options
+  networking = {
+    hostName = "msi";
+    networkmanager.enable = true;
+  };
 
   # Set your time zone.
   time.timeZone = "Europe/Warsaw";
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
   # Select internationalisation properties.
   i18n = {
     defaultLocale = "en_US.UTF-8";
@@ -64,11 +81,11 @@ in
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
   ];
 
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkb.options in tty.
-  # };
+  console = {
+    font = "Lat2-Terminus16";
+    # keyMap = "us";
+    # useXkbConfig = true; # use xkb.options in tty.
+  };
 
   services = {
     xserver.enable = true;
@@ -84,13 +101,15 @@ in
   # services.printing.enable = true;
 
   # Enable sound.
+  sound.enable = true;
+  security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
     audio.enable = true;
     pulse.enable = true;
-    jack.enable = true;
     alsa.enable = true;
     alsa.support32Bit = true;
+    jack.enable = true;
     wireplumber.enable = true;
   };
 
@@ -102,25 +121,7 @@ in
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim
-    git
-    curl
-    wget
-    gnumake
-    gcc
-    nodejs_22
-    # Language servers
-    lua-language-server # Lua
-    nixd                # Nix
-    # Neovim
-    wl-clipboard
-    tree-sitter
-    ripgrep
-    fd
-    unzip
-    unstable.neovim
-  ];
+  environment.systemPackages = packages;
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.