update

10 files changed, 36 insertions, 178 deletions

diff --git a/config/waybar/config b/config/waybar/config
deleted file mode 100644
index 4fbb860..0000000
--- a/config/waybar/config
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "layer": "top",
-  "height": 40,
-  "modules-left": ["custom/launcher", "dwl/tags"],
-  "modules-right": ["tray", "cpu", "backlight", "battery", "clock"],
-  "mode": "dock",
-
-  // Modules configuration
-  "custom/launcher": {
-    "format": "<span font='24'></span>"
-  },
-  "dwl/tags": {
-    "num-tags": 9
-  },
-  "tray": {
-    "spacing": 10
-  },
-  "clock": {
-    "timezone": "Asia/Kolkata",
-    "format": " {:%a, %Y-%m-%d   %H:%M}",
-  },
-  "cpu": {
-    "format": " {usage}%",
-    "tooltip": false
-  },
-  "backlight": {
-    "format": "{icon} {percent}%",
-    "format-icons": ["", "", "", "", "", "", "", "", ""]
-  },
-  "battery": {
-    "bat": "BAT1",
-    "states": {
-      "warning": 30,
-      "critical": 15
-    },
-    "format": "{icon} {capacity}%",
-    "format-charging": " {capacity}%+",
-    "format-plugged": " {capacity}%",
-    "format-icons": ["", "", "", "", ""]
-  }
-}
-
diff --git a/config/waybar/default.nix b/config/waybar/default.nix
deleted file mode 100644
index 915502b..0000000
--- a/config/waybar/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-  home.packages = [ pkgs.waybar ];
-  home.file.".config/waybar/config".source = ./config;
-  home.file.".config/waybar/style.css".source = ./style.css;
-}
diff --git a/config/waybar/style.css b/config/waybar/style.css
deleted file mode 100644
index 1786ff9..0000000
--- a/config/waybar/style.css
+++ /dev/null
@@ -1,110 +0,0 @@
-* {
-  font-family: UbuntuMono Nerd Font Mono;
-  font-weight: 500;
-  font-size: 16px;
-}
-
-window#waybar {
-  background-color: rgba(27, 27, 27, 1);
-  color: #f2f0fa;
-  transition-property: background-color;
-  transition-duration: .5s;
-}
-
-button {
-  box-shadow: inset 0 -3px transparent;
-  border: none;
-  border-radius: 0px;
-}
-
-#tags button {
-  padding: 0px 15px;
-  background-color: rgba(27, 27, 27, 1);
-  color: #f2f0fa;
-}
-
-#tags button.focused {
-  background-color: rgba(242, 240, 250, 1);
-  color: #272727;
-}
-
-button:hover {
-  background: inherit;
-}
-
-#custom-launcher {
-  margin: 0 10px;
-  padding: 0 10px;
-}
-
-#workspaces {
-  border-radius: 10px;
-  background-color: #f2f0fa;
-  color: #272727;
-  padding: 0 10px;
-  margin: 0px 4px;
-}
-
-#workspaces button {
-  padding: 0 10px;
-  color: #272727;
-  background-color: #f2f0fa;
-}
-
-#clock {
-  padding: 0 10px;
-  margin: 0 10px;
-  color: #f2f0fa;
-  border-radius: 0px;
-}
-
-#battery,
-#cpu,
-#backlight {
-  padding: 0 10px;
-  margin: 0 0px;
-  background-color: #f2f0fa;
-  color: #272727;
-}
-
-#battery {
-  border-radius: 0px 10px 10px 0px;
-}
-
-#cpu {
-  border-radius: 10px 0px 0px 10px;
-}
-
-#tray {
-  padding: 0 10px;
-  margin: 0 0px;
-  border-radius: 10px;
-  margin: 0 10px;
-}
-
-#window {
-  margin: 0 4px;
-}
-
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
-  margin-left: 0;
-}
-
-#battery.critical:not(.charging) {
-  background-color: #f53c3c;
-  color: #ffffff;
-}
-
-label:focus {
-  background-color: #000000;
-}
-
-#tray > .passive {
-  -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-  -gtk-icon-effect: highlight;
-  background-color: #eb4d4b;
-}
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index aa77704..21ca26a 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -7,8 +7,8 @@
   ] ++ (map (path: ../../modules/${path}) [
     "global.nix"
     "compromyse.nix"
-    "plasma.nix"
     "login.nix"
+    "wm.nix"
     "fonts.nix"
     "bluetooth.nix"
     "audio.nix"
@@ -35,4 +35,9 @@
 
   home-manager.users.compromyse = import ./home.nix;
   programs.steam.enable = true;
+
+  networking.extraHosts =
+  ''
+    127.0.0.1 download.labsmartlis.local
+  '';
 }
diff --git a/machines/x/home.nix b/machines/x/home.nix
index 77769ea..51cd064 100644
--- a/machines/x/home.nix
+++ b/machines/x/home.nix
@@ -21,8 +21,8 @@ in {
     unzip
     zip
 
-    # cinnamon.nemo
-    # mate.eom
+    cinnamon.nemo
+    mate.eom
 
     spotify
     firefox
@@ -30,22 +30,25 @@ in {
 
     obs-studio
 
-    # pavucontrol
-    # blueman
-    # brillo
+    pavucontrol
+    brillo
+    playerctl
+    pamixer
 
-    # wbg
+    wbg
 
     kcalc
 
     ccls
-    rubocop
     nodePackages.pyright
     git-lfs
   ] ++ [ tlauncher ];
 
   imports = (map (path: ../../config/${path}) [
-    # "themes.nix"
+    "themes.nix"
+    "fuzzel"
+    "dunst"
+    "dwl.nix"
     "dotfiles.nix"
     "git"
     "nvim"
diff --git a/modules/compromyse.nix b/modules/compromyse.nix
index 03adf3e..f822b46 100644
--- a/modules/compromyse.nix
+++ b/modules/compromyse.nix
@@ -5,6 +5,6 @@
     initialPassword = "changeme";
     isNormalUser = true;
     # openssh.authorizedKeys.keys = [];
-    extraGroups = [ "wheel" "storage" "input" "plugdev" "libvirtd" "lxd" "docker" ];
+    extraGroups = [ "wheel" "video" "storage" "input" "plugdev" "libvirtd" "docker" ];
   };
 }
diff --git a/modules/nvidia.nix b/modules/nvidia.nix
index c72317f..1d59539 100644
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@@ -23,5 +23,5 @@
     };
   };
 
