Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs

hosts/home/hyprland.nix

@@ -51,7 +51,9 @@
     settings = {
       exec-once = [
         #"${pkgs.iio-hyprland}/bin/iio-hyprland"
-        #"${pkgs.batsignal}/bin/batsignal -n BAT0 -b"
+        "${pkgs.batsignal}/bin/batsignal -n BAT0 -b"
+        "${pkgs.waybar}/bin/waybar"
+        "${pkgs.hyprpaper}/bin/hyprpaper"
       ];
       monitor = "eDP-1,preferred,auto,1";
       general = {
@@ -100,6 +102,13 @@
         "$mainMod, Space, exec, toggle_float"
         "$mainMod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock"
 
+        #emacs
+        "$mainMod, E, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c"
+        "$mainMod, C, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(org-roam-capture)\""
+        "$mainMod, B, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(call-interactively #'bookmark-jump)\""
+        "$mainMod, P, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(project-dired)\""
+        "$mainMod, M, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e \"(mingus)\""
+
         # switch focus
         "$mainMod, left, movefocus, l"
         "$mainMod, right, movefocus, r"

hosts/laptop/configuration.nix

@@ -4,7 +4,7 @@
   inputs,
   ...
 }: {
-  imports = [./hardware-configuration.nix];
+  imports = [./hardware-configuration.nix ];
 
   nixpkgs.config.allowUnfree = true;
   system.autoUpgrade.enable = true;
@@ -27,8 +27,8 @@
     gc.automatic = false;
     settings = {
       experimental-features = ["nix-command" "flakes"];
-      substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
-      trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
+      #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
+      #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
     };
   };
 
@@ -54,12 +54,19 @@
   };
 
   services = {
-    hardware.bolt = {enable = false;};
-    displayManager.sddm = {
+    hardware.bolt = {enable = true;};
+    displayManager.ly = {
       enable = true;
-      wayland.enable = true;
+      x11Support = false;
+      settings = {
+        animation = "colormix";
+        battery_id = "BAT0";
+        clear_password = true;
+        colormix_col1 = "0xA7C080";
+        colormix_col2 = "0x7FBBB3";
+        colormix_col3 = "0xE67E80";
+      };
     };
-    desktopManager.plasma6.enable = true;
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -85,13 +92,13 @@
       lidSwitchExternalPower = "suspend";
     };
     avahi = {
-      enable = true;
+      enable = false;
       nssmdns4 = true;
-      openFirewall = true; # If you have a firewall enabled
+      openFirewall = true;
     };
 
     blueman.enable = true;
-    fwupd.enable = false;
+    fwupd.enable = true;
     printing.enable = true;
     fprintd.enable = true;
     thermald.enable = true;
@@ -100,13 +107,14 @@
   stylix = {
     enable = true;
     autoEnable = true;
-    polarity = "light";
+    polarity = "dark";
     image = ./wallpaper.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/precious-light-warm.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
     opacity = {
       terminal = 0.85;
       popups = 0.75;
       desktop = 0.75;
+      applications = 0.85;
     };
     cursor = {
       package = pkgs.adwaita-icon-theme;
@@ -143,6 +151,16 @@
 
   programs = {
     zsh.enable = true;
+    virt-manager.enable = true;
+    hyprland = {
+      enable = true;
+    };
+  };
+
+  virtualisation = {
+    libvirtd = {enable = true;};
+    kvmgt = {enable = true;};
+    docker = {enable = true;};
   };
 
   users.users.k = {
@@ -166,7 +184,7 @@
   };
 
   systemd.sleep.extraConfig = ''
-    HibernateDelaySec=30m
+    HibernateDelaySec=20m
     SuspendState=mem
   '';
 
@@ -182,7 +200,6 @@
       "loglevel=3"
       "rd.systemd.show_status=false"
       "rd.udev.log_level=3"
-      "udev.lqog_priority=3"
     ];
     loader.timeout = 0;
   };

hosts/laptop/home.nix

@@ -6,6 +6,7 @@
 }: {
   imports = [
     ../home/home_common.nix
+    ../home/hyprland.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -19,6 +20,7 @@
       blender
       vesktop
       spotify
+      alacritty
 
       btop
       zip
@@ -42,7 +44,7 @@
 
     emacs = {
       enable = true;
-      package = pkgs.emacs-pgtk;
+      package = pkgs.emacs-pgtk.override{withTreeSitter=true;  withNativeCompilation=true;};
       extraPackages = epkgs: [
         epkgs.vterm
       ];
@@ -60,7 +62,6 @@
     emacs = {
       enable = true;
       defaultEditor = true;
-      package = pkgs.emacs-pgtk;
     };
   };
   stylix = {

hosts/server/configuration.nix

@@ -30,7 +30,7 @@
 
   users = {
     motd = "Welcome to the Server";
-    defaultUserShell = pkgs.nushell;
+    defaultUserShell = pkgs.zsh;
     users = {
       k = {
         isNormalUser = true;
@@ -48,16 +48,14 @@
     };
   };
 
-  home-manager = {users = {"k" = import ./home.nix;};};
+  home-manager = {
+    backupFileExtension = "bk";
+    users = {"k" = import ./home.nix;};
+  };
 
   environment.systemPackages = with pkgs; [
     microcodeIntel
     firefox
-    (pkgs.kodi.withPackages (kodiPkgs:
-      with kodiPkgs; [
-        jellyfin
-        youtube
-      ]))
   ];
 
   hardware.bluetooth.enable = true;

hosts/server/service.nix

@@ -6,11 +6,33 @@
   networking = {
     firewall = {
       enable = true;
-      allowedTCPPorts = [80 443 22 25565 26615 8080];
-      allowedUDPPorts = [26615 8080 1900];
+      allowedTCPPorts = [80 443 22 25565 26615 8080 53 19132 ];
+      allowedUDPPorts = [26615 8080 1900 51820 53 19132 ];
+    };
+    nat.externalInterface = "wlp0s20f3";
+    nat.internalInterfaces = [ "wg0" ];
+    wireguard.interfaces = {
+      wg0 = {
+        ips = ["10.0.0.1/24"];
+        listenPort = 51820;
+        privateKeyFile = "/keys/wg-private";
+       peers = [
+          { # laptop
+	    publicKey = "Ze2y3K+blI3aBc1AKTlvv90j+McBaitB+qSLazsuSFM=";
+            allowedIPs = ["10.0.0.2/32"];
+          }
+
+          { # phone
+            publicKey = "vcheBoHRxCrwzbMw0UI9ZsQfVDJizBWkeM+pF5/8+HE=";
+            allowedIPs = ["10.0.0.3/32"];
+          }
+        ];
+      };
     };
   };
 
+  networking.nat.enable = true;
+
   security.acme = {
     acceptTerms = true;
     defaults.email = "markers711@gmail.com";
@@ -33,15 +55,6 @@
 
     i2p = {enable = true;};
 
-    cockpit = {
-      enable = true;
-      allowed-origins = ["https://pit.dhilton.xyz"];
-    };
-
-    pulseaudio = {
-      enable = true;
-    };
-
     nix-serve = {
       enable = true;
       secretKeyFile = "/var/cache-priv-key.pem";
@@ -184,11 +197,11 @@
           };
         };
 
-        "pit.dhilton.xyz" = {
+        "map.dhilton.xyz" = {
           forceSSL = true;
           enableACME = true;
           locations."/" = {
-            proxyPass = "http://127.0.0.1:9090";
+            proxyPass = "http://127.0.0.1:8100";
             proxyWebsockets = true;
           };
         };