diff --git a/flake.lock b/flake.lock index d3eedc5..23d0a70 100644 --- a/flake.lock +++ b/flake.lock @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1703367386, - "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", + "lastModified": 1704099619, + "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", + "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851", "type": "github" }, "original": { @@ -328,11 +328,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1703850206, - "narHash": "sha256-2oJ6XMp1sR+uZstsWDVxzs0E8HULGXBMdx8cLJsj9+8=", + "lastModified": 1704266875, + "narHash": "sha256-luA5SGmeIRZlgLfSLUuR3eacS63q2bJ0Yywqak5lj3E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1bace8cedd4fa4ea9efb5ea17a06b9d92af86206", + "rev": "8e34f33464d77bea2d5cf7dc1066647b1ad2b324", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixpkgs-u": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703843314, - "narHash": "sha256-70rblJGFghDZq0Y+aONmlkwFWDgn54XQZ7K22lC4f3c=", + "lastModified": 1704341007, + "narHash": "sha256-dBs7rWjWY8Nxtl5eBj2h8+Ra4PuWP38wzS5DyvPdVm4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30864b8447bf85c3ff2efe7af71ffdc60e653288", + "rev": "53c1e67df5a23fd62761134ca1d0a48dbaa1deff", "type": "github" }, "original": { @@ -474,11 +474,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1703426812, - "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", + "lastModified": 1703939133, + "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", + "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", "type": "github" }, "original": { diff --git a/instances/baldur/configuration.nix b/instances/baldur/configuration.nix index cd415c9..699c2cf 100644 --- a/instances/baldur/configuration.nix +++ b/instances/baldur/configuration.nix @@ -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"; diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix index 24a1e56..a34cae5 100644 --- a/instances/loki/configuration.nix +++ b/instances/loki/configuration.nix @@ -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" ]; }; # }; # }; diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix index 3b5557e..5ae6324 100644 --- a/instances/odin/common_configuration.nix +++ b/instances/odin/common_configuration.nix @@ -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"; }; }; }; diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix index 452efd5..f4ebe08 100644 --- a/instances/odin/hm.nix +++ b/instances/odin/hm.nix @@ -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 diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index 2b95991..8b13318 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.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; diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index 7b31949..0f7de1e 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -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 diff --git a/modules/hm/bspwm.nix b/modules/hm/bspwm.nix index 2113965..6da2843 100644 --- a/modules/hm/bspwm.nix +++ b/modules/hm/bspwm.nix @@ -14,6 +14,22 @@ let strPalette = pkgs.lib.nix-rice.palette.toRGBHex pkgs.rice.colorPalette; 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 = { enable = true; settings = { @@ -46,5 +62,4 @@ in network-manager-applet.enable = true; blueman-applet.enable = true; }; - home.packages = [ pkgs.blueman ]; } diff --git a/modules/hm/development/kubernetes.nix b/modules/hm/development/kubernetes.nix index 66e4910..96cd70b 100644 --- a/modules/hm/development/kubernetes.nix +++ b/modules/hm/development/kubernetes.nix @@ -3,10 +3,12 @@ shellAliases = { "k" = "kubectl"; }; packages = [ (pkgs.wrapHelm pkgs.kubernetes-helm { - plugins = with pkgs.kubernetes-helmPlugins; [ - helm-diff - helm-secrets - ]; + plugins = builtins.attrValues { + inherit (pkgs.kubernetes-helmPlugins) + helm-diff + helm-secrets + ; + }; }) pkgs.kubectl # pkgs.kustomize diff --git a/modules/hm/development/web.nix b/modules/hm/development/web.nix index 281f8d3..46dcb3d 100644 --- a/modules/hm/development/web.nix +++ b/modules/hm/development/web.nix @@ -1,4 +1,4 @@ { pkgs, ... }: { - home.packages = [ pkgs.unstable_pkgs.bruno ]; + home.packages = [ pkgs.httpie ]; } diff --git a/modules/hm/easyeffects.nix b/modules/hm/easyeffects.nix index 9bb9841..73870e0 100644 --- a/modules/hm/easyeffects.nix +++ b/modules/hm/easyeffects.nix @@ -1 +1,4 @@ -{ services.easyeffects.enable = true; } +{ pkgs, ... }: { + home.packages = [ pkgs.easyeffects ]; + services.easyeffects.enable = true; +} diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix index b603484..e3e4d3d 100644 --- a/modules/hm/hyprland.nix +++ b/modules/hm/hyprland.nix @@ -2,8 +2,9 @@ imports = [ ./kitty.nix - ./terminator.nix ./nemo.nix + ./terminator.nix + ./wl_update_background.nix ./yazi.nix ]; diff --git a/modules/hm/kakoune.nix b/modules/hm/kakoune.nix index a2dc5bc..5ed7b57 100644 --- a/modules/hm/kakoune.nix +++ b/modules/hm/kakoune.nix @@ -256,18 +256,19 @@ in "require-module connect-lf" "require-module connect-rofi" ]; - plugins = with pkgs.kakounePlugins; [ - prelude-kak - kak-lsp - auto-pairs-kak - powerline-kak - connect-kak - ]; + plugins = builtins.attrluesVa { + inherit (pkgs.kakounePlugins) + prelude-kak + kak-lsp + auto-pairs-kak + powerline-kak + connect-kak + ; + }; }; }; home.packages = packages; - # THEME FILE xdg.configFile."kak/colors/nord.kak".text = themeBuilder (pkgs.lib.nix-rice.palette.toRgbShortHex pkgs.rice.colorPalette);