lol

flake.lock

@@ -226,10 +226,10 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1638698569,
+        "lastModified": 1639347265,
-        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
+        "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
-        "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
+        "path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source",
-        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
+        "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
         "type": "path"
       },
       "original": {
@@ -255,10 +255,10 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1638698569,
+        "lastModified": 1639347265,
-        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
+        "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
-        "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
+        "path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source",
-        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
+        "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
         "type": "path"
       },
       "original": {
@@ -268,11 +268,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1640929225,
+        "lastModified": 1641734288,
-        "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=",
+        "narHash": "sha256-/7YwWbvkjinc4uu5aUQMRw3xAthhOVH/esm4tCXPzIQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9",
+        "rev": "df123677560db3b0db7c19d71981b11091fbeaf6",
         "type": "github"
       },
       "original": {

hosts/nishimiya.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 {
   imports = with inputs.nixos-hardware.nixosModules; [
@@ -20,7 +20,8 @@
     initrd = {
       availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci"
                                  # NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/common/pc/laptop/acpi_call.nix
-                                 "acpi_call" ];
+                                 #"acpi_call" ];
+			 	];
       kernelModules = [ "dm-snapshot" ];
       luks.devices = {
         cryptroot = {
@@ -29,6 +30,7 @@
         };
       };
     };
+    kernelPackages = pkgs.linuxPackages_xanmod;
     kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
     # NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/lenovo/thinkpad/e495/default.nix#L12
@@ -51,6 +53,7 @@
       office.enable = true;
     };
     services = {
+      gnome.enable = true;
       kanshi = let
         horizontal = "Samsung Electric Company C27F398 H4ZR101145";
 

modules/default.nix

@@ -20,6 +20,7 @@
     ./programs/zsh
     ./programs/xournalpp
     ./programs/plasma
+    ./programs/office
 
     # Services
     ./services/kanshi

modules/programs/gnome/default.nix

@@ -22,6 +22,7 @@ in {
         gnomeExtensions.tray-icons-reloaded
         gnomeExtensions.gsconnect
         gnomeExtensions.blur-my-shell
+        gnomeExtensions.forge
         gnome.eog
         gnome.nautilus
         gnome.evince

modules/programs/office/default.nix

@@ -1,15 +1,13 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
-  cfg = config.ptw.programs;
+  cfg = config.ptw.programs.office;
 in {
-  options.ptw.programs.office = {
+  options.ptw.programs.office.enable = lib.mkEnableOption "Install and configure office software";
-    enable = lib.mkEnableOption "Install Office software";
-  };
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      libreoffice
+      libreoffice texlive.combined.scheme-basic
     ];
   };
 }

modules/programs/plasma/default.nix

@@ -26,6 +26,7 @@ in {
       libsForQt5.okular
       libsForQt5.kdeconnect-kde
       libsForQt5.breeze-gtk
+      libsForQt5.bismuth
       index-fm
       #kasts-git
       rsibreak

modules/programs/waybar/default.nix

@@ -22,7 +22,7 @@ in {
           {
             output = [ "${cfg.output}" ];
             layer = "bottom";
-            position = "left";
+            position = "top";
             gtk-layer-shell = true;
 
             modules-left = [ "custom/applauncher" "sway/workspaces" "sway/mode" ];

modules/programs/waybar/style.css

@@ -1,133 +1,151 @@
-/*
-  Based on https://github.com/indicozy/wmtm/blob/main/configs/Flower/config/waybar/style.css
-*/
-@define-color background	#323732;
-@define-color foreground	#deddda;
-@define-color selection		#44475a;
-@define-color unfocused		#6272a4;
-@define-color cyan		#5d7380;
-@define-color green		#fff6f6;
-@define-color orange		#d65d0e;
-@define-color pink		#ff5370;
-@define-color purple		#b16286;
-@define-color red		#bf6374;
-@define-color yellow		#d79921;
-@define-color fore          	#d1c29d;
-
-
 * {
-	font-size: 14px;
+  border: none;
-	font-family: "Hack";
+  font-family: Iosevka Nerd Font, sans-serif;
-	padding: 0px;
+  font-size: 13px;
-	margin: 0px;
-/* text-shadow:1px 1px 2px rgba(0,0,0,.6); */
 }
 
 window#waybar {
-	color: @foreground;
+  /* background-color: rgba(18, 21, 29, 0.98); */
-	border-radius: 0;
+  background-color: #12151d;
+  /* background-color: rgba(0, 0, 0, 0); */
+  border-bottom: 3px solid #1e222a;
+  color: #abb2bf;
+  transition-property: background-color;
+  transition-duration: .5s;
 }
 
-window#waybar.left {
+window#waybar.hidden {
-	background: rgba(43, 48, 59, .85);
+  opacity: 0.2;
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px;
-	border-top: none;
-	margin: 0;
 }
 
-window#waybar.bottom {
-	padding-top: 0px;
-	background: @green;
-	border-bottom-left-radius: 0px;
-	margin: 0;
-}
-
-.modules-left,
-.modules-center,
-.modules-right {
-	margin: 0;
-	padding: 0;
-}
-
-/* Base styling for modules */
 #workspaces,
 #mode,
