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

Better thor flake

Browse source
This commit is contained in:
Filippo Berto 2022-04-19 15:54:29 +02:00
parent 4a3b1b9083
commit 7be25d3226
5 changed files with 87 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

60
flake.nix
View file

@ -52,7 +52,7 @@
(final: prev: { inherit (tex2nix.packages.${system}) tex2nix; }) (final: prev: { inherit (tex2nix.packages.${system}) tex2nix; })
(final: prev: { (final: prev: {
# cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { }; # cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { };
# update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; }; update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
lockscreen = final.callPackage ./custom/lockscreen { lockscreen = final.callPackage ./custom/lockscreen {
palette = final.rice.colorPalette; palette = final.rice.colorPalette;
font = final.rice.font.normal; font = final.rice.font.normal;
@ -75,7 +75,6 @@
nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd nixos-hardware.nixosModules.common-pc-laptop-ssd
./odin/base.nix ./odin/base.nix
./odin/pro_audio.nix
home-manager-unstable.nixosModules.home-manager home-manager-unstable.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -85,54 +84,66 @@
# home-manager.users.bertof.home.packages = [ unstable.hello ]; # home-manager.users.bertof.home.packages = [ unstable.hello ];
} }
]; ];
thorBaseModules = [
{ nixpkgs = nixpkgsSettings; }
./thor/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-pc-ssd
./thor/configuration.nix
home-manager-unstable.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
# home-manager.nixpkgs.overlays = overlays;
home-manager.users.bertof = import ./thor.nix;
# home-manager.users.bertof.home.packages = [ unstable.hello ];
}
];
in in
{ {
packages.x86_64-linux = pkgs; exports = {
inherit pkgs unstablePkgs;
};
nixosConfigurations = rec { nixosConfigurations = rec {
thor = pkgs.lib.nixosSystem { thor = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ];
};
modules = [ thor-big-data = unstable.lib.nixosSystem {
{ nixpkgs = nixpkgsSettings; } inherit system;
./thor/hardware-configuration.nix modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ];
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-pc-ssd
./thor/configuration.nix
];
}; };
odin = odin-nvidia-big-data-unstable; odin = odin-nvidia-big-data-unstable;
odin-intel = pkgs.lib.nixosSystem { odin-intel = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
};
modules = [ odin-nvidia = nixpkgs.lib.nixosSystem {
{ nixpkgs = nixpkgsSettings; } inherit system;
./odin/hardware-configuration.nix modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd
./odin/base.nix
./odin/odin-intel.nix
./odin/pro_audio.nix
];
}; };
odin-intel-unstable = unstable.lib.nixosSystem { odin-intel-unstable = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ ./odin/odin-intel.nix ]; modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ];
}; };
odin-nvidia-unstable = unstable.lib.nixosSystem { odin-nvidia-unstable = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ]; modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ];
}; };
odin-intel-big-data-unstable = unstable.lib.nixosSystem { odin-intel-big-data-unstable = unstable.lib.nixosSystem {
inherit system; inherit system;
modules = odinBaseModules ++ [ modules = odinBaseModules ++ [
./odin/odin-intel.nix ./odin/odin-intel.nix
./nixos_modules/pro_audio.nix
./nixos_modules/big_data.nix ./nixos_modules/big_data.nix
]; ];
}; };
@ -141,6 +152,7 @@
inherit system; inherit system;
modules = odinBaseModules ++ [ modules = odinBaseModules ++ [
./odin/odin-nvidia.nix ./odin/odin-nvidia.nix
./nixos_modules/pro_audio.nix
./nixos_modules/big_data.nix ./nixos_modules/big_data.nix
]; ];
}; };

0
odin/pro_audio.nix → nixos_modules/pro_audio.nix
View file

2
odin.nix
View file

@ -128,7 +128,7 @@
./modules/jq.nix ./modules/jq.nix
./modules/kakoune.nix ./modules/kakoune.nix
# ./modules/keepassxc.nix # ./modules/keepassxc.nix
# ./modules/keychain.nix ./modules/keychain.nix
./modules/kitty.nix ./modules/kitty.nix
./modules/latex.nix ./modules/latex.nix
./modules/lf.nix ./modules/lf.nix

95
thor.nix
View file

