From 2c8cf957eea01156bf9c0879ea35c2c57859d2ec Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 1 Mar 2026 15:58:42 +0100 Subject: [PATCH] feat: bump to nixos-unstable --- blueplum.nix | 2 +- configuration.nix | 8 +++----- home.nix | 5 ++--- home/i3.nix | 2 +- pkgs/default.nix | 6 ++---- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/blueplum.nix b/blueplum.nix index d5b2124..4cef910 100644 --- a/blueplum.nix +++ b/blueplum.nix @@ -58,7 +58,7 @@ in }; home-manager.users.anton.xsession.profileExtra = concat [ - "${lib.getExe pkgs.xorg.xrandr}" + "${lib.getExe pkgs.xrandr}" "${concat [ "--output DP-2" "--mode 1920x1080" diff --git a/configuration.nix b/configuration.nix index 66ae9d0..546c5c8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -56,7 +56,7 @@ in typescript-language-server pnpm nixd - nixfmt-rfc-style + nixfmt clang llvmPackages.bintools stylua @@ -66,7 +66,7 @@ in fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji jetbrains-mono nerd-fonts.symbols-only inter @@ -105,7 +105,6 @@ in }; displayManager.startx.enable = true; - tty = 7; # Configure keymap in X11 xkb = { @@ -118,12 +117,11 @@ in }; greetd = { enable = true; - vt = config.services.xserver.tty; restart = false; settings = { default_session = { command = lib.concatStringsSep " " [ - "${lib.getExe pkgs.greetd.tuigreet}" + "${lib.getExe pkgs.tuigreet}" "--remember" "--asterisks" "--time" diff --git a/home.nix b/home.nix index af971fb..d261a06 100644 --- a/home.nix +++ b/home.nix @@ -19,12 +19,11 @@ in home.homeDirectory = lib.mkDefault home; home.packages = with pkgs; [ - mpkgs.element + element-desktop spotify kitty flameshot krita - davinci-resolve vscode godotPackages_4_5.godot @@ -102,7 +101,7 @@ in else { signByDefault = false; }; - extraConfig = { + settings = { user.name = "Anton"; user.email = "aligator.h0spital.e@gmail.com"; diff --git a/home/i3.nix b/home/i3.nix index 0aa1b74..f714d2c 100644 --- a/home/i3.nix +++ b/home/i3.nix @@ -91,7 +91,7 @@ in "exec i3-msg focus output ${env.displays.primary}" ( if (env.displays ? xrandr) then - "exec \"${lib.getExe pkgs.xorg.xrandr} ${env.displays.xrandr}\"" + "exec \"${lib.getExe pkgs.xrandr} ${env.displays.xrandr}\"" else "" ) diff --git a/pkgs/default.nix b/pkgs/default.nix index 717457f..cbb7ea6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -41,14 +41,12 @@ in font.monaco = use ./monaco-font/default.nix; - element = use ./element/default.nix; - home-manager = { module = let home-manager = fetchzip { - url = "https://github.com/nix-community/home-manager/archive/release-${system.stateVersion}.tar.gz"; - hash = "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4="; + url = "https://github.com/nix-community/home-manager/archive/master.tar.gz"; + hash = "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8="; }; in import "${home-manager}/nixos";