General cleanup and flake update
This commit is contained in:
parent
b26292662f
commit
a5bc8abaec
13 changed files with 126 additions and 112 deletions
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
environment = {
|
||||
pathsToLink = [ "/share/zsh" ];
|
||||
systemPackages = with pkgs; [ helix zellij kitty.terminfo ];
|
||||
systemPackages = [ pkgs.helix pkgs.zellij pkgs.kitty.terminfo ];
|
||||
};
|
||||
|
||||
i18n.defaultLocale = "it_IT.UTF-8";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ pkgs, lib, ... }:
|
||||
with lib; {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
|
||||
boot = {
|
||||
binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
|
||||
|
|
@ -113,19 +113,19 @@ with lib; {
|
|||
# };
|
||||
# in
|
||||
# {
|
||||
# bertof = recursiveUpdate common {
|
||||
# bertof = lib.recursiveUpdate common {
|
||||
# path = "/home/bertof/";
|
||||
# comment = "Bertof samba share";
|
||||
# "force user" = "bertof";
|
||||
# "valid users" = "bertof";
|
||||
# };
|
||||
# tiziano = recursiveUpdate common {
|
||||
# tiziano = lib.recursiveUpdate common {
|
||||
# path = "/home/tiziano/";
|
||||
# comment = "Tiziano samba share";
|
||||
# "force user" = "tiziano";
|
||||
# "valid users" = "tiziano";
|
||||
# };
|
||||
# condiviso = recursiveUpdate common {
|
||||
# condiviso = lib.recursiveUpdate common {
|
||||
# path = "/mnt/condiviso";
|
||||
# comment = "Samba share condiviso";
|
||||
# "valid users" = "bertof tiziano";
|
||||
|
|
@ -212,9 +212,9 @@ with lib; {
|
|||
# };
|
||||
# in
|
||||
# {
|
||||
# bertof = recursiveUpdate common { SUBVOLUME = "/home/bertof/"; ALLOW_USERS = [ "bertof" ]; };
|
||||
# tiziano = recursiveUpdate common { SUBVOLUME = "/home/tiziano/"; ALLOW_USERS = [ "tiziano" ]; };
|
||||
# condiviso = recursiveUpdate common { SUBVOLUME = "/mnt/condiviso"; ALLOW_USERS = [ "bertof" "tiziano" ]; };
|
||||
# bertof = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/"; ALLOW_USERS = [ "bertof" ]; };
|
||||
# tiziano = lib.recursiveUpdate common { SUBVOLUME = "/home/tiziano/"; ALLOW_USERS = [ "tiziano" ]; };
|
||||
# condiviso = lib.recursiveUpdate common { SUBVOLUME = "/mnt/condiviso"; ALLOW_USERS = [ "bertof" "tiziano" ]; };
|
||||
# };
|
||||
# };
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
with lib; {
|
||||
{
|
||||
|
||||
age.secrets = {
|
||||
odin_wg_priv = { file = ../../secrets/odin_wg_priv.age; };
|
||||
};
|
||||
|
||||
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot = {
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
|
@ -178,7 +176,7 @@ with lib; {
|
|||
steam = {
|
||||
enable = true;
|
||||
package = pkgs.steam.override {
|
||||
extraPkgs = pkgs: with pkgs; [ icu ];
|
||||
extraPkgs = pkgs: [ pkgs.icu ];
|
||||
extraProfile = ''
|
||||
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
|
||||
{
|
||||
bertof_home = recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
|
||||
bertof_music = recursiveUpdate common { SUBVOLUME = "/home/bertof/Musica"; };
|
||||
bertof_downloads = recursiveUpdate common { SUBVOLUME = "/home/bertof/Scaricati"; };
|
||||
bertof_images = recursiveUpdate common { SUBVOLUME = "/home/bertof/Immagini"; };
|
||||
bertof_videos = recursiveUpdate common { SUBVOLUME = "/home/bertof/Video"; };
|
||||
bertof_documents = recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti"; };
|
||||
bertof_games_ssd = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SSD"; };
|
||||
bertof_games_sata = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SATA"; };
|
||||
# bertof_games_hdd = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/HDD"; };
|
||||
bertof_git = recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti/Git"; };
|
||||
bertof_home = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
|
||||
bertof_music = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Musica"; };
|
||||
bertof_downloads = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Scaricati"; };
|
||||
bertof_images = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Immagini"; };
|
||||
bertof_videos = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Video"; };
|
||||
bertof_documents = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti"; };
|
||||
bertof_games_ssd = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SSD"; };
|
||||
bertof_games_sata = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SATA"; };
|
||||
# bertof_games_hdd = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/HDD"; };
|
||||
bertof_git = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti/Git"; };
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,59 +8,60 @@
|
|||
};
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
# element-desktop # matrix client
|
||||
# freecad
|
||||
# minecraft
|
||||
# mycrypto
|
||||
# pcmanfm
|
||||
# pulseaudio
|
||||
# shotwell
|
||||
# signal-desktop
|
||||
# slack
|
||||
# wineFull
|
||||
arandr
|
||||
authenticator
|
||||
authy
|
||||
cava
|
||||
discord
|
||||
dmenu
|
||||
droidcam
|
||||
easyeffects
|
||||
# element-desktop # matrix client
|
||||
evince
|
||||
# evolution
|
||||
# freecad
|
||||
gallery-dl
|
||||
geeqie
|
||||
google-chrome
|
||||
gucharmap
|
||||
handbrake
|
||||
httpie
|
||||
inkscape
|
||||
keyboard-switch
|
||||
krita
|
||||
# minecraft
|
||||
# mycrypto
|
||||
openvpn
|
||||
p7zip
|
||||
pavucontrol
|
||||
pentablet-driver
|
||||
# pcmanfm
|
||||
procps
|
||||
# pulseaudio
|
||||
pulseaudio
|
||||
retroarchFull
|
||||
# retroarchFull
|
||||
# shotwell
|
||||
# signal-desktop
|
||||
skypeforlinux
|
||||
# slack
|
||||
spotify
|
||||
tdesktop
|
||||
thunderbird
|
||||
transmission-gtk
|
||||
virt-manager
|
||||
virt-viewer
|
||||
# wineFull
|
||||
wireguard-tools
|
||||
xournalpp
|
||||
zoom-us;
|
||||
zoom-us
|
||||
;
|
||||
inherit (pkgs.gnome)
|
||||
# geary
|
||||
# gnome-boxes
|
||||
# gnome-calendar
|
||||
# gnome-sound-recorder
|
||||
# seahorse
|
||||
eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem;
|
||||
inherit (pkgs.unstable_pkgs) heroic skypeforlinux;
|
||||
eog
|
||||
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/nix-index.nix
|
||||
../../modules/hm/noti.nix
|
||||
../../modules/hm/nushell.nix
|
||||
# ../../modules/hm/nushell.nix
|
||||
../../modules/hm/obs-studio.nix
|
||||
../../modules/hm/office.nix
|
||||
../../modules/hm/pass.nix
|
||||
../../modules/hm/picom.nix
|
||||
../../modules/hm/polybar.nix
|
||||
# ../../modules/hm/pro_audio.nix
|
||||
# ../../modules/hm/pycharm.nix
|
||||
../../modules/hm/research.nix
|
||||
|
|
@ -139,7 +138,6 @@
|
|||
# ../../modules/hm/screen_locker.nix
|
||||
# ../../modules/hm/security.nix
|
||||
../../modules/hm/spotifyd.nix
|
||||
../../modules/hm/sxhkd.nix
|
||||
../../modules/hm/syncthing.nix
|
||||
../../modules/hm/terminator.nix
|
||||
# ../../modules/hm/thunar.nix
|
||||
|
|
@ -147,7 +145,6 @@
|
|||
../../modules/hm/update_background.nix
|
||||
../../modules/hm/vim.nix
|
||||
../../modules/hm/webapp.nix
|
||||
../../modules/hm/wl_update_background.nix
|
||||
../../modules/hm/xidlehook.nix
|
||||
../../modules/hm/xresources.nix
|
||||
../../modules/hm/zathura.nix
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
with lib; {
|
||||
{
|
||||
|
||||
age.secrets = {
|
||||
thor_wg_priv = { file = ../../secrets/thor_wg_priv.age; };
|
||||
|
|
@ -183,7 +183,7 @@ with lib; {
|
|||
};
|
||||
in
|
||||
{
|
||||
bertof_home = recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
|
||||
bertof_home = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
|
||||
};
|
||||
};
|
||||
thermald.enable = true;
|
||||
|
|
|
|||
|
|
@ -8,62 +8,59 @@
|
|||
};
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
authenticator
|
||||
droidcam
|
||||
# electrum
|
||||
# element-desktop # matrix client
|
||||
evince
|
||||
# evolution
|
||||
# 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
|
||||
geeqie
|
||||
google-chrome
|
||||
gucharmap
|
||||
handbrake
|
||||
httpie
|
||||
inkscape
|
||||
krita
|
||||
# minecraft
|
||||
# mycrypto
|
||||
openvpn
|
||||
p7zip
|
||||
pavucontrol
|
||||
pcsx2
|
||||
pentablet-driver
|
||||
# pcmanfm
|
||||
procps
|
||||
# pulseaudio
|
||||
pulseaudio
|
||||
# retroarchFull
|
||||
# shotwell
|
||||
# signal-desktop
|
||||
skypeforlinux
|
||||
# slack
|
||||
spotify
|
||||
tdesktop
|
||||
thunderbird
|
||||
transmission-gtk
|
||||
virt-manager
|
||||
virt-viewer
|
||||
# wineFull
|
||||
wireguard-tools
|
||||
xournalpp
|
||||
zoom-us;
|
||||
zoom-us
|
||||
;
|
||||
inherit (pkgs.gnome)
|
||||
eog
|
||||
file-roller
|
||||
# geary
|
||||
# gnome-boxes
|
||||
# gnome-calendar
|
||||
gnome-font-viewer
|
||||
gnome-screenshot
|
||||
# gnome-sound-recorder
|
||||
gnome-system-monitor
|
||||
# seahorse
|
||||
eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem;
|
||||
inherit (pkgs.unstable_pkgs) heroic skypeforlinux;
|
||||
totem
|
||||
;
|
||||
inherit (pkgs.unstable_pkgs)
|
||||
heroic
|
||||
;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -117,7 +114,7 @@
|
|||
../../modules/hm/ncspot.nix
|
||||
../../modules/hm/nix-index.nix
|
||||
../../modules/hm/noti.nix
|
||||
../../modules/hm/nushell.nix
|
||||
# ../../modules/hm/nushell.nix
|
||||
../../modules/hm/obs-studio.nix
|
||||
../../modules/hm/office.nix
|
||||
../../modules/hm/pass.nix
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue