add laptop host

7 files changed, 109 insertions, 30 deletions

diff --git a/hosts/jontop/default.nix b/hosts/jontop/default.nix
new file mode 100644
index 0000000..4e53279
--- /dev/null
+++ b/hosts/jontop/default.nix
@@ -0,0 +1,32 @@
+{ inputs, config, lib, modulesPath, pkgs, ... }:
+
+{
+    imports = [
+        ./hardware.nix
+        ../../modules/hardware/bluetooth.nix
+    ];
+    
+    #Boot options
+    boot = {
+        loader = {
+            systemd-boot = {
+                enable = true;
+                configurationLimit = 8;
+            };
+            efi.canTouchEfiVariables = true;
+            timeout = 5;
+        };
+        kernelPackages = pkgs.linuxPackages_latest;
+    };
+
+    
+    hardware.opengl = {
+      enable = true;
+    };
+    
+    programs.light.enable = true;
+    
+    awesome.enable = true;
+    mullvad-vpn.enable = true;
+}
+
diff --git a/hosts/jontop/hardware.nix b/hosts/jontop/hardware.nix
new file mode 100644
index 0000000..7d3f7c9
--- /dev/null
+++ b/hosts/jontop/hardware.nix
@@ -0,0 +1,37 @@
+{ ... }:
+{
+    imports = 
+    [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+    boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+    boot.initrd.kernelModules = [ "i915" ];
+    boot.kernelModules = [ "kvm-intel" ];
+    boot.extraModulePackages = [ ];
+
+    fileSystems."/" =
+        { device = "/dev/disk/by-uuid/72e455f9-4b10-4cb2-a8e4-cfe39c4a8d1f";
+          fsType = "btrfs";
+        };
+    
+    fileSystems."/boot" =
+        { device = "/dev/disk/by-uuid/27F7-4AFD";
+          fsType = "vfat";
+        };
+    
+    swapDevices =
+        [ { device = "/dev/disk/by-uuid/4133a381-ab7d-4a25-9013-3f4b2d31bc5a"; }
+        ];
+
+    #SSD-optimization
+    services.fstrim.enable = true;
+
+    #Firmware
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+    #Networking
+    networking.hostName = "jontop";
+    networking.useDHCP = lib.mkDefault true;
+    networking.networkmanager.enable = true;
+}
diff --git a/modules/desktop/awesome/rc.lua b/modules/desktop/awesome/rc.lua
index 3d2de6d..9c2bdc5 100644
--- a/modules/desktop/awesome/rc.lua
+++ b/modules/desktop/awesome/rc.lua
@@ -672,39 +672,36 @@ client.connect_signal("request::titlebars", function(c)
             layout  = wibox.layout.flex.horizontal
         },
         { -- Right
+        {
             {
                 {
-                    {
-                        widget = awful.titlebar.widget.maximizedbutton(c),
-                    },
-                    widget = wibox.container.background,
-                    shape = gears.shape.circle,
-                    shape_border_width = 1,
-                    shape_border_color = "#12ac28",
-                    bg = "#28c940",
+                    widget = awful.titlebar.widget.maximizedbutton(c),
                 },
-                width = 16,
-                strategy = "min",
-                layout = wibox.layout.constraint
+                widget = wibox.container.background,
+                shape = gears.shape.circle,
+                shape_border_width = 1,
+                shape_border_color = "#12ac28",
+                bg = "#28c940",
+                forced_width = dpi(14),
             },
             {
                 {
-                    {
-                        widget = awful.titlebar.widget.closebutton(c),
-                    },
-                    widget = wibox.container.background,
-                    shape = gears.shape.circle,
-                    shape_border_width = 1,
-                    shape_border_color = "#ad3934",
-                    bg = "#bf4943",
+                    widget = awful.titlebar.widget.closebutton(c),
                 },
-                width = 16,
-                strategy = "min",
-                layout = wibox.layout.constraint
+                widget = wibox.container.background,
+                shape = gears.shape.circle,
+                shape_border_width = 1,
+                shape_border_color = "#ad3934",
+                bg = "#bf4943",
+                forced_width = dpi(14),
             },
             spacing = dpi(6),
             layout = wibox.layout.fixed.horizontal
         },
+        widget = wibox.container.margin;
+        left = dpi(6);
+        right = dpi(6);
+        },
         layout = wibox.layout.align.horizontal
     }
 end)
diff --git a/modules/desktop/awesome/theme.lua b/modules/desktop/awesome/theme.lua
index 49fe840..1568b5a 100644
--- a/modules/desktop/awesome/theme.lua
+++ b/modules/desktop/awesome/theme.lua
@@ -13,10 +13,10 @@ local theme = {}
 
 theme.font          = "FiraCode Nerd Font 10"
 
-theme.bg_normal     = "#1e1e2e"
+theme.bg_normal     = "#1e1e2e88"
 theme.bg_minimize   = theme.bg_normal
-theme.bg_focus      = "#2e2e3e"
-theme.bg_urgent     = "#4e4e5e"
+theme.bg_focus      = "#2e2e3e88"
+theme.bg_urgent     = "#4e4e5e88"
 theme.bg_systray    = theme.bg_normal
 
 theme.fg_minimize   = "#45475A"
@@ -30,10 +30,10 @@ theme.tag_list_focused  = "#cdd6f4"
 theme.tag_list_urgent   = "#f38ba8"
 
 theme.useless_gap   = dpi(4)
-theme.border_width  = dpi(4)
+theme.border_width  = 0
 theme.border_normal = theme.bg_normal
 theme.border_focus  = theme.bg_focus
-theme.border_marked = theme.fg_focus
+theme.border_marked = theme.fg_focus .. "88"
 
 -- There are other variable sets
 -- overriding the default one when
diff --git a/modules/desktop/picom.nix b/modules/desktop/picom.nix
index 7afe2f0..dcee480 100644
--- a/modules/desktop/picom.nix
+++ b/modules/desktop/picom.nix
@@ -4,9 +4,19 @@ with lib;
     config = mkIf (config.xserver.enable) {
         services.picom = {
             enable = true;
+
+            fade = true;
+            fadeDelta = 2;
+
+            backend = "glx";
             settings = {
-                backend = "glx";
-                corner-radius = 10;
+                corner-radius = 8;
+
+                blur = {
+                    method = "gaussian";
+                    size = 10;
+                    deviation = 5.0;
+                };
             };
         };
     };
diff --git a/modules/programs/programs.nix b/modules/programs/programs.nix
index b9d46c1..b9a003f 100644
--- a/modules/programs/programs.nix
+++ b/modules/programs/programs.nix
@@ -13,6 +13,7 @@ with lib;
             pavucontrol
             qbittorrent
             ffmpeg
+            mpv
         ];
     };
 }
diff --git a/modules/terminal/kitty/default.nix b/modules/terminal/kitty/default.nix
index 1ff0b78..5e0a432 100644
--- a/modules/terminal/kitty/default.nix
+++ b/modules/terminal/kitty/default.nix
@@ -26,9 +26,11 @@ with lib;
                 tab_bar_style = "powerline";
                 tab_powerline_style = "slanted";
                 tab_title_template = "{title}{' :{}'.format(num_windows) if num_windows > 1 else ''}";
+
+                background_opacity = "0.8";
             };
             extraConfig = ''
-                include ./theme.conf
+include ./theme.conf
             '';
         };
     };