-#window,
+#cpu,
+#memory,
+#temperature,
+#custom-media,
+#custom-fans,
+#clock,
 #idle_inhibitor,
+#language,
 #pulseaudio,
-#taskbar,
+#backlight,
-#tray,
+#battery,
-#custom-menu {
+#network,
-	padding: 1px 0px 1px 0px;
-	margin: 0px;
-}
-
-#pulseaudio, #idle_inhibitor {
-	font-size: 30px;
-	margin: 0px 2px;
-}
-
-#pulseaudio {
-	font-size: 16px;
-}
-
-#taskbar,
-#tray,
-#window {
-	padding: 0;
-	margin: 0 0px 0 0px;
-}
-#taskbar {
-	margin-top: 0px;
-}
-#taskbar button {
-	color: @foreground;
-	border-radius: 0px;
-	padding: 3px 0px 3px 0px;
-}
-#taskbar button.active {
-	icon-shadow: 0px 0px 3px alpha(#111131, .9);
-	border-style: dashed;
-	border-width: 0 0 0 0;
-	border-color: @foreground;
-	border-radius: 0;
-}
-
 #tray {
-	color: black;
+  background-color: #1e222a;
-	icon-shadow: 0px 1px 2px alpha(#020000, .9);
+  padding: 0 10px;
-	padding: 2px 0px 2px 0px;
+  margin: 2px 4px 5px 4px;
+  border: 3px solid rgba(0, 0, 0, 0);
+  border-radius: 90px;
+  background-clip: padding-box;
 }
 
-#custom-menu,
-#custom-applauncher,
-#custom-notifications {
-	font-size: 30px;
-}
-
-#clock {
-	font-size: 16px;
-	margin-left: 2px;
-	margin-right: 2px;
-}
-
-#workspaces {
-	padding: 0px 0px 0px 0px;
-	margin-left: 0px;
-}
 #workspaces button {
-	margin: 0;
+  padding: 0 5px;
-	padding: 0px 0px 0px 0px;
+  min-width: 20px;
-	border-radius: 0px;
+  color: #61afef;
-	color: @foreground;
+}
+
+#workspaces button:hover {
+  background-color: rgba(0, 0, 0, 0.2)
 }
 
 #workspaces button.focused {
-    color: @foreground;
+  color: #c678dd;
-    background-color: @purple;
+}
-	border-style: solid;
+
-	border-width: 0 0 0 0;
+#workspaces button.urgent {
-	border-color: @foreground;
+  color: #e06c75;
-	border-radius: 0;
+}
+
+#cpu {
+  color: #61afef;
+}
+
+#memory {
+  color: #c678dd;
+}
+
+#temperature {
+  color: #d19a66;
+}
+
+#temperature.critical {
+  background-color: #e06c75;
+  color: #1e222a;
+}
+
+#custom-media {
+  background-color: #c678dd;
+  color: #1e222a;
+}
+
+#custom-fans {
+  color: #98c379;
+}
+
+#clock {
+  color: #61afef;
+}
+
+#idle_inhibitor {
+  color: #abb2bf;
+}
+
+#idle_inhibitor.activated {
+  background-color: #abb2bf;
+  color: #1e222a;
+}
+
+#language {
+  color: #56b6c2;
+}
+
+#pulseaudio {
+  color: #d19a66;
+}
+
+#pulseaudio.muted {
+  background-color: #e06c75;
+  color: #1e222a;
+}
+
+#backlight {
+  color: #61afef;
+}
+
+#battery {
+  color: #98c379;
+}
+
+#battery.charging, #battery.plugged {
+  background-color: #98c379;
+  color: #1e222a;
+}
+
+@keyframes blink {
+    to {
+        background-color: #1e222a;
+        color: #e06c75;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #e06c75;
+    color: #1e222a;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#network {
+    color: #c678dd
+}
+
+#network.disconnected {
+    background-color: #e06c75;
+    color: #1e222a;
 }

modules/users/alexander.nix

@@ -54,7 +54,7 @@
       # TODO: Maybe move this somewhere else
       services.gpg-agent = {
         enable = true;
-        pinentryFlavor = "qt";
+        pinentryFlavor = "gnome3";
       };
     };    
   };