From 95ccd5fb806f3f54dceb467a2b3207dcf95510bc Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 09:17:06 +0300 Subject: [PATCH 01/16] Add gitignore + sshkey of celerrime Signed-off-by: Ivan Bushchik --- .gitignore | 1 + common/user.nix | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..25e28f3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +asahi* diff --git a/common/user.nix b/common/user.nix index 6a3e605..17c6a79 100644 --- a/common/user.nix +++ b/common/user.nix @@ -21,6 +21,10 @@ in { # Stella "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDXWPxd1uVVxEARVezy0s0LZ9fC/Mif6s218oNWDyJNqZMnAiaMwwP/mGHqCy1OXFCb8/5Kv3AM+z6sxY4mIvyXhx3lPW841HoOlJxR+JQ50qgxon/oCXjKFVMZjFptRtexgQLhubhjyINagj7T/K6UjsfC9sIG5DUJdem0O8ZD/8EqvIrkeNGP52klJM3sR4vhXMNwOIPkukNOMq+OLXgAaCXRImc53N+Whi/tCaxxr/Nen5CVGo9raAekRKaiBLKvgboXYnxzNFxiecUe7mqPbyE2bcnJ+rDC7UlwrNYGyIQ/8POjQwbanFxT4UJhS5ib6/hSpia0eYaSiutBqU3fQcIXrmTQWOrGPdrUsLHw5xGMfwnPmoDFMYHdcchU0v6QijbrHrsqVV/bikWoQF4JT7PCwOejfVowOioPghvW2u34gTyMKPkueaMk0w8Jq45V0meneyN5SbobqZX3XFze4Uz3BN8nuiZB6pFRPv0eKLqEqX8+nST9uQDBkqKTvwE= ivabus@stella" + + # Celerrime + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/x2Xkj/w8Q6Ri+iP6b3dzY4KZ1q1RMqZmlFiiki/BuK+1Z+NMY6e6zgTJs1hSsd42XaTotHs75BcO13ou4Sa6p5Gmn+lC1tUWSEUhBoJimFmGp7E9wZjtzHIZyVRj7WMBUmbn4tgsnlGTS1rc2ODwBC7YLpqVzmgkLE3NyFXgSYhCRddvj16netrF6pQp+I/iTCblnhn8LOsnZMSU0aT92ybcLp6glwFh9DQNLyQ58V0fa2xzRN1iehu0TvX/M1aO91rseME+Ygz5m/JFc+G8onuUaDK/yezqkI9i6qxBHqu7+mBwUW5EIZLCwYd4JYDTGKrgVdO98acVcAjLv8rfKV8/SuODJ1fQafaz6C+O+3W9d5/L/HmCWunYKqDDNp14e8w0IHM2XC4mMYNABHisWkW6fMQ6mZxv2FuiYSITKdIUfFVbpdPOG7GF6jyDb/+LCR4vidNqXAU3ESGVOoyfDOvwm2lS5H7TVvBqEZUSjvIK8rqN5WRAdZ1iolADDoU= ivabus@celerrime" + ]; hashedPassword = secrets.hashed-password; }; @@ -75,4 +79,4 @@ in { }; home.stateVersion = "23.05"; }; -} \ No newline at end of file +} From f2d2801a5f66bf6555d66584dd33e6c7609caa88 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 09:23:12 +0300 Subject: [PATCH 02/16] Fix celerrime configuration using configuration from celerrime Signed-off-by: Ivan Bushchik --- machines/celerrime/configuration.nix | 11 ++----- machines/celerrime/hardware.nix | 44 ++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 machines/celerrime/hardware.nix diff --git a/machines/celerrime/configuration.nix b/machines/celerrime/configuration.nix index 278724f..5bfbfc4 100644 --- a/machines/celerrime/configuration.nix +++ b/machines/celerrime/configuration.nix @@ -1,14 +1,9 @@ { config, pkgs, ... }: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - # Include the necessary packages and configuration for Apple Silicon support. - - ]; - + imports = [ ]; + networking.hostName = "celerrime"; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = false; -} \ No newline at end of file +} diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix new file mode 100644 index 0000000..18a6182 --- /dev/null +++ b/machines/celerrime/hardware.nix @@ -0,0 +1,44 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "usb_storage" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + boot.kernelParams = [ "apple_dcp.show_notch=1" ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/c313a438-700c-4d9c-9413-354ebfb010eb"; + fsType = "btrfs"; + }; + + boot.initrd.luks.devices."nixos-root".device = "/dev/disk/by-uuid/871dcf57-eee1-4dde-846d-e856c92f70c8"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/6CCA-1404"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/272341f1-b083-497e-b129-aef8732b5b50"; } + ]; + hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; + hardware.asahi.addEdgeKernelConfig = true; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enu1u2u1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; +} From f18abc1df3dd7a42a4bb8a049f43fca87d5c6aa9 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 09:29:05 +0300 Subject: [PATCH 03/16] Add flake.lock to .gitignore Signed-off-by: Ivan Bushchik --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 25e28f3..3405f13 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ asahi* +flake.lock From f3a09925eed5321110067e6901885d8e590d6f39 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 09:30:11 +0300 Subject: [PATCH 04/16] Add flake.lock to gitignore Signed-off-by: Ivan Bushchik --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3405f13..f7fc6e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ asahi* -flake.lock +/flake.lock From 85c7a3398935560ea18acad18391c9582926e784 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 09:31:31 +0300 Subject: [PATCH 05/16] Add flake.lock to .gitignore Signed-off-by: Ivan Bushchik --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f7fc6e6..46949a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ asahi* -/flake.lock +./flake.lock From f4d77440fb153d2f38bf3c0852fedeaec5392d10 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 10:27:10 +0300 Subject: [PATCH 06/16] Cleanup celerrime config Signed-off-by: Ivan Bushchik --- machines/celerrime/configuration.nix | 2 +- machines/celerrime/hardware.nix | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/machines/celerrime/configuration.nix b/machines/celerrime/configuration.nix index 5bfbfc4..db9e313 100644 --- a/machines/celerrime/configuration.nix +++ b/machines/celerrime/configuration.nix @@ -3,7 +3,7 @@ { imports = [ ]; networking.hostName = "celerrime"; - # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = false; } diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix index 18a6182..3a98948 100644 --- a/machines/celerrime/hardware.nix +++ b/machines/celerrime/hardware.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { @@ -31,13 +28,8 @@ ]; hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; hardware.asahi.addEdgeKernelConfig = true; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + hardware.asahi.useExperimentalGPUDriver = true; networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enu1u2u1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; From 0b3f66167f1aeb4559be42e7388236e417f01dba Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 11:29:17 +0300 Subject: [PATCH 07/16] Update devel config Signed-off-by: Ivan Bushchik --- flake.nix | 6 +++--- roles/devel.nix | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 4799450..bb4d59f 100644 --- a/flake.nix +++ b/flake.nix @@ -68,9 +68,9 @@ ./common/locale.nix ./common/remote-access.nix ./roles/graphical.nix - #./roles/latex.nix + ./roles/latex.nix #./roles/gaming.nix - #./roles/devel.nix + ./roles/devel.nix ./roles/yggdrasil-client.nix ./machines/celerrime/configuration.nix ./machines/celerrime/hardware.nix @@ -92,4 +92,4 @@ }; */ }; -} \ No newline at end of file +} diff --git a/roles/devel.nix b/roles/devel.nix index c33e23d..b00beaf 100644 --- a/roles/devel.nix +++ b/roles/devel.nix @@ -1,9 +1,11 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -{ + +let + x86 = pkgs.stdenv.isx86_64; +in { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - jetbrains.clion rustc cargo rustup From 1ddd535a2d75a74af03c7cd5817e583b00d678bc Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 11:30:16 +0300 Subject: [PATCH 08/16] Fix roles/devel config Signed-off-by: Ivan Bushchik --- roles/devel.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/roles/devel.nix b/roles/devel.nix index b00beaf..e395fe4 100644 --- a/roles/devel.nix +++ b/roles/devel.nix @@ -1,9 +1,6 @@ { config, pkgs, lib, ... }: - -let - x86 = pkgs.stdenv.isx86_64; -in { +{ nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ rustc From b8466b80fd1d263aa666d5766045228c030ea135 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 12:29:22 +0300 Subject: [PATCH 09/16] Update README.md Signed-off-by: Ivan Bushchik --- README.md | 23 ++++++++++++++++++++--- machines/celerrime/hardware.nix | 1 + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 42910f7..bc17632 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,25 @@ # NixOS Configuration files. +## Deploying + +```shell +nixos-install --flake https://github.com/ivabus/nixos#host +``` + +## Rebuilding + +```shell +nixos-rebuild switch --flake path:/etc/nixos +``` + +Apple Silicon hosts require additional `--impure` flag for firmware installation. (Firmware should be placed in /etc/nixos/asahi/firmware (ignored by git)). + +### Hosts configured + +- stella (Random Ryzen 3 3250U laptop) +- vetus (iMac 27" 2017) +- celerrime (MacBook Air M2) + ## TODO - do something with dotfiles installation from [ivabus/dotfiles](https://github.com/ivabus/dotfiles) -- install nixos on more machines -- write proper readme -- fix gtk theming issues \ No newline at end of file diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix index 3a98948..19b7538 100644 --- a/machines/celerrime/hardware.nix +++ b/machines/celerrime/hardware.nix @@ -29,6 +29,7 @@ hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; hardware.asahi.addEdgeKernelConfig = true; hardware.asahi.useExperimentalGPUDriver = true; + networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; From ffc7d9fdf2dd8c5f6e5508ed9264b2ac42ed2a88 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 12:44:50 +0300 Subject: [PATCH 10/16] Refactor configuration Signed-off-by: Ivan Bushchik --- README.md | 6 +++++- machines/celerrime/configuration.nix | 7 +++++++ machines/celerrime/hardware.nix | 5 ----- machines/stella/configuration.nix | 5 +++++ machines/stella/hardware.nix | 7 ------- machines/vetus/configuration.nix | 1 - machines/vetus/hardware.nix | 2 +- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index bc17632..d4f8ede 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,12 @@ ## Deploying +Setup disks, mount root to `/mnt` and `/boot` to `/mnt/boot` and run something like it + ```shell -nixos-install --flake https://github.com/ivabus/nixos#host +git clone https://github.com/ivabus/nixos /mnt/etc/nixos +nixos-generate-config --show-hardware-config --root /mnt > /mnt/etc/nixos/machines/host/hardware.nix +nixos-install --flake path:.#host ``` ## Rebuilding diff --git a/machines/celerrime/configuration.nix b/machines/celerrime/configuration.nix index db9e313..5f25df0 100644 --- a/machines/celerrime/configuration.nix +++ b/machines/celerrime/configuration.nix @@ -6,4 +6,11 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = false; + boot.kernelParams = [ "apple_dcp.show_notch=1" ]; + + hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; + hardware.asahi.addEdgeKernelConfig = true; + hardware.asahi.useExperimentalGPUDriver = true; + + system.stateVersion = "23.05"; } diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix index 19b7538..6e63761 100644 --- a/machines/celerrime/hardware.nix +++ b/machines/celerrime/hardware.nix @@ -9,7 +9,6 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - boot.kernelParams = [ "apple_dcp.show_notch=1" ]; fileSystems."/" = { device = "/dev/disk/by-uuid/c313a438-700c-4d9c-9413-354ebfb010eb"; @@ -26,10 +25,6 @@ swapDevices = [ { device = "/dev/disk/by-uuid/272341f1-b083-497e-b129-aef8732b5b50"; } ]; - hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; - hardware.asahi.addEdgeKernelConfig = true; - hardware.asahi.useExperimentalGPUDriver = true; - networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; diff --git a/machines/stella/configuration.nix b/machines/stella/configuration.nix index b61d086..3bb15f5 100644 --- a/machines/stella/configuration.nix +++ b/machines/stella/configuration.nix @@ -10,6 +10,11 @@ services.xserver.videoDrivers=["amdgpu"]; boot.initrd.kernelModules=["amdgpu"]; + powerManagement = { + enable = true; + cpuFreqGovernor = "performance"; + }; + system.stateVersion = "23.05"; } diff --git a/machines/stella/hardware.nix b/machines/stella/hardware.nix index f740056..5875c23 100644 --- a/machines/stella/hardware.nix +++ b/machines/stella/hardware.nix @@ -11,7 +11,6 @@ boot.kernelModules = [ "kvm-amd" "nct6775" ]; boot.extraModulePackages = [ ]; - environment.etc = { "sysconfig/lm_sensors".text = '' HWMON_MODULES="lm75" @@ -34,10 +33,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - services.tlp.settings = { - START_CHARGE_THRESH_BAT0 = 40; - STOP_CHARGE_THRESH_BAT0 = 80; - }; - powerManagement.enable = true; - powerManagement.cpuFreqGovernor = "performance"; } diff --git a/machines/vetus/configuration.nix b/machines/vetus/configuration.nix index 800cf08..135a2b5 100644 --- a/machines/vetus/configuration.nix +++ b/machines/vetus/configuration.nix @@ -7,7 +7,6 @@ boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "vetus"; - time.timeZone = "Europe/Moscow"; system.stateVersion = "23.05"; } diff --git a/machines/vetus/hardware.nix b/machines/vetus/hardware.nix index fdebbdd..f6b39ba 100644 --- a/machines/vetus/hardware.nix +++ b/machines/vetus/hardware.nix @@ -28,4 +28,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} \ No newline at end of file +} From 360e25c0a3c3f2e0811f15e2c1cdd8ccadc426a4 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 15:21:12 +0300 Subject: [PATCH 11/16] Add dotfiles to readme Signed-off-by: Ivan Bushchik --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d4f8ede..e834554 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,10 @@ Apple Silicon hosts require additional `--impure` flag for firmware installation - vetus (iMac 27" 2017) - celerrime (MacBook Air M2) -## TODO +## Dotfiles (from `ivabus/dotfiles`) -- do something with dotfiles installation from [ivabus/dotfiles](https://github.com/ivabus/dotfiles) +I'm installing my dotfiles using (with prepared script) + +```shell +curl https://iva.bz/nix | sh +``` From b78065a71e237018ba3da9e8c86afd00f0410d44 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 16:47:22 +0300 Subject: [PATCH 12/16] Add avahi + enable IPv6 Signed-off-by: Ivan Bushchik --- common/networking.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/common/networking.nix b/common/networking.nix index 6e467d8..6d703ec 100644 --- a/common/networking.nix +++ b/common/networking.nix @@ -10,6 +10,13 @@ networking.nameservers = [ "1.1.1.1" "1.0.0.1" "8.8.8.8" ]; + networking.enableIPv6 = true; + + services.avahi = { + enable = true; + nssmdns = true; + }; + services.timesyncd.enable = true; networking.timeServers = [ "ntp1.vniiftri.ru" "0.ru.pool.ntp.org" "0.pool.ntp.org" ]; -} \ No newline at end of file +} From 4b9a9bc6a7d39429f2c3bb59585d209c9ee9407f Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 16:59:19 +0300 Subject: [PATCH 13/16] Fix avahi conf Signed-off-by: Ivan Bushchik --- common/networking.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/networking.nix b/common/networking.nix index 6d703ec..f48008a 100644 --- a/common/networking.nix +++ b/common/networking.nix @@ -12,9 +12,18 @@ networking.enableIPv6 = true; + services.resolved.enable = true; services.avahi = { enable = true; nssmdns = true; + publish = { + enable = true; + addresses = true; + domain = true; + hinfo = true; + userServices = true; + workstation = true; + }; }; services.timesyncd.enable = true; From 1ff6cdba955a3966fb22848f8aebf76c6facd175 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 30 Jul 2023 17:51:12 +0300 Subject: [PATCH 14/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e834554..a6cbf18 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Deploying -Setup disks, mount root to `/mnt` and `/boot` to `/mnt/boot` and run something like it +Setup disks, mount root to `/mnt` and `/boot` to `/mnt/boot` and run something like this ```shell git clone https://github.com/ivabus/nixos /mnt/etc/nixos From f18869691adb9d95469ef2ba820052bebf9dfa29 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Wed, 2 Aug 2023 10:43:52 +0300 Subject: [PATCH 15/16] Changes Signed-off-by: Ivan Bushchik --- common/laptop.nix | 7 +++++-- common/user.nix | 2 +- flake.nix | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/laptop.nix b/common/laptop.nix index b26664e..7abf22b 100644 --- a/common/laptop.nix +++ b/common/laptop.nix @@ -7,7 +7,10 @@ ]; boot.plymouth.enable = true; - + + hardware.bluetooth.enable = true; + services.blueman.enable = true; + services.tlp.enable = true; services.upower.enable = true; -} \ No newline at end of file +} diff --git a/common/user.nix b/common/user.nix index 17c6a79..0c6827e 100644 --- a/common/user.nix +++ b/common/user.nix @@ -5,7 +5,7 @@ let in { users.users.ivabus = { isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "input" ]; uid = 1000; packages = with pkgs; [ tree diff --git a/flake.nix b/flake.nix index bb4d59f..3500126 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ ./common/remote-access.nix ./roles/graphical.nix ./roles/latex.nix - #./roles/gaming.nix + ./roles/gaming.nix ./roles/devel.nix ./roles/yggdrasil-client.nix ./machines/stella/configuration.nix From a6c62d05de9afa9c98ebbe1b7fc8ea9a1105ac5f Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Wed, 2 Aug 2023 10:44:21 +0300 Subject: [PATCH 16/16] Fix gitignore Signed-off-by: Ivan Bushchik --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 46949a8..3405f13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ asahi* -./flake.lock +flake.lock