From 7b780ffa3f6fcc53f3f04b2010d1dd704bb08b51 Mon Sep 17 00:00:00 2001 From: Kirill Date: Fri, 30 May 2025 12:31:47 +0300 Subject: [PATCH] Switched Scheme --- flake.lock | 152 ++++++++---------- home-manager/data/hyprland.nix | 9 +- home-manager/data/mako.nix | 31 ++-- home-manager/data/pkgs.nix | 3 +- home-manager/data/style.nix | 23 ++- home-manager/data/wofi.nix | 7 + nixos/hosts/usconfig/bootloader.nix | 37 +++++ nixos/hosts/usconfig/configuration.nix | 6 +- nixos/hosts/usconfig/grab.nix | 13 ++ .../hosts/usconfig/hardware-configuration.nix | 4 +- nixos/hosts/usconfig/pockets.nix | 1 + 11 files changed, 174 insertions(+), 112 deletions(-) create mode 100644 home-manager/data/wofi.nix create mode 100644 nixos/hosts/usconfig/bootloader.nix create mode 100644 nixos/hosts/usconfig/grab.nix diff --git a/flake.lock b/flake.lock index 3fab3b5..142b672 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1738087375, - "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", + "lastModified": 1744557573, + "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", "owner": "Aylur", "repo": "ags", - "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", + "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1737670815, - "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=", + "lastModified": 1742571008, + "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", "owner": "aylur", "repo": "astal", - "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042", + "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", "type": "github" }, "original": { @@ -45,11 +45,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742395929, - "narHash": "sha256-HRHXXRP72f3ljAjS5LPvre2H8PW7Vl/wBasNJDrH+8k=", + "lastModified": 1747582977, + "narHash": "sha256-jadhKg5VI+UfBQc+lv7J1n08DyLqoVNp3Ip3AxZG874=", "owner": "ayugram-port", "repo": "ayugram-desktop", - "rev": "6ae819b6aba4fa7c64e12e52b2f733c6093a4110", + "rev": "b25bd9973000d47839bb2939d6d6fd0603ca7adc", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1741628778, - "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", + "lastModified": 1744642301, + "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", + "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "type": "github" }, "original": { @@ -161,7 +161,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -179,27 +178,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -229,11 +207,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -267,16 +245,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -288,11 +266,11 @@ ] }, "locked": { - "lastModified": 1742489436, - "narHash": "sha256-891PjWxlkKMEn4dK9rrqTV6py/lf7xFD0d5B2bM0A18=", + "lastModified": 1747688838, + "narHash": "sha256-FZq4/3OtGV/cti9Vccsy2tGSUrxTO4hkDF9oeGRTen4=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc189507bc0bc74b3794ee6912a5b80de8dfcc0c", + "rev": "45c2985644b60ab64de2a2d93a4d132ecb87cf66", "type": "github" }, "original": { @@ -309,11 +287,11 @@ ] }, "locked": { - "lastModified": 1741635347, - "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", + "lastModified": 1747279714, + "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=", "owner": "nix-community", "repo": "home-manager", - "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", + "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2", "type": "github" }, "original": { @@ -324,11 +302,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -356,11 +334,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "type": "github" }, "original": { @@ -372,11 +350,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -388,11 +366,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -404,11 +382,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "type": "github" }, "original": { @@ -420,7 +398,10 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -428,11 +409,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741693509, - "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -457,11 +438,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1742406979, - "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -478,7 +459,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", @@ -492,11 +473,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742496983, - "narHash": "sha256-UpJrU0DEhNLVZwL/RPVOEUHCG6iDOVDoYelkmgS4V38=", + "lastModified": 1747733212, + "narHash": "sha256-/Qqw4QfDIReR+qR9cjtiXE4WmW7lxTsKshTaaC7j94c=", "owner": "danth", "repo": "stylix", - "rev": "7e9906679d384472849272e5a5eef7adbdb1d87f", + "rev": "fb9c22056faa95f35749f116c49c5c202ceb159c", "type": "github" }, "original": { @@ -540,28 +521,27 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1741468895, - "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", + "lastModified": 1744974599, + "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", + "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "type": "github" }, "original": { @@ -573,11 +553,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1740877430, - "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", + "lastModified": 1745111349, + "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", + "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "type": "github" }, "original": { diff --git a/home-manager/data/hyprland.nix b/home-manager/data/hyprland.nix index 6d595e4..54aaec1 100644 --- a/home-manager/data/hyprland.nix +++ b/home-manager/data/hyprland.nix @@ -43,7 +43,6 @@ input = { kb_layout = "us,ru"; - kb_variant = "lang"; kb_options = "grp:caps_toggle"; follow_mouse = 1; @@ -119,10 +118,10 @@ }; windowrule = [ - "float, ^(imv)$" - "float, ^(feh)$" - "float, ^(mpv)$" - "float, ^(nmtui)$" + "float, class:^(imv)$" + "float, class:^(feh)$" + "float, class:^(mpv)$" + "float, class:^(nmtui)$" "float, title:^(Список друзей)" ]; diff --git a/home-manager/data/mako.nix b/home-manager/data/mako.nix index b010503..a714bd3 100644 --- a/home-manager/data/mako.nix +++ b/home-manager/data/mako.nix @@ -1,12 +1,21 @@ -{ - xdg.configFile."mako/config".text = '' - background-color=#303446 - text-color=#c6d0f5 - border-color=#8caaee - progress-color=over #414559 - default-timeout=5000 +{ config, pkgs, ... }: + let + colors = config.lib.stylix.colors; + in { + home.packages = [ pkgs.mako ]; + xdg.configFile."mako/config".text = '' + background-color=#${colors.base00} + text-color=#${colors.base05} + border-color=#${colors.base0B} + border-radius=10 + margin=16 + progress-color=over #${colors.base0A} + default-timeout=5000 - [urgency=high] - border-color=#ef9f76 - ''; -} + [urgency=high] + border-color=#${colors.base09} + + [urgency=low] + border-color=#${colors.base04} + ''; + } diff --git a/home-manager/data/pkgs.nix b/home-manager/data/pkgs.nix index 5e3ae36..0ca4b0d 100644 --- a/home-manager/data/pkgs.nix +++ b/home-manager/data/pkgs.nix @@ -9,6 +9,7 @@ ./sleepMode.nix ./ghostty.nix ./home-aps.nix - ./zed-idea.nix + ./zed-idea.nix + ./wofi.nix ]; } diff --git a/home-manager/data/style.nix b/home-manager/data/style.nix index 92e483a..69efd85 100644 --- a/home-manager/data/style.nix +++ b/home-manager/data/style.nix @@ -6,7 +6,7 @@ waybar.enable = false; }; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-city-dark.yaml"; polarity = "dark"; image = pkgs.fetchurl { @@ -18,7 +18,14 @@ enable = true; package = pkgs.pop-icon-theme; dark = "Pop-Dark"; - }; + }; + + cursor = { + name = "catppuccin-mocha-dark-cursors"; + size = 24; + package = pkgs.catppuccin-cursors.mochaDark; + }; + fonts = { monospace = { @@ -26,7 +33,17 @@ package = pkgs.jetbrains-mono; }; - sizes = { + serif = { + name = "GabrieLa"; + package = (pkgs.google-fonts.override { fonts = [ "Gabriela" ]; }); + }; + + emoji = { + package = pkgs.noto-fonts-monochrome-emoji; + name = "Noto Emoji"; + }; + + sizes = { applications = 13; desktop = 12; }; diff --git a/home-manager/data/wofi.nix b/home-manager/data/wofi.nix new file mode 100644 index 0000000..7428f87 --- /dev/null +++ b/home-manager/data/wofi.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + xdg.configFile."wofi/style.css".source = pkgs.fetchurl { + name = "style.css"; + url = "https://github.com/joao-vitor-sr/wofi-themes-collection/raw/main/themes/nord.css"; + sha256 = "sha256-rMDtE7Q0hmqd9LD+Ur/QR6cMan9ev6e9IyzpwY367c0="; + }; +} diff --git a/nixos/hosts/usconfig/bootloader.nix b/nixos/hosts/usconfig/bootloader.nix new file mode 100644 index 0000000..45cc4f7 --- /dev/null +++ b/nixos/hosts/usconfig/bootloader.nix @@ -0,0 +1,37 @@ +{ pkgs, ... }: { + boot = { + loader = { + timeout = 3; + efi = { + efiSysMountPoint = "/boot"; + canTouchEfiVariables = true; + }; + + grub = { + enable = true; + efiSupport = true; + device = "nodev"; + useOSProber = true; + }; + }; + consoleLogLevel = 0; + kernelParams = [ + # "quiet" + "splash" + "boot.shell_on_fail" + "loglevel=3" + # "rd.systemd.show_status=false" + # "rd.udev.log_level=3" + "udev.log_priority=0" + ]; + plymouth = { + enable = true; + theme = "black_hud"; + themePackages = with pkgs; [ + (adi1090x-plymouth-themes.override { + selected_themes = [ "black_hud" ]; + }) + ]; + }; + }; +} diff --git a/nixos/hosts/usconfig/configuration.nix b/nixos/hosts/usconfig/configuration.nix index 2aef41d..b96ffce 100644 --- a/nixos/hosts/usconfig/configuration.nix +++ b/nixos/hosts/usconfig/configuration.nix @@ -12,15 +12,13 @@ ./models/gamemode.nix ./models/postgresql.nix ./models/env.nix + ./bootloader.nix + ./grab.nix ]; #home.packages = [ pkgs.callPackage ./pockets/thingsboard.nix {} ]; - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - services.upower.enable = true; networking.hostName = "usconfig"; # Define your hostname. diff --git a/nixos/hosts/usconfig/grab.nix b/nixos/hosts/usconfig/grab.nix new file mode 100644 index 0000000..a101564 --- /dev/null +++ b/nixos/hosts/usconfig/grab.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: let + theme = pkgs.fetchFromGitHub { + owner = "Patato777"; + repo = "dotfiles"; + rev = "cc363921707807d7ad3e36b462f0df793a0fe18a"; + hash = "sha256-fpXGFNrzbV6K9hoZRX4tGieTLzhpPeGm6wn8CF4OGow="; + }; +in { + boot.loader.grub = { + gfxmodeEfi = "1920x1080"; + theme = "${theme}/grub/themes/virtuaverse"; + }; +} diff --git a/nixos/hosts/usconfig/hardware-configuration.nix b/nixos/hosts/usconfig/hardware-configuration.nix index 0ffd68d..8ee19e7 100644 --- a/nixos/hosts/usconfig/hardware-configuration.nix +++ b/nixos/hosts/usconfig/hardware-configuration.nix @@ -19,9 +19,9 @@ }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C2A0-25B9"; + { device = "/dev/disk/by-uuid/88A3-9F2F"; fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; + options = [ "fmask=0077" "dmask=0077" "nofail" ]; }; swapDevices = [ ]; diff --git a/nixos/hosts/usconfig/pockets.nix b/nixos/hosts/usconfig/pockets.nix index 21630e6..e11ca55 100644 --- a/nixos/hosts/usconfig/pockets.nix +++ b/nixos/hosts/usconfig/pockets.nix @@ -15,6 +15,7 @@ wget home-manager pkgs.opera + bat #git pkgs.git