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

hosts/home/hyprland.nix

@@ -99,7 +99,7 @@
         "$mainMod, Return, exec, $terminal"
         "$mainMod, D, exec, $menu"
         "$mainMod Shift, C, killactive,"
-        "$mainMod, Space, exec, toggle_float"
+        "$mainMod, Space, togglefloating"
         "$mainMod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock"
 
         #emacs

hosts/home/niri.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [./waybar.nix ./tile.nix];
+  home.packages = with pkgs; [
+    pkgs.swaybg
+    pkgs.swayidle
+    pkgs.swaylock
+    pkgs.niri
+    pkgs.fuzzel
+    pkgs.iio-niri
+    pkgs.squeekboard
+  ];
+}

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;
@@ -38,23 +38,9 @@
     firewall.enable = true;
   };
 
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {
-      LC_ADDRESS = "en_US.UTF-8";
-      LC_IDENTIFICATION = "en_US.UTF-8";
-      LC_MEASUREMENT = "en_US.UTF-8";
-      LC_MONETARY = "en_US.UTF-8";
-      LC_NAME = "en_US.UTF-8";
-      LC_NUMERIC = "en_US.UTF-8";
-      LC_PAPER = "en_US.UTF-8";
-      LC_TELEPHONE = "en_US.UTF-8";
-      LC_TIME = "en_US.UTF-8";
-    };
-  };
+  i18n.defaultLocale = "en_US.UTF-8";
 
   services = {
-    hardware.bolt = {enable = true;};
     displayManager.ly = {
       enable = true;
       x11Support = false;
@@ -62,9 +48,9 @@
         animation = "colormix";
         battery_id = "BAT0";
         clear_password = true;
-        colormix_col1 = "0xA7C080";
-        colormix_col2 = "0x7FBBB3";
-        colormix_col3 = "0xE67E80";
+        colormix_col1 = "0xffffea";
+        colormix_col2 = "0x006600";
+        colormix_col3 = "0x8888cc";
       };
     };
     pipewire = {
@@ -75,7 +61,7 @@
       jack.enable = true;
     };
     auto-cpufreq = {
-      enable = false;
+      enable = true;
       settings = {
         battery = {
           governor = "powersave";
@@ -91,12 +77,8 @@
       lidSwitch = "suspend-then-hibernate";
       lidSwitchExternalPower = "suspend";
     };
-    avahi = {
-      enable = false;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
 
+    hardware.bolt.enable = true;
     blueman.enable = true;
     fwupd.enable = true;
     printing.enable = true;
@@ -107,9 +89,28 @@
   stylix = {
     enable = true;
     autoEnable = true;
-    polarity = "dark";
+    polarity = "light";
     image = ./wallpaper.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
+    base16Scheme = {
+      base00 = "#ffffea";
+      base01 = "#eaffff";
+      base02 = "#eeee9e";
+      base03 = "#99994c";
+      base04 = "#555555";
+      base05 = "#000000";
+      base06 = "#000000";
+      base07 = "#000000";
+      base08 = "#aa0000";
+      base09 = "#884400";
+      base0A = "#99994c";
+      base0B = "#006600";
+      base0C = "#8888cc";
+      base0D = "#000099";
+      base0E = "#8888cc";
+      base0F = "#5d3a1a";
+    };
+    targets.chromium.enable = false;
+    targets.gnome.enable = false;
     opacity = {
       terminal = 0.85;
       popups = 0.75;
@@ -141,25 +142,14 @@
 
   hardware = {
     sensor.iio.enable = true;
-    graphics.enable32Bit = true;
-    graphics.extraPackages = with pkgs; [
-      intel-vaapi-driver
-      intel-media-driver
-      intel-compute-runtime
-    ];
   };
 
   programs = {
     zsh.enable = true;
-    virt-manager.enable = true;
-    hyprland = {
-      enable = true;
-    };
+    niri.enable = true;
   };
 
   virtualisation = {
-    libvirtd = {enable = true;};
-    kvmgt = {enable = true;};
     docker = {enable = true;};
   };
 

hosts/laptop/home.nix

@@ -6,7 +6,7 @@
 }: {
   imports = [
     ../home/home_common.nix
-    ../home/hyprland.nix
+    ../home/niri.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -14,6 +14,7 @@
   home = {
     packages = with pkgs; [
       firefox
+      lagrange
       chromium #this might replace firefox
       keepassxc
       thunderbird
@@ -32,6 +33,8 @@
       direnv
       texliveFull
       ispell
+
+      calc
     ];
   };
 
@@ -44,7 +47,10 @@
 
     emacs = {
       enable = true;
-      package = pkgs.emacs-pgtk.override{withTreeSitter=true;  withNativeCompilation=true;};
+      package = pkgs.emacs-pgtk.override {
+        withTreeSitter = true;
+        withNativeCompilation = true;
+      };
       extraPackages = epkgs: [
         epkgs.vterm
       ];
@@ -67,5 +73,6 @@
   stylix = {
     enable = true;
     autoEnable = true;
+    targets.gnome.enable = false;
   };
 }