From f6a5f134074e240297e8d074482a2117c5b6e346 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 28 Jun 2022 19:29:17 +0200 Subject: [PATCH] Configs update --- flake.lock | 46 ++++++++++++++++---------------- home_manager/modules/git.nix | 2 ++ home_manager/modules/polybar.nix | 5 +++- nixos/loki.nix | 4 +-- odin/common_configuration.nix | 2 +- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index c8fd0d7..62307be 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1656065134, + "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", "type": "github" }, "original": { @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1654113405, - "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", + "lastModified": 1655880690, + "narHash": "sha256-pO+EqUefNFolIWV1DHXPfI8NuUtD4fd7JFKoaCjVXOs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", + "rev": "a839432a5c3d2a762d68168093349097e6affb07", "type": "github" }, "original": { @@ -63,11 +63,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1655143251, - "narHash": "sha256-hHcQRfLARkqGpV3lWTRZpYPTSW0oZhAUD3KOzcF8oZg=", + "lastModified": 1656199469, + "narHash": "sha256-17t4qc016C1p6oNSKOrYbOCErWhQI4dr4nzJKrGO8VE=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd3dd2188c19416bc70d9703f84e07a0646af5bf", + "rev": "1dbac84b846e4bfa21a08e31e95e11f0965ed042", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1654057797, - "narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=", + "lastModified": 1656241064, + "narHash": "sha256-+jWwBt515aFGukeX8WSafg9CM3Ju3FD0XrF+X4ph0mU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af", + "rev": "99e33a57149916ebede78ec13edd9ba310c10f2f", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1655168282, - "narHash": "sha256-lQcjVEUbwzsfJxrxpvrdFuWd+7hhl1yvQXwYScMF7Y0=", + "lastModified": 1656219440, + "narHash": "sha256-2dhFA29f3dpw4axAKhVj8JsHQzHViG92a7AfkXLHnBY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0eb0b72a281fea2b384060470f1ec4c314e76dfc", + "rev": "4a155658a7c3a9e465c365beb0a50352efa64ca0", "type": "github" }, "original": { @@ -149,10 +149,10 @@ "flake": false, "locked": { "lastModified": 1653339422, - "narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=", + "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=", "owner": "rycee", "repo": "nmd", - "rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd", + "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29", "type": "gitlab" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1652714503, - "narHash": "sha256-qQKVEfDe5FqvGgkZtg5Pc491foeiDPIOeycHMqnPDps=", + "lastModified": 1656169028, + "narHash": "sha256-y9DRauokIeVHM7d29lwT8A+0YoGUBXV3H0VErxQeA8s=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "521a524771a8e93caddaa0ac1d67d03766a8b0b3", + "rev": "db3bd555d3a3ceab208bed48f983ccaa6a71a25e", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "unstable": { "locked": { - "lastModified": 1655130522, - "narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=", + "lastModified": 1655983783, + "narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13f08d71ceff5101321e0291854495a1ec153a5e", + "rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68", "type": "github" }, "original": { diff --git a/home_manager/modules/git.nix b/home_manager/modules/git.nix index 117d328..c65db70 100644 --- a/home_manager/modules/git.nix +++ b/home_manager/modules/git.nix @@ -99,9 +99,11 @@ in commit.gpgSign = true; # core.editor = kak; credential.helper = "cache --timeout=3600 "; + delta.navigate = true; diff.guitool = "meld"; init.defaultBranch = "main"; merge.guitool = "meld"; + merge.tool = "meld"; pull.rebase = true; rebase.autoStash = true; user.signingKey = "berto.f@protonmail.com"; diff --git a/home_manager/modules/polybar.nix b/home_manager/modules/polybar.nix index 30c95ff..27f7d01 100644 --- a/home_manager/modules/polybar.nix +++ b/home_manager/modules/polybar.nix @@ -73,6 +73,8 @@ let font = [ "${pkgs.rice.font.monospace.name}:size=${toString pkgs.rice.font.monospace.size};2" # "Font Awesome 6 Free:size=14;0" + # "Noto Color Emoji:size=2;2" + "Noto Sans Symbols2:size=${toString pkgs.rice.font.monospace.size};2" # "Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2" # "EmojiOne Color:size=${toString pkgs.rice.font.monospace.size};0" ]; @@ -86,6 +88,7 @@ in pkgs.rice.font.monospace.package # emojione # noto-fonts-emoji + noto-fonts # material-design-icons # font-awesome ]; @@ -297,7 +300,7 @@ in "module/player" = { type = "custom/script"; - format = colors.normal; + format = colors.normal // { padding = 0; }; exec = playerStatus; click.left = "${playerCtl} play-pause"; scroll = { diff --git a/nixos/loki.nix b/nixos/loki.nix index d189fa8..f5d9898 100644 --- a/nixos/loki.nix +++ b/nixos/loki.nix @@ -1,9 +1,7 @@ { config, pkgs, lib, ... }: { - imports = [ - /etc/nixos/hardware-configuration.nix - ]; + imports = [ /etc/nixos/hardware-configuration.nix ]; boot.loader = { systemd-boot.enable = true; diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index 8f917dc..c38478b 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -5,7 +5,7 @@ boot.loader.efi.canTouchEfiVariables = true; boot.initrd.checkJournalingFS = true; # boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_18; - boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_17; + # boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_17; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; # # Cross-build arm