modules/core/default.nix

@@ -3,7 +3,7 @@
   imports =
     [ (import ./docker.nix) ]
     ++ [ (import ./hardware.nix) ]
-    ++ [ (import ./displaylink.nix) ]
+    # ++ [(import ./displaylink.nix)]
     # ++ [(import ./printing.nix)]
     ++ [ (import ./xserver.nix) ]
     ++ [ (import ./network.nix) ]

modules/core/xserver.nix

@@ -1,20 +1,20 @@
-{ username, ... }:
+{ username, ... }: 
 {
-  #services = {
+  services = {
-  #  xserver = {
+    xserver = {
-  #    enable = true;
+      enable = true;
-  #    xkb.layout = "us";
+      xkb.layout = "us";
-  #    displayManager.lightdm.greeters.slick.enable = true;
+      # displayManager.lightdm.greeters.slick.enable = true;
-  #    #displayManager.lightdm.greeters.mini = {
+      displayManager.lightdm.greeters.mini = {
-  #    #  enable = true;
+        enable = true;
-  #    #  user = "liv";
+        user = "liv";
-  #    #  extraConfig = ''
+        extraConfig = ''
-  #    #      [greeter]
+            [greeter]
-  #    #      show-password-label = false
+            show-password-label = false
-  #    #      [greeter-theme]
+            [greeter-theme]
-  #    #      background-image = "/home/liv/Pictures/wallpapers/others/anime-sky-lonely.png"
+            background-image = "/home/liv/Pictures/wallpapers/others/anime-sky-lonely.png"
-  #    #  '';
+        '';
-  #    #};
+      };
-  #  };
+    };
-  #};
+  };
 }

modules/core/yubikey.nix

@@ -21,32 +21,14 @@
       login.u2fAuth = true;
       greetd.u2fAuth = true;
       sudo.u2fAuth = true;
-      swaylock.fprintAuth =
+      swaylock.fprintAuth = if (host == "sakura") then true else false;
-        if (host == "sakura") then
-          true
-        else if (host == "zinnia") then
-          true
-        else
-          false;
       # No longer using Hyprlock, might stay here for if I ever switch to it again.
       hyprlock.u2fAuth = true;
-      hyprlock.fprintAuth =
+      hyprlock.fprintAuth = if (host == "sakura") then true else false;
-        if (host == "sakura") then
-          true
-        else if (host == "zinnia") then
-          true
-        else
-          false;
     };
   };
 
-  services.fprintd.enable =
+  services.fprintd.enable = if (host == "sakura") then true else false;
-    if (host == "sakura") then
-      true
-    else if (host == "zinnia") then
-      true
-    else
-      false;
 
   environment.systemPackages = with pkgs; [
     yubikey-manager

modules/home/default.nix

@@ -7,7 +7,6 @@
     ++ [ (import ./hyprland) ]
     ++ [ (import ./hyprlock) ]
     ++ [ (import ./kitty.nix) ]
-    ++ [ (import ./foot.nix) ]
     ++ [ (import ./nvim.nix) ]
     ++ [ (import ./zathura.nix) ]
     ++ [ (import ./packages.nix) ]

modules/home/fonts.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    scientifica
     # nerd-fonts._0xproto
     # nerd-fonts._3270
     # nerd-fonts.agave

modules/home/foot.nix

@@ -1,48 +0,0 @@
-{ pkgs, username, ... }:
-{
-  home.file."/home/${username}.config/foot/foot.ini".text = ''
-    # -*- conf -*-
-
-    # font=GohuFont 14 Nerd Font Mono:size=9
-    initial-window-mode=maximized
-    # [tweak]
-    # allow-overflowing-double-width-glyphs=true
-
-    [desktop-notifications]
-    # command=notify-send --wait --app-name $\{app-id} --icon $\{app-id} --category $\{category} --urgency $\{urgency} --expire-time $\{expire-time} --hint STRING:image-path:$\{icon} --hint BOOLEAN:suppress-sound:$\{muted} --hint STRING:sound-name:$\{sound-name} --replace-id $\{replace-id} $\{action-argument} --print-id -- $\{title} $\{body}
-    # command-action-argument=--action $\{action-name}=$\{action-label}
-    # close=""
-    # inhibit-when-focused=yes
-
-    [cursor]
-    style=block
-
-    [colors]
-    alpha=0.5
-
-    background=000000
-    foreground=878ba6
-    flash=7f7f00
-    flash-alpha=0.5
-
-    ## Normal/regular colors (color palette 0-7)
-    regular0=1e202f  # black
-    regular1=7586f5  # red
-    regular2=fb6fa9  # green
-    regular3=ffb3d2  # yellow
-    regular4=8696fd  # blue
-    regular5=fb6fa9  # magenta
-    regular6=a0acfe  # cyan
-    regular7=878ba6  # white
-
-    ## Bright colors (color palette 8-15)
-    bright0=4f5472   # bright black
-    bright1=fe81b5   # bright red
-    bright2=292c3d   # bright green
-    bright3=444864   # bright yellow
-    bright4=5b6080   # bright blue
-    bright5=d2d8fe   # bright magenta
-    bright6=f764a1   # bright cyan
-    bright7=ebedff   # bright white
-  '';
-}

modules/home/hyprland/config.nix

@@ -99,10 +99,10 @@
         };
       };
 
-      #gestures = {
+      gestures = {
-      #  workspace_swipe = true;
+        workspace_swipe = true;
-      #  workspace_swipe_invert = true;
+        workspace_swipe_invert = true;
-      #};
+      };
 
       general = {
         "$mainMod" = "ALT";

modules/home/packages.nix

@@ -31,7 +31,6 @@
     python3
 
     # CLI shit
-    fff
     imagemagick
     foot
     termpdfpy

roles/server.nix

@@ -17,8 +17,7 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      kitty.terminfo
+      pkgs.kitty.terminfo
-      foot.terminfo
       powertop
     ];