First attempt at adding polybar-dwm-module

- Update flake.lock - Switch from awesome back to dwm - Attempt to modify existing polybar nix package to point to mihirlad55's polybar-dwm-module
Add btrbk for backups
2024-03-30 16:12:07 -04:00 · 2024-03-30 16:11:12 -04:00 · 2024-03-30 16:11:12 -04:00 · 2024-03-30 16:11:12 -04:00 · 2024-03-28 20:16:07 -04:00
21 changed files with 143 additions and 58 deletions
--- a/disko/luks-btrfs-subvolumes.nix
+++ b/disko/luks-btrfs-subvolumes.nix
@@ -1,7 +1,7 @@
 let
  installDisk = "sda";
  bootPartitionSize = "512M";
-  swapfileSize = "34G";
+  swapfileSize = "10G";
 in {
  disko.devices = {
    disk = {
@@ -37,26 +37,34 @@ in {
                  type = "btrfs";
                  extraArgs = [ "-f" ];
                  subvolumes = {
-                    "@" = {
+                    "@root" = {
                      mountpoint = "/";
-                      mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
+                      mountOptions = [ "compress=zstd" "noatime" ];
                    };
                    "@home" = {
                      mountpoint = "/home";
-                      mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
+                      mountOptions = [ "compress=zstd" "noatime" ];
                    };
-                    "@.snapshots" = {
-                      mountpoint = "/.snapshots";
-                      mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
+                    "@games" = {
+                      mountpoint = "/games";
+                      mountOptions = [ "compress=zstd" "noatime" ];
                    };
                    "@nix" = {
                      mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
+                      mountOptions = [ "compress=zstd" "noatime" ];
+                    };
+                    "@log" = {
+                      mountpoint = "/var/log";
+                      mountOptions = [ "compress=zstd" "noatime" ];
                    };
                    "@swap" = {
                      mountpoint = "/swap";
                      swap.swapfile.size = swapfileSize;
                    };
+                    "@.snapshots" = {
+                      mountpoint = "/.snapshots";
+                      mountOptions = [ "compress=zstd" "noatime" ];
+                    };
                  };
                };
              };
--- a/flake.lock
+++ b/flake.lock
@@ -313,11 +313,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1711460390,
-        "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
+        "lastModified": 1711668574,
+        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
+        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
        "type": "github"
      },
      "original": {
@@ -329,11 +329,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1711523803,
-        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
+        "lastModified": 1711703276,
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
        "type": "github"
      },
      "original": {
--- a/system/gui/awesome.nix
+++ b/system/gui/awesome.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, userSettings, ... }:
+
+{
+  imports = [
+    ./default.nix
+    ./lightdm.nix
+    ./x11.nix
+  ];
+
+  services.xserver.windowManager.awesome = {
+    enable = true;
+    luaModules = with pkgs.luaPackages; [
+      luarocks
+      luadbi-mysql
+    ];
+  };
+
+  services.xserver.displayManager.defaultSession = "none+awesome";
+}
--- a/system/gui/default.nix
+++ b/system/gui/default.nix
@@ -3,6 +3,5 @@
 {
  imports = [
    ./fonts.nix
-    ./utilities.nix
  ];
 }
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -3,25 +3,62 @@
 {
  imports = [
    ./default.nix
-    ./lightdm.nix
-    ./x11.nix
  ];

-  services.xserver.windowManager.dwm = {
+  services.xserver = {
    enable = true;
-    package = pkgs.dwm.overrideAttrs {
-      src = (/home + "/${userSettings.username}" + /.config/dwm-flexipatch);
-      buildInputs = with pkgs; [
-        xorg.libX11.dev
-        xorg.libXinerama
-        xorg.libXft
-        xorg.libxcb
-        xorg.xcbutil
-        yajl
-        jsoncpp
-      ];
+
+    xkb = {
+      layout = "us";
+      variant = "";
+      options = "";
+    };
+
+    windowManager.dwm = {
+      enable = true;
+
+      package = pkgs.dwm.overrideAttrs {
+        src = (/home + "/${userSettings.username}" + /.config/dwm-flexipatch);
+
+        buildInputs = with pkgs; [
+          xorg.libX11.dev
+          xorg.libXinerama
+          xorg.libXft
+          xorg.libxcb
+          xorg.xcbutil
+          yajl
+          jsoncpp
+        ];
+      };
+    };
+
+    displayManager = {
+      defaultSession = "none+dwm";
+      lightdm.enable = true;
    };
  };

-  services.xserver.displayManager.defaultSession = "none+dwm";
+  services.picom.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    arandr
+    autorandr
+    unclutter-xfixes
+    (polybar.overrideAttrs (finalAttrs: previousAttrs: {
+      pname = previousAttrs.pname + "-dwm-module";
+      version = "3.5.2";
+
+      src = fetchFromGithub {
+        owner = "mihirlad55";
+        repo = "polybar-dwm-module";
+        rev = "0c3e139ac54e081c06ef60548927e679d80d4297";
+        hash = "sha256-DGij8dNp5nnQ05vA+6LcAdPoXAN0eYJHBimXC2Gt5JQ=";
+        fetchSubmodules = true;
+      };
+
+      buildInputs = previousAttrs.buildInputs ++ [
+        jsoncpp
+      ];
+    }))
+  ];
 }
--- a/system/gui/fonts.nix
+++ b/system/gui/fonts.nix
@@ -6,5 +6,10 @@
    powerline
    font-awesome
    ubuntu_font_family
+    (nerdfonts.override {
+      fonts = [
+        "FiraCode"
+      ];
+    })
  ];
 }
--- a/system/gui/gnome.nix
+++ b/system/gui/gnome.nix
@@ -3,12 +3,14 @@
 {
  imports = [
    ./default.nix
-    (if systemSettings.desktopType == "x11" then ./x11.nix else "")
  ];

-  services.xserver.displayManager.gdm = {
-    enable = true;
-    wayland = (if systemSettings.desktopType == "x11" then false else true);
+  services.xserver = {
+    displayManager.gdm = {
+      enable = true;
+      wayland = (if systemSettings.desktopType == "x11" then false else true);
+    };
+
+    desktopManager.gnome.enable = true;
  };
-  services.xserver.desktopManager.gnome.enable = true;
 }
--- a/system/gui/kde.nix
+++ b/system/gui/kde.nix
@@ -3,13 +3,16 @@
 {
  imports = [
    ./default.nix
-    (if systemSettings.desktopType == "x11" then ./x11.nix else "")
  ];

  services.xserver.displayManager = {
-    sddm.enable = true;
-    sddm.wayland.enable = (if systemSettings.desktopType == "x11" then false else true);
+    sddm = {
+      enable = true;
+      wayland.enable = (if systemSettings.desktopType == "x11" then false else true);
+    };
+
    defaultSession = (if systemSettings.desktopType == "x11" then "plasmax11" else "plasma");
  };
+
  services.desktopManager.plasma6.enable = true;
 }
--- a/system/gui/lightdm.nix
+++ b/system/gui/lightdm.nix
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.xserver.displayManager.lightdm.enable = true;
-}
--- a/system/gui/x11.nix
+++ b/system/gui/x11.nix
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.xserver = {
-    enable = true;
-    xkb = {
-      layout = "us";
-      variant = "";
-      options = "";
-    };
-  };
-}
--- a/system/hardware/audio.nix
+++ b/system/hardware/audio.nix
@@ -11,4 +11,8 @@
    pulse.enable = true;
    jack.enable = true;
  };
