From 9e3727e6be0d358daebe801c1cbb4ddc445758b6 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Mon, 27 Jul 2026 22:21:19 +0300 Subject: [PATCH] some fixes idk --- modules/darwin/homebrew/default.nix | 20 ++++++++++---------- modules/darwin/user/default.nix | 1 + modules/home/linux.nix | 1 + modules/nixos/system/kmscon/default.nix | 1 - modules/nixos/system/locale/default.nix | 4 ++-- modules/nixos/users/default.nix | 8 ++++---- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/modules/darwin/homebrew/default.nix b/modules/darwin/homebrew/default.nix index 31dddcf..034e9e4 100755 --- a/modules/darwin/homebrew/default.nix +++ b/modules/darwin/homebrew/default.nix @@ -1,14 +1,14 @@ -{ pkgs, ... }: +{ ... }: { - system.primaryUser = "sohryu"; - users.users.sohryu = { - name = "sohryu"; - home = "/Users/sohryu"; - shell = pkgs.zsh; + homebrew = { + enable = true; + onActivation = { + autoUpdate = true; + upgrade = true; + cleanup = "none"; + }; + brews = [ ]; + casks = [ ]; }; - - programs.zsh.enable = true; - environment.systemPackages = [ pkgs.nh ]; - environment.variables.NH_FLAKE = "/Users/sohryu/copland"; } diff --git a/modules/darwin/user/default.nix b/modules/darwin/user/default.nix index 1556bfb..31dddcf 100755 --- a/modules/darwin/user/default.nix +++ b/modules/darwin/user/default.nix @@ -1,4 +1,5 @@ { pkgs, ... }: + { system.primaryUser = "sohryu"; users.users.sohryu = { diff --git a/modules/home/linux.nix b/modules/home/linux.nix index 0c8af27..816c99d 100644 --- a/modules/home/linux.nix +++ b/modules/home/linux.nix @@ -1,4 +1,5 @@ { pkgs, ... }: + { imports = [ ./niri.nix diff --git a/modules/nixos/system/kmscon/default.nix b/modules/nixos/system/kmscon/default.nix index 7011c88..6e1aff8 100755 --- a/modules/nixos/system/kmscon/default.nix +++ b/modules/nixos/system/kmscon/default.nix @@ -7,7 +7,6 @@ services.kmscon = { enable = true; - config = { font-name = "JetBrainsMono Nerd Font"; font-size = 18; diff --git a/modules/nixos/system/locale/default.nix b/modules/nixos/system/locale/default.nix index 62a6635..273b5d3 100755 --- a/modules/nixos/system/locale/default.nix +++ b/modules/nixos/system/locale/default.nix @@ -31,8 +31,8 @@ after = [ "network-online.target" ]; wants = [ "network-online.target" ]; }; - console.keyMap = "trq"; console.font = "LatArCyrHeb-16"; - console.earlySetup = true; system.stateVersion = "25.05"; + console.keyMap = "trq"; + console.earlySetup = true; } diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix index ff99f6d..cb6b9b0 100755 --- a/modules/nixos/users/default.nix +++ b/modules/nixos/users/default.nix @@ -7,15 +7,15 @@ description = "elars"; extraGroups = [ "networkmanager" - "wheel" + "libvirtd" + "scanner" + "plugdev" "docker" "video" "input" "audio" + "wheel" "lp" - "scanner" - "libvirtd" - "plugdev" ]; shell = pkgs.zsh; };