Configs update

This commit is contained in:
Filippo Berto 2022-06-28 19:29:17 +02:00
parent 0d6d765332
commit f6a5f13407
5 changed files with 31 additions and 28 deletions

46
flake.lock generated
View file

@ -18,11 +18,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1656065134,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654113405, "lastModified": 1655880690,
"narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", "narHash": "sha256-pO+EqUefNFolIWV1DHXPfI8NuUtD4fd7JFKoaCjVXOs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", "rev": "a839432a5c3d2a762d68168093349097e6affb07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -63,11 +63,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1655143251, "lastModified": 1656199469,
"narHash": "sha256-hHcQRfLARkqGpV3lWTRZpYPTSW0oZhAUD3KOzcF8oZg=", "narHash": "sha256-17t4qc016C1p6oNSKOrYbOCErWhQI4dr4nzJKrGO8VE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cd3dd2188c19416bc70d9703f84e07a0646af5bf", "rev": "1dbac84b846e4bfa21a08e31e95e11f0965ed042",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +100,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1654057797, "lastModified": 1656241064,
"narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=", "narHash": "sha256-+jWwBt515aFGukeX8WSafg9CM3Ju3FD0XrF+X4ph0mU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af", "rev": "99e33a57149916ebede78ec13edd9ba310c10f2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,11 +131,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1655168282, "lastModified": 1656219440,
"narHash": "sha256-lQcjVEUbwzsfJxrxpvrdFuWd+7hhl1yvQXwYScMF7Y0=", "narHash": "sha256-2dhFA29f3dpw4axAKhVj8JsHQzHViG92a7AfkXLHnBY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0eb0b72a281fea2b384060470f1ec4c314e76dfc", "rev": "4a155658a7c3a9e465c365beb0a50352efa64ca0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,10 +149,10 @@
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1653339422, "lastModified": 1653339422,
"narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=", "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=",
"owner": "rycee", "owner": "rycee",
"repo": "nmd", "repo": "nmd",
"rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd", "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -212,11 +212,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1652714503, "lastModified": 1656169028,
"narHash": "sha256-qQKVEfDe5FqvGgkZtg5Pc491foeiDPIOeycHMqnPDps=", "narHash": "sha256-y9DRauokIeVHM7d29lwT8A+0YoGUBXV3H0VErxQeA8s=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "521a524771a8e93caddaa0ac1d67d03766a8b0b3", "rev": "db3bd555d3a3ceab208bed48f983ccaa6a71a25e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,11 +263,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1655130522, "lastModified": 1655983783,
"narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=", "narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "13f08d71ceff5101321e0291854495a1ec153a5e", "rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -99,9 +99,11 @@ in
commit.gpgSign = true; commit.gpgSign = true;
# core.editor = kak; # core.editor = kak;
credential.helper = "cache --timeout=3600 "; credential.helper = "cache --timeout=3600 ";
delta.navigate = true;
diff.guitool = "meld"; diff.guitool = "meld";
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.guitool = "meld"; merge.guitool = "meld";
merge.tool = "meld";
pull.rebase = true; pull.rebase = true;
rebase.autoStash = true; rebase.autoStash = true;
user.signingKey = "berto.f@protonmail.com"; user.signingKey = "berto.f@protonmail.com";

View file

@ -73,6 +73,8 @@ let
font = [ font = [
"${pkgs.rice.font.monospace.name}:size=${toString pkgs.rice.font.monospace.size};2" "${pkgs.rice.font.monospace.name}:size=${toString pkgs.rice.font.monospace.size};2"
# "Font Awesome 6 Free:size=14;0" # "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" # "Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2"
# "EmojiOne Color:size=${toString pkgs.rice.font.monospace.size};0" # "EmojiOne Color:size=${toString pkgs.rice.font.monospace.size};0"
]; ];
@ -86,6 +88,7 @@ in
pkgs.rice.font.monospace.package pkgs.rice.font.monospace.package
# emojione # emojione
# noto-fonts-emoji # noto-fonts-emoji
noto-fonts
# material-design-icons # material-design-icons
# font-awesome # font-awesome
]; ];
@ -297,7 +300,7 @@ in
"module/player" = { "module/player" = {
type = "custom/script"; type = "custom/script";
format = colors.normal; format = colors.normal // { padding = 0; };
exec = playerStatus; exec = playerStatus;
click.left = "${playerCtl} play-pause"; click.left = "${playerCtl} play-pause";
scroll = { scroll = {

View file

@ -1,9 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
imports = [ imports = [ /etc/nixos/hardware-configuration.nix ];
/etc/nixos/hardware-configuration.nix
];
boot.loader = { boot.loader = {
systemd-boot.enable = true; systemd-boot.enable = true;

View file

@ -5,7 +5,7 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.checkJournalingFS = true; boot.initrd.checkJournalingFS = true;
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_18; # 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 ]; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
# # Cross-build arm # # Cross-build arm