@ -1,32 +1,5 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
nixpkgs.overlays = [
(final: prev: {
devEnvironment = (import ./environment.nix) {
enableCpp = true;
enableData = true;
enableGo = true;
enableHtml = true;
enableJavascript = true;
enableJava = true;
enableLatex = true;
enableNix = true;
enableOffice = true;
enablePython = true;
enableRust = true;
enableShell = true;
enableSpelling = true;
};
cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { };
update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
lockscreen = final.callPackage ./custom/lockscreen {
palette = final.rice.colorPalette;
font = final.rice.font.normal;
};
})
];
home = { home = {
language.base = "it_IT.UTF-8"; language.base = "it_IT.UTF-8";
keyboard = { keyboard = {
@ -34,13 +7,9 @@
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
}; };
packages = with pkgs; [ packages = with pkgs; [
pulseaudio # pulseaudio
easyeffects easyeffects
kubectl
docker-compose
docker-machine
arandr arandr
ark ark
authy authy
@ -50,22 +19,41 @@
catgirl # IRC catgirl # IRC
cava cava
discord discord
docker-compose
docker-machine
droidcam
# electrum # electrum
element-desktop # element-desktop
# element-desktop # matrix client
evolution evolution
file file
filelight
# firefox # firefox
freecad freecad
gallery-dl gallery-dl
gnome.gnome-calendar # gnome.dconf-editor
gnome.geary # gnome.eog
gnomeExtensions.appindicator # gnome.evince
gnomeExtensions.caffeine # gnomeExtensions.appindicator
gnomeExtensions.dash-to-dock # gnomeExtensions.caffeine
# gnomeExtensions.dash-to-dock
# # gnomeExtensions.dynamic-panel-transparency
# gnomeExtensions.dynamic-panel-transparency # gnomeExtensions.dynamic-panel-transparency
gnomeExtensions.just-perfection # gnomeExtensions.gtile
gnomeExtensions.gtile # gnomeExtensions.just-perfection
gnomeExtensions.vitals # gnomeExtensions.vitals
# gnome.file-roller
gnome.geary
gnome.gnome-calendar
# gnome.gnome-screenshot
gnome.gnome-sound-recorder
gnome.gnome-sudoku
# gnome.gnome-system-monitor
# gnome.gnome-tweaks
# gnome.nautilus
# gnome.quadrapassel
# gnome.seahorse
# gnome.sushi
google-chrome google-chrome
gucharmap gucharmap
handbrake handbrake
@ -74,23 +62,34 @@
# hyperspace-cli # hyperspace-cli
inkscape inkscape
jetbrains.datagrip jetbrains.datagrip
kcolorchooser
kdiff3 kdiff3
# keepassxc
kgpg
# kid3 # tag mp3
kmail kmail
kompare
kontact kontact
korganizer korganizer
krita krita
ksystemlog
kubectl
lutris lutris
meld
minecraft minecraft
mmv-go mmv-go
mpv mpv
mycrypto mycrypto
neofetch neofetch
nixos-option
nix-prefetch-scripts nix-prefetch-scripts
nix-tree nix-tree
obsidian obsidian
okular okular
openvpn openvpn
p7zip
pavucontrol pavucontrol
pcmanfm
pentablet-driver pentablet-driver
procps procps
ripgrep ripgrep
@ -99,14 +98,18 @@
spotify spotify
tdesktop tdesktop
teams teams
tracker
transmission-gtk transmission-gtk
unrar unrar
unzip
virt-manager virt-manager
wget wget
# wineFull # wineFull
wireguard-tools wireguard-tools
xclip xclip
xournalpp xournalpp
yq
zip
zoom-us zoom-us
zotero zotero
@ -136,11 +139,11 @@
./modules/dircolors.nix ./modules/dircolors.nix
./modules/direnv.nix ./modules/direnv.nix
# ./modules/dunst.nix # ./modules/dunst.nix
# ./modules/fzf.nix ./modules/fzf.nix
./modules/git.nix ./modules/git.nix
./modules/go.nix ./modules/go.nix
./modules/gpg.nix ./modules/gpg.nix
./modules/grobi.nix # ./modules/grobi.nix
./modules/info.nix ./modules/info.nix
./modules/java.nix ./modules/java.nix
./modules/joystickwake.nix ./modules/joystickwake.nix
@ -162,7 +165,7 @@
./modules/onedrive.nix ./modules/onedrive.nix
# ./modules/picom.nix # ./modules/picom.nix
# ./modules/polybar.nix # ./modules/polybar.nix
# ./modules/pycharm.nix ./modules/pycharm.nix
./modules/gtk_theme.nix ./modules/gtk_theme.nix
./modules/rofi.nix ./modules/rofi.nix
./modules/rofimoji.nix ./modules/rofimoji.nix
@ -173,7 +176,7 @@
./modules/syncthing.nix ./modules/syncthing.nix
./modules/terminator.nix ./modules/terminator.nix
./modules/tmux.nix ./modules/tmux.nix
./modules/update_background.nix # ./modules/update_background.nix
./modules/webapp.nix ./modules/webapp.nix
# ./modules/xidlehook.nix # ./modules/xidlehook.nix
./modules/zoxide.nix ./modules/zoxide.nix
@ -190,7 +193,7 @@
# blueman-applet.enable = true; # blueman-applet.enable = true;
# caffeine.enable = true; # caffeine.enable = true;
# cbatticon.enable = true; # cbatticon.enable = true;
gnome-keyring.enable = true; # gnome-keyring.enable = true;
# network-manager-applet.enable = true; # network-manager-applet.enable = true;
# playerctld.enable = true; # playerctld.enable = true;
# poweralertd.enable = true; # poweralertd.enable = true;

2
thor/configuration.nix
View file

@ -111,7 +111,7 @@
enable = true; enable = true;
support32Bit = true; support32Bit = true;
}; };
media-session.enable = true; # media-session.enable = true;
}; };
power-profiles-daemon.enable = true; power-profiles-daemon.enable = true;
smartd = { enable = true; notifications.x11.enable = true; }; smartd = { enable = true; notifications.x11.enable = true; };