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

General cleanup and flake update

Browse source
This commit is contained in:
Filippo Berto 2024-01-04 19:55:13 +01:00
parent b26292662f
commit a5bc8abaec
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
13 changed files with 126 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -238,11 +238,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703367386, "lastModified": 1704099619,
"narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -328,11 +328,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1703850206, "lastModified": 1704266875,
"narHash": "sha256-2oJ6XMp1sR+uZstsWDVxzs0E8HULGXBMdx8cLJsj9+8=", "narHash": "sha256-luA5SGmeIRZlgLfSLUuR3eacS63q2bJ0Yywqak5lj3E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "1bace8cedd4fa4ea9efb5ea17a06b9d92af86206", "rev": "8e34f33464d77bea2d5cf7dc1066647b1ad2b324",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -406,11 +406,11 @@
}, },
"nixpkgs-u": { "nixpkgs-u": {
"locked": { "locked": {
"lastModified": 1703438236, "lastModified": 1704194953,
"narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -422,11 +422,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1703843314, "lastModified": 1704341007,
"narHash": "sha256-70rblJGFghDZq0Y+aONmlkwFWDgn54XQZ7K22lC4f3c=", "narHash": "sha256-dBs7rWjWY8Nxtl5eBj2h8+Ra4PuWP38wzS5DyvPdVm4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30864b8447bf85c3ff2efe7af71ffdc60e653288", "rev": "53c1e67df5a23fd62761134ca1d0a48dbaa1deff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -474,11 +474,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1703426812, "lastModified": 1703939133,
"narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
instances/baldur/configuration.nix
View file

@ -24,7 +24,7 @@
environment = { environment = {
pathsToLink = [ "/share/zsh" ]; pathsToLink = [ "/share/zsh" ];
systemPackages = with pkgs; [ helix zellij kitty.terminfo ]; systemPackages = [ pkgs.helix pkgs.zellij pkgs.kitty.terminfo ];
}; };
i18n.defaultLocale = "it_IT.UTF-8"; i18n.defaultLocale = "it_IT.UTF-8";

16
instances/loki/configuration.nix
View file

@ -1,5 +1,5 @@
{ pkgs, lib, ... }: { pkgs, ... }:
with lib; { {
boot = { boot = {
binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
@ -113,19 +113,19 @@ with lib; {
# }; # };
# in # in
# { # {
# bertof = recursiveUpdate common { # bertof = lib.recursiveUpdate common {
# path = "/home/bertof/"; # path = "/home/bertof/";
# comment = "Bertof samba share"; # comment = "Bertof samba share";
# "force user" = "bertof"; # "force user" = "bertof";
# "valid users" = "bertof"; # "valid users" = "bertof";
# }; # };
# tiziano = recursiveUpdate common { # tiziano = lib.recursiveUpdate common {
# path = "/home/tiziano/"; # path = "/home/tiziano/";
# comment = "Tiziano samba share"; # comment = "Tiziano samba share";
# "force user" = "tiziano"; # "force user" = "tiziano";
# "valid users" = "tiziano"; # "valid users" = "tiziano";
# }; # };
# condiviso = recursiveUpdate common { # condiviso = lib.recursiveUpdate common {
# path = "/mnt/condiviso"; # path = "/mnt/condiviso";
# comment = "Samba share condiviso"; # comment = "Samba share condiviso";
# "valid users" = "bertof tiziano"; # "valid users" = "bertof tiziano";
@ -212,9 +212,9 @@ with lib; {
# }; # };
# in # in
# { # {
# bertof = recursiveUpdate common { SUBVOLUME = "/home/bertof/"; ALLOW_USERS = [ "bertof" ]; }; # bertof = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/"; ALLOW_USERS = [ "bertof" ]; };
# tiziano = recursiveUpdate common { SUBVOLUME = "/home/tiziano/"; ALLOW_USERS = [ "tiziano" ]; }; # tiziano = lib.recursiveUpdate common { SUBVOLUME = "/home/tiziano/"; ALLOW_USERS = [ "tiziano" ]; };
# condiviso = recursiveUpdate common { SUBVOLUME = "/mnt/condiviso"; ALLOW_USERS = [ "bertof" "tiziano" ]; }; # condiviso = lib.recursiveUpdate common { SUBVOLUME = "/mnt/condiviso"; ALLOW_USERS = [ "bertof" "tiziano" ]; };
# }; # };
# }; # };

26
instances/odin/common_configuration.nix
View file

@ -1,12 +1,10 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
with lib; { {
age.secrets = { age.secrets = {
odin_wg_priv = { file = ../../secrets/odin_wg_priv.age; }; odin_wg_priv = { file = ../../secrets/odin_wg_priv.age; };
}; };
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot = { boot = {
# kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;
@ -178,7 +176,7 @@ with lib; {
steam = { steam = {
enable = true; enable = true;
package = pkgs.steam.override { package = pkgs.steam.override {
extraPkgs = pkgs: with pkgs; [ icu ]; extraPkgs = pkgs: [ pkgs.icu ];
extraProfile = '' extraProfile = ''
export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas/" export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas/"
''; '';
@ -210,16 +208,16 @@ with lib; {
}; };
in in
{ {
bertof_home = recursiveUpdate common { SUBVOLUME = "/home/bertof"; }; bertof_home = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
bertof_music = recursiveUpdate common { SUBVOLUME = "/home/bertof/Musica"; }; bertof_music = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Musica"; };
bertof_downloads = recursiveUpdate common { SUBVOLUME = "/home/bertof/Scaricati"; }; bertof_downloads = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Scaricati"; };
bertof_images = recursiveUpdate common { SUBVOLUME = "/home/bertof/Immagini"; }; bertof_images = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Immagini"; };
bertof_videos = recursiveUpdate common { SUBVOLUME = "/home/bertof/Video"; }; bertof_videos = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Video"; };
bertof_documents = recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti"; }; bertof_documents = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti"; };
bertof_games_ssd = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SSD"; }; bertof_games_ssd = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SSD"; };
bertof_games_sata = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SATA"; }; bertof_games_sata = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SATA"; };
# bertof_games_hdd = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/HDD"; }; # bertof_games_hdd = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/HDD"; };
bertof_git = recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti/Git"; }; bertof_git = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti/Git"; };
}; };
}; };

53
instances/odin/hm.nix
View file

@ -8,59 +8,60 @@
}; };
packages = builtins.attrValues { packages = builtins.attrValues {
inherit (pkgs) inherit (pkgs)
# element-desktop # matrix client
# freecad
# minecraft
# mycrypto
# pcmanfm
# pulseaudio
# shotwell
# signal-desktop
# slack
# wineFull
arandr
authenticator authenticator
authy
cava cava
discord
dmenu
droidcam droidcam
easyeffects # element-desktop # matrix client
evince evince
# evolution # evolution
# freecad
gallery-dl gallery-dl
geeqie
google-chrome google-chrome
gucharmap gucharmap
handbrake
httpie
inkscape inkscape
keyboard-switch keyboard-switch
krita krita
# minecraft
# mycrypto
openvpn openvpn
p7zip p7zip
pavucontrol pavucontrol
pentablet-driver # pcmanfm
procps procps
# pulseaudio
pulseaudio pulseaudio
retroarchFull # retroarchFull
# shotwell
# signal-desktop
skypeforlinux
# slack
spotify spotify
tdesktop tdesktop
thunderbird thunderbird
transmission-gtk transmission-gtk
virt-manager virt-manager
virt-viewer virt-viewer
# wineFull
wireguard-tools wireguard-tools
xournalpp xournalpp
zoom-us; zoom-us
;
inherit (pkgs.gnome) inherit (pkgs.gnome)
# geary # geary
# gnome-boxes # gnome-boxes
# gnome-calendar # gnome-calendar
# gnome-sound-recorder # gnome-sound-recorder
# seahorse # seahorse
eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem; eog
inherit (pkgs.unstable_pkgs) heroic skypeforlinux; file-roller
gnome-font-viewer
gnome-screenshot
gnome-system-monitor
totem
;
inherit (pkgs.unstable_pkgs)
heroic
;
}; };
}; };
@ -126,12 +127,10 @@
../../modules/hm/ncspot.nix ../../modules/hm/ncspot.nix
../../modules/hm/nix-index.nix ../../modules/hm/nix-index.nix
../../modules/hm/noti.nix ../../modules/hm/noti.nix
../../modules/hm/nushell.nix # ../../modules/hm/nushell.nix
../../modules/hm/obs-studio.nix ../../modules/hm/obs-studio.nix
../../modules/hm/office.nix ../../modules/hm/office.nix
../../modules/hm/pass.nix ../../modules/hm/pass.nix
../../modules/hm/picom.nix
../../modules/hm/polybar.nix
# ../../modules/hm/pro_audio.nix # ../../modules/hm/pro_audio.nix
# ../../modules/hm/pycharm.nix # ../../modules/hm/pycharm.nix
../../modules/hm/research.nix ../../modules/hm/research.nix
@ -139,7 +138,6 @@
# ../../modules/hm/screen_locker.nix # ../../modules/hm/screen_locker.nix
# ../../modules/hm/security.nix # ../../modules/hm/security.nix
../../modules/hm/spotifyd.nix ../../modules/hm/spotifyd.nix
../../modules/hm/sxhkd.nix
../../modules/hm/syncthing.nix ../../modules/hm/syncthing.nix
../../modules/hm/terminator.nix ../../modules/hm/terminator.nix
# ../../modules/hm/thunar.nix # ../../modules/hm/thunar.nix
@ -147,7 +145,6 @@
../../modules/hm/update_background.nix ../../modules/hm/update_background.nix
../../modules/hm/vim.nix ../../modules/hm/vim.nix
../../modules/hm/webapp.nix ../../modules/hm/webapp.nix
../../modules/hm/wl_update_background.nix
../../modules/hm/xidlehook.nix ../../modules/hm/xidlehook.nix
../../modules/hm/xresources.nix ../../modules/hm/xresources.nix
../../modules/hm/zathura.nix ../../modules/hm/zathura.nix

4
instances/thor/configuration.nix
View file

@ -1,5 +1,5 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
with lib; { {
age.secrets = { age.secrets = {
thor_wg_priv = { file = ../../secrets/thor_wg_priv.age; }; thor_wg_priv = { file = ../../secrets/thor_wg_priv.age; };
@ -183,7 +183,7 @@ with lib; {
}; };
in in
{ {
bertof_home = recursiveUpdate common { SUBVOLUME = "/home/bertof"; }; bertof_home = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
}; };
}; };
thermald.enable = true; thermald.enable = true;

53
instances/thor/hm.nix
View file

@ -8,62 +8,59 @@
}; };
packages = builtins.attrValues { packages = builtins.attrValues {
inherit (pkgs) inherit (pkgs)
authenticator
droidcam
# electrum # electrum
# element-desktop # matrix client # element-desktop # matrix client
evince
# evolution # evolution
# freecad # freecad
# minecraft
# mycrypto
# pcmanfm
# pulseaudio
# shotwell
# signal-desktop
# slack
# wineFull
arandr
authenticator
authy
discord
dmenu
docker-compose
docker-machine
droidcam
easyeffects
evince
filelight
gallery-dl gallery-dl
geeqie
google-chrome google-chrome
gucharmap gucharmap
handbrake
httpie
inkscape inkscape
krita krita
# minecraft
# mycrypto
openvpn openvpn
p7zip p7zip
pavucontrol pavucontrol
pcsx2 # pcmanfm
pentablet-driver
procps procps
# pulseaudio
pulseaudio pulseaudio
# retroarchFull # retroarchFull
# shotwell
# signal-desktop
skypeforlinux
# slack
spotify spotify
tdesktop tdesktop
thunderbird thunderbird
transmission-gtk transmission-gtk
virt-manager virt-manager
virt-viewer virt-viewer
# wineFull
wireguard-tools wireguard-tools
xournalpp xournalpp
zoom-us; zoom-us
;
inherit (pkgs.gnome) inherit (pkgs.gnome)
eog
file-roller
# geary # geary
# gnome-boxes # gnome-boxes
# gnome-calendar # gnome-calendar
gnome-font-viewer
gnome-screenshot
# gnome-sound-recorder # gnome-sound-recorder
gnome-system-monitor
# seahorse # seahorse
eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem; totem
inherit (pkgs.unstable_pkgs) heroic skypeforlinux; ;
inherit (pkgs.unstable_pkgs)
heroic
;
}; };
}; };
@ -117,7 +114,7 @@
../../modules/hm/ncspot.nix ../../modules/hm/ncspot.nix
../../modules/hm/nix-index.nix ../../modules/hm/nix-index.nix
../../modules/hm/noti.nix ../../modules/hm/noti.nix
../../modules/hm/nushell.nix # ../../modules/hm/nushell.nix
../../modules/hm/obs-studio.nix ../../modules/hm/obs-studio.nix
../../modules/hm/office.nix ../../modules/hm/office.nix
../../modules/hm/pass.nix ../../modules/hm/pass.nix

17
modules/hm/bspwm.nix
View file

@ -14,6 +14,22 @@ let
strPalette = pkgs.lib.nix-rice.palette.toRGBHex pkgs.rice.colorPalette; strPalette = pkgs.lib.nix-rice.palette.toRGBHex pkgs.rice.colorPalette;
in in
{ {
imports = [
./picom.nix
./polybar.nix
./sxhkd.nix
./update_background.nix
];
home.packages = builtins.attrValues {
inherit (pkgs)
arandr
blueman
dmenu
keyboard-switch
;
};
xsession.windowManager.bspwm = { xsession.windowManager.bspwm = {
enable = true; enable = true;
settings = { settings = {
@ -46,5 +62,4 @@ in
network-manager-applet.enable = true; network-manager-applet.enable = true;
blueman-applet.enable = true; blueman-applet.enable = true;
}; };
home.packages = [ pkgs.blueman ];
} }

10
modules/hm/development/kubernetes.nix
View file

@ -3,10 +3,12 @@
shellAliases = { "k" = "kubectl"; }; shellAliases = { "k" = "kubectl"; };
packages = [ packages = [
(pkgs.wrapHelm pkgs.kubernetes-helm { (pkgs.wrapHelm pkgs.kubernetes-helm {
plugins = with pkgs.kubernetes-helmPlugins; [ plugins = builtins.attrValues {
helm-diff inherit (pkgs.kubernetes-helmPlugins)
helm-secrets helm-diff
]; helm-secrets
;
};
}) })
pkgs.kubectl pkgs.kubectl
# pkgs.kustomize # pkgs.kustomize

2
modules/hm/development/web.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { pkgs, ... }: {
home.packages = [ pkgs.unstable_pkgs.bruno ]; home.packages = [ pkgs.httpie ];
} }

5
modules/hm/easyeffects.nix
View file

@ -1 +1,4 @@
{ services.easyeffects.enable = true; } { pkgs, ... }: {
home.packages = [ pkgs.easyeffects ];
services.easyeffects.enable = true;
}

3
modules/hm/hyprland.nix
View file

@ -2,8 +2,9 @@
imports = [ imports = [
./kitty.nix ./kitty.nix
./terminator.nix
./nemo.nix ./nemo.nix
./terminator.nix
./wl_update_background.nix
./yazi.nix ./yazi.nix
]; ];

17
modules/hm/kakoune.nix
View file

@ -256,18 +256,19 @@ in
"require-module connect-lf" "require-module connect-lf"
"require-module connect-rofi" "require-module connect-rofi"
]; ];
plugins = with pkgs.kakounePlugins; [ plugins = builtins.attrluesVa {
prelude-kak inherit (pkgs.kakounePlugins)
kak-lsp prelude-kak
auto-pairs-kak kak-lsp
powerline-kak auto-pairs-kak
connect-kak powerline-kak
]; connect-kak
;
};
}; };
}; };
home.packages = packages; home.packages = packages;
# THEME FILE # THEME FILE
xdg.configFile."kak/colors/nord.kak".text = themeBuilder xdg.configFile."kak/colors/nord.kak".text = themeBuilder
(pkgs.lib.nix-rice.palette.toRgbShortHex pkgs.rice.colorPalette); (pkgs.lib.nix-rice.palette.toRgbShortHex pkgs.rice.colorPalette);