-  environment.systemPackages = [ pkgs.cudatoolkit ];
+  # environment.systemPackages = [ pkgs.cudatoolkit ];
 }
diff --git a/modules/plasma.nix b/modules/plasma.nix
deleted file mode 100644
index 35849b2..0000000
--- a/modules/plasma.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-  services.xserver.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-}
diff --git a/modules/wm.nix b/modules/wm.nix
index 03cf3ef..327ac41 100644
--- a/modules/wm.nix
+++ b/modules/wm.nix
@@ -13,4 +13,20 @@
 
     inotify-tools
   ];
+
+  systemd = {
+    user.services.polkit-gnome-authentication-agent-1 = {
+      description = "polkit-gnome-authentication-agent-1";
+      wantedBy = [ "graphical-session.target" ];
+      wants = [ "graphical-session.target" ];
+      after = [ "graphical-session.target" ];
+      serviceConfig = {
+          Type = "simple";
+          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+          Restart = "on-failure";
+          RestartSec = 1;
+          TimeoutStopSec = 10;
+        };
+    };
+  };
 }
diff --git a/packages/dwl.nix b/packages/dwl.nix
index 1bef677..a694621 100644
--- a/packages/dwl.nix
+++ b/packages/dwl.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "compromyse";
     repo = "dwl";
     rev = "master";
-    hash = "sha256-Mz8Dspi+XsKoWA7T3UE16TSNn0S1scSK4OevEQI4hkA=";
+    hash = "sha256-gE6J4hA44nLVjjN2i9svtHj8CCqU5y/WzqJd8AovmDc=";
   };
 
   nativeBuildInputs = [