bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Odin and polybar update

Browse source
This commit is contained in:
Filippo Berto 2022-06-15 09:20:58 +02:00
parent 47e99ede4f
commit f7e4fcf637
4 changed files with 104 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

87
flake.lock generated
View file

@ -1,5 +1,21 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1653893745,
@ -38,16 +54,20 @@
},
"home-manager-unstable": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"unstable"
]
],
"nmd": "nmd",
"nmt": "nmt",
"utils": "utils"
},
"locked": {
"lastModified": 1654422613,
"narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=",
"lastModified": 1655143251,
"narHash": "sha256-hHcQRfLARkqGpV3lWTRZpYPTSW0oZhAUD3KOzcF8oZg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "20703892473d01c70fb10248442231fe94f4ceb4",
"rev": "cd3dd2188c19416bc70d9703f84e07a0646af5bf",
"type": "github"
},
"original": {
@ -111,11 +131,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1654435734,
"narHash": "sha256-5heW64p01GTp3vhOlTKVsZSRlQlqM37cCYcVByfg0WA=",
"lastModified": 1655168282,
"narHash": "sha256-lQcjVEUbwzsfJxrxpvrdFuWd+7hhl1yvQXwYScMF7Y0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e56f11391a431fa1063cd8ae9784c2efd4516619",
"rev": "0eb0b72a281fea2b384060470f1ec4c314e76dfc",
"type": "github"
},
"original": {
@ -125,6 +145,38 @@
"type": "github"
}
},
"nmd": {
"flake": false,
"locked": {
"lastModified": 1653339422,
"narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=",
"owner": "rycee",
"repo": "nmd",
"rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmd",
"type": "gitlab"
}
},
"nmt": {
"flake": false,
"locked": {
"lastModified": 1648075362,
"narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
"owner": "rycee",
"repo": "nmt",
"rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmt",
"type": "gitlab"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-utils": [
@ -211,11 +263,11 @@
},
"unstable": {
"locked": {
"lastModified": 1654230545,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"lastModified": 1655130522,
"narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"rev": "13f08d71ceff5101321e0291854495a1ec153a5e",
"type": "github"
},
"original": {
@ -224,6 +276,21 @@
"repo": "nixpkgs",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

1
home_manager/modules/office.nix
View file

@ -6,5 +6,6 @@
hunspellDicts.en_GB-large
hunspellDicts.en_US-large
hunspellDicts.it_IT
hunspell.bin
];
}

81
home_manager/modules/polybar.nix
View file

@ -72,9 +72,9 @@ let
};
font = [
"${pkgs.rice.font.monospace.name}:size=${toString pkgs.rice.font.monospace.size};2"
"Font Awesome 6 Free:size=14;0"
"Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2"
"EmojiOne Color:size=${toString pkgs.rice.font.monospace.size};0"
# "Font Awesome 6 Free:size=14;0"
# "Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2"
# "EmojiOne Color:size=${toString pkgs.rice.font.monospace.size};0"
];
wm-restack = "bspwm";
};
@ -84,10 +84,10 @@ in
{
home.packages = with pkgs; [
pkgs.rice.font.monospace.package
emojione
noto-fonts-emoji
material-design-icons
font-awesome
# emojione
# noto-fonts-emoji
# material-design-icons
# font-awesome
];
services.polybar = {
enable = true;
@ -188,8 +188,7 @@ in
"module/cpu" = {
type = "internal/cpu";
format = colors.normal // {
text = "󰍛 <label>";
padding = 1;
text = " <label>";
};
interval = 2;
label = "%percentage-sum%%";
@ -208,16 +207,13 @@ in
alt = "%H:%M:%S";
text = "%H:%M";
};
format = colors.normal // {
padding = 1;
};
format = colors.normal;
};
"module/memory" = {
type = "internal/memory";
format = colors.normal // {
padding = 1;
text = "󰍜 <label>";
text = " <label>";
};
interval = 2;
label = "%percentage_used%%";
@ -227,14 +223,10 @@ in
"module/pulseaudio" = {
interval = 2;
bar.volume = {
empty = {
font = "2";
text = "─";
};
fill = {
text = "─";
font = "2";
};
empty = { text = "─"; };
fill = { text = "─"; };
indicator = { text = "|"; };
width = "10";
foreground = [
colors.green
colors.green
@ -245,36 +237,21 @@ in
colors.orange
colors.red
];
indicator = {
text = "|";
font = "2";
};
width = "10";
};
click.right = "${pgrep} pavucontrol && ${pkill} pavucontrol || ${pavucontrol}";
format = {
padding = 1;
muted = colors.active // {
padding = 1;
};
volume = colors.normal // {
padding = 1;
text = "<ramp-volume> <label-volume>";
};
muted = colors.active;
volume = colors.normal // { text = "<ramp-volume> <label-volume>"; };
};
label.muted = {
text = "󰖁";
};
label.volume = {
text = "%percentage%%";
};
ramp.volume = [ "󰕿" "󰖀" "󰕾" ];
label.muted = { text = "婢"; };
label.volume = { text = "%percentage%%"; };
ramp.volume = [ "奄" "奔" "墳" ];
type = "internal/pulseaudio";
};
"module/temperature" = {
format = colors.normal // {
padding = 1;
text = "<ramp> <label>";
warn = {
padding = 1;
@ -287,9 +264,7 @@ in
text = "%temperature-c%";
warn = "%temperature-c%";
};
ramp = {
text = [ "" "" "" "" "" ];
};
ramp = { text = [ "" "" "" "" "" ]; };
thermal.zone = "0";
type = "internal/temperature";
warn.temperature = "90";
@ -303,15 +278,9 @@ in
suffix = " ";
};
label = {
open = colors.normal // {
text = " ⏻ ";
};
close = colors.normal // {
text = "Cancel";
};
separator = {
text = "|";
};
open = colors.normal // { text = " ⏻ "; };
close = colors.normal // { text = "Cancel"; };
separator = { text = "|"; };
};
menu = [
[
@ -337,9 +306,7 @@ in
"module/player" = {
type = "custom/script";
format = colors.normal // {
padding = 1;
};
format = colors.normal;
exec = playerStatus;
click.left = "${playerCtl} play-pause";
scroll = {

3
odin/common_configuration.nix
View file

@ -4,7 +4,8 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = 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.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
# # Cross-build arm