Better grobi + polybar audio + updates

home.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 let
+  nixpkgs = import <nixpkgs> {};
   callPackage = pkgs.lib.callPackageWith pkgs;
   nord = import ./themes/nord.nix;
   onedark = import ./themes/onedark.nix;
@@ -39,60 +40,72 @@ in
     language.base = "it_IT.UTF-8";
     keyboard.layout = "it";
     keyboard.options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
-    packages =
-      with pkgs; [
-        audacity
-        authy
-        blender
-        discord
-        evolution
-        firefox
-        gallery-dl
-        gallery-tagger
-        gnome3.dconf-editor
-        gnome3.easytag
-        gnome3.eog
-        gnome3.evince
-        gnome3.file-roller
-        gnome3.ghex
-        gnome3.gitg
-        gnome3.gnome-screenshot
-        gnome3.gnome-system-monitor
-        gnome3.gnome-tweaks
-        gnome3.nautilus
-        gnome3.seahorse
-        gnome3.sushi
-        google-chrome
-        gucharmap
-        htop
-        jetbrains.datagrip
-        krita
-        libreoffice-fresh
-        lutris
-        megasync
-        mpv
-        neofetch
-        nerdfonts
-        nix-prefetch-git
-        obsidian
-        openvpn
-        pavucontrol
-        pcmanfm
-        pentablet-driver
-        procps-ng
-        ripgrep
-        shotwell
-        skypeforlinux
-        slack
-        spotify
-        tdesktop
-        teams
-        transmission-gtk
-        wineFull
-        wireguard
-        zoom-us
-        zotero
-      ];
+    packages = with pkgs; [
+
+
+      audacity
+      authy
+      blender
+      discord
+      evolution
+      firefox
+      gallery-dl
+      gallery-tagger
+      gnome.dconf-editor
+      gnome.easytag
+      gnome.eog
+      gnome.evince
+      gnomeExtensions.appindicator
+      gnomeExtensions.dash-to-dock
+      gnome.file-roller
+      gnome.ghex
+      gnome.gitg
+      gnome.gnome-screenshot
+      gnome.gnome-system-monitor
+      gnome.gnome-tweaks
+      gnome.nautilus
+      gnome.seahorse
+      gnome.sushi
+      google-chrome
+      gucharmap
+      htop
+      jetbrains.datagrip
+      keepassxc
+      krita
+      libreoffice-fresh
+      lutris
+      megasync
+      mpv
+      neofetch
+      nerdfonts
+      nix-prefetch-git
+      obsidian
+      openvpn
+      pavucontrol
+      pcmanfm
+      pentablet-driver
+      procps-ng
+      ripgrep
+      shotwell
+      skypeforlinux
+      slack
+      spotify
+      tdesktop
+      teams
+      transmission-gtk
+      wineFull
+      wireguard
+      zoom-us
+      zotero
+
+      (
+        dwarf-fortress-packages.dwarf-fortress-full.override {
+          enableLegendsBrowser = false;
+          enableTextMode = true;
+          theme = "cla";
+        }
+      )
+    ];
   };
 
   programs.zsh.enable = true;

modules/grobi.nix

@@ -10,7 +10,17 @@
         primary = "HDMI-0";
       }
       {
-        name = "Fallback";
+        name = "Presentation";
+        outputs_connected = [ "eDP1" "DP1" ];
+        configure_row = [ "eDP1" "DP1" ];
+        primary = "eDP1";
+      }
+      {
+        name = "FallbackIntel";
+        configure_single = "eDP1";
+      }
+      {
+        name = "FallbackNvidia";
         configure_single = "eDP-1-1";
       }
     ];

modules/polybar.nix

@@ -2,11 +2,12 @@
 let
   grep = "${pkgs.gnugrep}/bin/grep";
   cut = "${pkgs.coreutils}/bin/cut";
+  head = "${pkgs.coreutils}/bin/head";
   pavucontrol = "${pkgs.pavucontrol}/bin/pavucontrol";
   pgrep = "${pkgs.procps}/bin/pgrep";
   pkill = "${pkgs.procps}/bin/pkill";
   playerCtl = "${pkgs.playerctl}/bin/playerctl";
-  playerStatus = "${playerCtl} -f '{{emoji(status)}} {{title}} - {{artist}}' metadata | head -c 60";
+  playerStatus = "${playerCtl} -f '{{emoji(status)}} {{title}} - {{artist}}' metadata | ${head} -c 60";
   colors = with pkgs.extra; palette.toARGBHex rec {
 
     normal = {
@@ -235,16 +236,16 @@ in
           };
           volume = colors.normal // {
             padding = 1;
-            text = "<ramp-volume><label-volume> <bar-volume>";
+            text = "VOL <bar-volume> <label-volume>";
           };
         };
         label.muted = {
-          text = "🔇";
+          text = "󰖁";
         };
         label.volume = {
-          text = " %percentage%%";
+          text = "%percentage%%";
         };
-        ramp.volume = [ "🔈" "🔉" "🔊" ];
+        ramp.volume = [ "󰕿" "󰖀" "󰕾" ];
         type = "internal/pulseaudio";
       };
 

nixos/base.nix

@@ -1,6 +1,4 @@
-{}:
-
-{
+{ pkgs, ... }:{
 
 
   imports =
@@ -14,6 +12,7 @@
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.initrd.checkJournalingFS = true;
 
   # # Cross-build arm
   boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
@@ -34,7 +33,6 @@
     interfaces = {
       enp60s0.useDHCP = true;
       wlp0s20f3.useDHCP = true;
-      virbr0.useDHCP = true;
     };
 
     # Configure network proxy if necessary
@@ -99,7 +97,7 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.bertof = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "input" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" "input" "usb" "network" "audio" ]; # Enable ‘sudo’ for the user.
     shell = pkgs.zsh;
   };
 

update-intel.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 sudo nix-channel --update &&
-sudo nixos-rebuild switch -p Intel -I ./nixos/intel.nix
+sudo nixos-rebuild switch -p Intel -I nixos-config=./nixos/intel.nix

update-nvidia.sh

@@ -1,4 +1,3 @@
 #!/bin/sh
 sudo nix-channel --update &&
-sudo nixos-rebuild switch -p Nvidia -I ./nixos/nvidia.nix &&
-sudo nixos-rebuild switch           -I ./nixos/nvidia.nix
+sudo nixos-rebuild switch -p Nvidia -I nixos-config=./nixos/nvidia.nix