From 7be25d3226d32e2da8a46a744295d74059e41fc9 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 19 Apr 2022 15:54:29 +0200 Subject: [PATCH] Better thor flake --- flake.nix | 60 ++++++++++------- {odin => nixos_modules}/pro_audio.nix | 0 odin.nix | 2 +- thor.nix | 95 ++++++++++++++------------- thor/configuration.nix | 2 +- 5 files changed, 87 insertions(+), 72 deletions(-) rename {odin => nixos_modules}/pro_audio.nix (100%) diff --git a/flake.nix b/flake.nix index ac74fc4..e7c85ac 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ (final: prev: { inherit (tex2nix.packages.${system}) tex2nix; }) (final: prev: { # 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 { palette = final.rice.colorPalette; font = final.rice.font.normal; @@ -75,7 +75,6 @@ nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop-ssd ./odin/base.nix - ./odin/pro_audio.nix home-manager-unstable.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -85,54 +84,66 @@ # 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 { - packages.x86_64-linux = pkgs; + exports = { + inherit pkgs unstablePkgs; + }; nixosConfigurations = rec { - thor = pkgs.lib.nixosSystem { + thor = unstable.lib.nixosSystem { inherit system; + modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ]; + }; - modules = [ - { nixpkgs = nixpkgsSettings; } - ./thor/hardware-configuration.nix - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-pc-ssd - ./thor/configuration.nix - ]; + thor-big-data = unstable.lib.nixosSystem { + inherit system; + modules = thorBaseModules ++ [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ]; }; odin = odin-nvidia-big-data-unstable; - odin-intel = pkgs.lib.nixosSystem { + odin-intel = nixpkgs.lib.nixosSystem { inherit system; + modules = odinBaseModules ++ [ ./odin/odin-intel.nix ./nixos_modules/pro_audio.nix ]; + }; - modules = [ - { nixpkgs = nixpkgsSettings; } - ./odin/hardware-configuration.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-nvidia = nixpkgs.lib.nixosSystem { + inherit system; + modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix ./nixos_modules/pro_audio.nix ]; }; odin-intel-unstable = unstable.lib.nixosSystem { 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 { 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 { inherit system; modules = odinBaseModules ++ [ ./odin/odin-intel.nix + ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ]; }; @@ -141,6 +152,7 @@ inherit system; modules = odinBaseModules ++ [ ./odin/odin-nvidia.nix + ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ]; }; diff --git a/odin/pro_audio.nix b/nixos_modules/pro_audio.nix similarity index 100% rename from odin/pro_audio.nix rename to nixos_modules/pro_audio.nix diff --git a/odin.nix b/odin.nix index 4f10195..56b6e91 100644 --- a/odin.nix +++ b/odin.nix @@ -128,7 +128,7 @@ ./modules/jq.nix ./modules/kakoune.nix # ./modules/keepassxc.nix - # ./modules/keychain.nix + ./modules/keychain.nix ./modules/kitty.nix ./modules/latex.nix ./modules/lf.nix diff --git a/thor.nix b/thor.nix index 095be58..7c25526 100644 --- a/thor.nix +++ b/thor.nix @@ -1,32 +1,5 @@ { 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 = { language.base = "it_IT.UTF-8"; keyboard = { @@ -34,13 +7,9 @@ options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; }; packages = with pkgs; [ - pulseaudio + # pulseaudio easyeffects - kubectl - docker-compose - docker-machine - arandr ark authy @@ -50,22 +19,41 @@ catgirl # IRC cava discord + docker-compose + docker-machine + droidcam # electrum - element-desktop + # element-desktop + # element-desktop # matrix client evolution file + filelight # firefox freecad gallery-dl - gnome.gnome-calendar - gnome.geary - gnomeExtensions.appindicator - gnomeExtensions.caffeine - gnomeExtensions.dash-to-dock + # gnome.dconf-editor + # gnome.eog + # gnome.evince + # gnomeExtensions.appindicator + # gnomeExtensions.caffeine + # gnomeExtensions.dash-to-dock + # # gnomeExtensions.dynamic-panel-transparency # gnomeExtensions.dynamic-panel-transparency - gnomeExtensions.just-perfection - gnomeExtensions.gtile - gnomeExtensions.vitals + # gnomeExtensions.gtile + # gnomeExtensions.just-perfection + # 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 gucharmap handbrake @@ -74,23 +62,34 @@ # hyperspace-cli inkscape jetbrains.datagrip + kcolorchooser kdiff3 + # keepassxc + kgpg + # kid3 # tag mp3 kmail + kompare kontact korganizer krita + ksystemlog + kubectl lutris + meld minecraft mmv-go mpv mycrypto neofetch + nixos-option nix-prefetch-scripts nix-tree obsidian okular openvpn + p7zip pavucontrol + pcmanfm pentablet-driver procps ripgrep @@ -99,14 +98,18 @@ spotify tdesktop teams + tracker transmission-gtk unrar + unzip virt-manager wget # wineFull wireguard-tools xclip xournalpp + yq + zip zoom-us zotero @@ -136,11 +139,11 @@ ./modules/dircolors.nix ./modules/direnv.nix # ./modules/dunst.nix - # ./modules/fzf.nix + ./modules/fzf.nix ./modules/git.nix ./modules/go.nix ./modules/gpg.nix - ./modules/grobi.nix + # ./modules/grobi.nix ./modules/info.nix ./modules/java.nix ./modules/joystickwake.nix @@ -162,7 +165,7 @@ ./modules/onedrive.nix # ./modules/picom.nix # ./modules/polybar.nix - # ./modules/pycharm.nix + ./modules/pycharm.nix ./modules/gtk_theme.nix ./modules/rofi.nix ./modules/rofimoji.nix @@ -173,7 +176,7 @@ ./modules/syncthing.nix ./modules/terminator.nix ./modules/tmux.nix - ./modules/update_background.nix + # ./modules/update_background.nix ./modules/webapp.nix # ./modules/xidlehook.nix ./modules/zoxide.nix @@ -190,7 +193,7 @@ # blueman-applet.enable = true; # caffeine.enable = true; # cbatticon.enable = true; - gnome-keyring.enable = true; + # gnome-keyring.enable = true; # network-manager-applet.enable = true; # playerctld.enable = true; # poweralertd.enable = true; diff --git a/thor/configuration.nix b/thor/configuration.nix index c35010f..e3bfe30 100644 --- a/thor/configuration.nix +++ b/thor/configuration.nix @@ -111,7 +111,7 @@ enable = true; support32Bit = true; }; - media-session.enable = true; + # media-session.enable = true; }; power-profiles-daemon.enable = true; smartd = { enable = true; notifications.x11.enable = true; };