+  environment.systemPackages = with pkgs; [
+    playerctl
+    pavucontrol
+  ];
 }
--- a/system/hardware/bluetooth.nix
+++ b/system/hardware/bluetooth.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:

 {
-  hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+
  services.blueman.enable = true;
 }
--- a/system/security/default.nix
+++ b/system/security/default.nix
@@ -4,5 +4,6 @@
  imports = [
    ./firewall.nix
    ./gpg.nix
+    ./polkit.nix
  ];
 }
--- a/system/security/polkit.nix
+++ b/system/security/polkit.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  security.polkit.enable = true;
+  environment.systemPackages = with pkgs; [
+    polkit_gnome
+  ];
+}
--- a/system/utilities/backups.nix
+++ b/system/utilities/backups.nix
@@ -2,7 +2,6 @@

 {
  environment.systemPackages = with pkgs; [
-    arandr
-    autorandr
+    btrbk
  ];
 }
--- a/system/utilities/default.nix
+++ b/system/utilities/default.nix
@@ -6,5 +6,6 @@
    ./gnome-keyring.nix
    ./miscellaneous.nix
    ./gaming.nix
+    ./backups.nix
  ];
 }
--- a/user/media/creation.nix
+++ b/user/media/creation.nix
@@ -4,5 +4,6 @@
  home.packages = (with pkgs; [
    blender
    obs-studio
+    freecad
  ]);
 }
--- a/user/media/editors.nix
+++ b/user/media/editors.nix
@@ -5,5 +5,6 @@
    gimp
    libsForQt5.kdenlive
    ffmpeg
+    audacity
  ]);
 }
--- a/user/media/players.nix
+++ b/user/media/players.nix
@@ -8,5 +8,7 @@
    pocket-casts
    spotify
    spicetify-cli
+    ani-cli
+    calibre
  ]);
 }
--- a/user/utilities/default.nix
+++ b/user/utilities/default.nix
@@ -8,5 +8,6 @@
    ./keyboard-configuration.nix
    ./passwords.nix
    ./xdg.nix
+    ./screenshot.nix
  ];
 }
--- a/user/utilities/screenshot.nix
+++ b/user/utilities/screenshot.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    flameshot
+  ]);
+}
Author	SHA1	Message	Date
Sravan Balaji	2ec9230a0a	First attempt at adding polybar-dwm-module - Update flake.lock - Switch from awesome back to dwm - Attempt to modify existing polybar nix package to point to mihirlad55's polybar-dwm-module	2024-03-30 16:12:07 -04:00
Sravan Balaji	80473968ae	Add btrbk for backups	2024-03-30 16:11:12 -04:00
Sravan Balaji	2e87b2ecad	Add AwesomeWM	2024-03-30 16:11:12 -04:00
Sravan Balaji	0cc1298285	Modify disko BTRFS Subvolume Layout - Decrease swapfile size to 10G (don't really need hibernation) - Remove extra BTRFS mount options like disarcd=async, space_cache=v2, and ssd - Add a games subvolume - Add a subvolume for /var/log	2024-03-30 16:11:12 -04:00
Sravan Balaji	7db963f519	Gui Reorg and More Programs - Gui config reorganization - Enable picom for dwm - Install some utilities like arandr, autorandr, and unclutter-xfixes for dwm - Add nerdfonts for FiraCode - Remove conditional imports list syntax - Add audio tools like playerctl and pavucontrol - Enable polkit and add GNOME polkit - Add more media programs like freecad, audacity, ani-cli, and calibre - Add flameshot	2024-03-28 20:16:07 -04:00