From 24a3ba6f997fa2ca4b84e921f07dd1a2b4816e3f Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Wed, 20 Nov 2024 10:59:15 +0100 Subject: [PATCH] Updated packages. Fixes - Updated packages - Fixed hyprlock config - Changed default file manager to yazi - added lazygit - added fzf --- flake.lock | 61 +++++++++++++++++++------------------ nixos/configuration.nix | 16 ++++++++-- nixos/home.nix | 12 ++++++-- nixos/hyprland/hyprland.nix | 4 ++- nixos/hyprland/hyprlock.nix | 6 +--- 5 files changed, 59 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 6b4675b..5026fd4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1730968822, - "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", + "lastModified": 1731496216, + "narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", + "rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731778696, + "narHash": "sha256-qQYeHamLt0z00G5MTSSxaTw/9zGdebEeYj4MDL+nOCI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "d154a557da07645aaea3b3375317c234cf2eed82", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1730969692, - "narHash": "sha256-4Ly9zkqnRB6qLjMeddfUyd4iRLvq+RDspBWABS8DGN4=", + "lastModified": 1731775198, + "narHash": "sha256-WyPBmw5YMukhzZSZYFOzLi8Tmje8dj/mX+4TeUGthrY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875", + "rev": "83be2480c45bdead9110fdf137a1cd2f5a203378", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1730968903, - "narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=", + "lastModified": 1731518387, + "narHash": "sha256-aZZw1ZvTMLkcA6udlvkA3hrCkuipoWLy8s/JNnIclxY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9", + "rev": "315fba5d21d87ddb756d4bebdb49f99d86b0ffe8", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -478,11 +478,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -494,11 +494,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1731531548, + "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "24f0d4acd634792badd6470134c387a3b039dace", "type": "github" }, "original": { @@ -519,11 +519,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -558,11 +558,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731002033, - "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", + "lastModified": 1731657386, + "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=", "owner": "danth", "repo": "stylix", - "rev": "f71c2effed1ce4f9fbeefe402e4e431428ffe93a", + "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f", "type": "github" }, "original": { @@ -619,16 +619,17 @@ "tinted-foot": { "flake": false, "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", "owner": "tinted-theming", "repo": "tinted-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", "type": "github" } }, diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 6bc3e4f..b60cfe9 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -71,12 +71,17 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowBroken = true; # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. kitty + yazi + tealdeer + fzf + lazygit kdePackages.qtwayland #libsForQt5.qt5.qtwayland #libsForQt5.qt5.qtsvg @@ -144,6 +149,10 @@ obs-studio vesktop vscode-fhs + + # development + clang_18 + dotnetCorePackages.sdk_8_0_3xx ]; programs.kdeconnect.enable = true; programs.kdeconnect.package = pkgs.kdePackages.kdeconnect-kde; @@ -177,7 +186,10 @@ font-awesome hack-font ]; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment.sessionVariables = { + NIXOS_OZONE_WL = "1"; + MANPAGER = "nvim +Man!"; + }; hardware = { graphics = { enable = true; @@ -259,7 +271,7 @@ }; stylix = { enable = true; - image = ./hyprland/wallpaper.jpg; + image = "${./hyprland/wallpaper.jpg}"; autoEnable = true; opacity = { desktop = 0.5; diff --git a/nixos/home.nix b/nixos/home.nix index 311f955..3df5056 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, stylix, ... }: let #nur = import (builtins.fetchTarball { @@ -19,7 +19,10 @@ # manage. home.username = "kylekrein"; home.homeDirectory = "/home/kylekrein"; - + stylix = { + enable = true; + targets.hyprlock.enable = false; + }; qt = { enable = true; platformTheme.name = "qtct"; @@ -39,6 +42,11 @@ "Kvantum/catppuccin-mocha".source = "${pkgs.catppuccin-kvantum}/share/Kvantum/catppuccin-mocha"; }; + programs.fzf = { + enable = true; + enableBashIntegration = true; + }; + #xdg.configFile."qt5ct/qt5ct.conf".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" { # Appearance.icon_theme = "Breeze Dark"; # }; diff --git a/nixos/hyprland/hyprland.nix b/nixos/hyprland/hyprland.nix index ffbf257..da2e625 100644 --- a/nixos/hyprland/hyprland.nix +++ b/nixos/hyprland/hyprland.nix @@ -41,7 +41,8 @@ in "$mod" = "SUPER"; "$mainMod" = "$mod"; "$terminal" = "${pkgs.kitty}/bin/kitty"; - "$fileManager" = "${pkgs.kdePackages.dolphin}/bin/dolphin"; + "$fileManager" = "$terminal ${pkgs.yazi}/bin/yazi"; + "$fileManager2" = "${pkgs.kdePackages.dolphin}/bin/dolphin"; "$browser" = "${pkgs.firefox}/bin/firefox"; "$menu" = "${pkgs.wofi}/bin/wofi --show drun"; "$clipboardManager" = "$terminal --class clipse -e 'clipse'"; @@ -53,6 +54,7 @@ in "$mod, B, exec, $browser" "$mod SHIFT, V, togglefloating," "$mod, C, exec, $fileManager" + "$mod SHIFT, C, exec, $fileManager2" "$mod, F, fullscreen," "$mod, R, exec, $menu" "$mod, V, exec, $clipboardManager" diff --git a/nixos/hyprland/hyprlock.nix b/nixos/hyprland/hyprlock.nix index 0bb2f57..bdf38fc 100644 --- a/nixos/hyprland/hyprlock.nix +++ b/nixos/hyprland/hyprlock.nix @@ -4,8 +4,7 @@ enable = true; settings = { background = { - monitor = { - #path = /home/me/someImage.png # supports png, jpg, webp (no animations, though) + #path = ; color = "rgba(25, 20, 20, 1.0)"; # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations @@ -16,10 +15,8 @@ background = { brightness = 0.8172; vibrancy = 0.1696; vibrancy_darkness = 0.0; - }; }; input-field = { - monitor = { size = "200, 50"; outline_thickness = 3; dots_size = 0.33; # Scale of input-field height, 0.2 - 0.8 @@ -51,7 +48,6 @@ input-field = { position = "0, -20"; halign = "center"; valign = "center"; - }; }; }; };