font+ transparency rice + kitty

2024-04-04 11:58:02 +02:00
parent 551b904c32
commit 9d0835f94e
8 changed files with 86 additions and 70 deletions
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,7 +2,7 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).

-{ config, lib, pkgs, user, allowed, secrets, ... }:
+{ config, lib, pkgs, user, allowed, secrets, rice, ... }:

 {
  imports =
@@ -87,10 +87,10 @@
    noto-fonts
    noto-fonts-cjk
    noto-fonts-emoji
-    atkinson-hyperlegible
-    (nerdfonts.override { fonts = [ "CascadiaCode" ]; })
-
-  ];
+  ] ++ [
+    rice.font.base.package
+    rice.font.code.package
+  ]

  programs.gnupg.agent = {
    enable = true;
--- a/flake.nix
+++ b/flake.nix
@@ -40,11 +40,17 @@
        secondary-fg = "#ffffff";
        secondary-bg = "#222255";
        lines = "#bbbbbb";
-        accent = "#ff00ff"
+        accent = "#ff00ff";
      };
      font = {
-        code = "CascadiaCove-NF";
-        base = "Atkinson Hyperlegible";
+        code = {
+          name = "CascadiaCove-NF";
+          package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
+        };  
+        base = {
+          name = "Atkinson Hyperlegible";
+          package = pkgs.atkinson-hyperlegible;
+        };
      };
    };
  in 
--- a/home-modules/hyprland/hyprland.nix
+++ b/home-modules/hyprland/hyprland.nix
@@ -1,7 +1,7 @@
 { config, pkgs, pkgs-unstable, rice, lib, ... }:
 let
  animation-speed = "2";
-  transparency = "0.9";
+  transparency = rice.transparency;
  gap-size = 10;
  monitors = {
    main = {
@@ -222,7 +222,7 @@ in
      ];

      windowrulev2 = [
-        "opacity ${transparency},class:^(com.chatterino.chatterino)$"
+        "opacity ${transparency},class:^(com.chatterino.*)$"
        "opacity ${transparency},class:^(chatterino)$"
        "bordercolor rgba(ff00ffff) rgba(ff00ff66), pinned:1"
      ];
@@ -777,7 +777,7 @@ in
          text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>"
          color = $color0
          font_size = 64
-          font_family = ${font.code} 10
+          font_family = ${rice.font.code.name} 10
          position = 0, 16
          halign = center
          valign = center
@@ -789,7 +789,7 @@ in
          text = Hey <span text_transform="capitalize" size="larger">$USER</span>
          color = $color0
          font_size = 20
-          font_family = ${font.code} 10
+          font_family = ${rice.font.code.name} 10
          position = 0, 0
          halign = center
          valign = center
@@ -802,7 +802,7 @@ in
          text = Type to unlock!
          color = $color0
          font_size = 16
-          font_family = ${font.code} 10
+          font_family = ${rice.font.code.name} 10
          position = 0, 30
          halign = center
          valign = bottom
--- a/home-modules/kitty.nix
+++ b/home-modules/kitty.nix
@@ -0,0 +1,40 @@
+{ config, pkgs, rice, ...}:
+let 
+
+in
+{
+  home.packages = with pkgs; [
+    kitty
+  ];
+
+  programs.kitty = {
+    enable = true;
+    font = rice.font.code;
+    settings = {
+      background = "#000000";
+      foreground = "#919191";
+      cursor = "#919191";
+      color0 = "#303030";
+      color8 = "#5e5e5e";
+      color1 = "#a43261";
+      color9 = "#ff9fc9";
+      color2 = "#006ca5";
+      color10 = "#3bd6ff";
+      color3 = "#0061b1";
+      color11 = "#93c9ff";
+      color4 = "#913e88";
+      color12 = "#ffa7f6";
+      color5 = "#007086";
+      color13 = "#00ddf4";
+      color6 = "#6751a6";
+      color14 = "#d5b8ff";
+      color7 = "#c6c6c6";
+      color15 = "#ffffff";
+      background_opacity = rice.transparency;
+      transparency = true;
+      scroll_multiplier = 9;
+      window_padding_width = 5;
+      window_padding_height = 5;
+    };
+  };
+}
--- a/home.nix
+++ b/home.nix
@@ -14,6 +14,7 @@
    ./home-modules/hyprland/hyprland-autoname-workspaces.nix
    ./home-modules/hyprland/waybar.nix
    
+    ./home-modules/kitty.nix
    ./home-modules/shell/fish.nix
    ./home-modules/shell/starship.nix
    ./home-modules/shell/yazi.nix
--- a/system-modules/dm.nix
+++ b/system-modules/dm.nix
@@ -7,14 +7,17 @@
  ];

  services.xserver = {
-    displayManager.sddm = {
-      enable = true;
-      theme = "where_is_my_sddm_theme";
-      settings = {
-        theme = {
-          # background = /home/nx2/Pictures/
-          passwordFontSize = 12;
-          passwordInputCursorVisible = true;
+    displayManager = {
+      defaultSession = "hyprland";
+      sddm = {
+        enable = true;
+        theme = "where_is_my_sddm_theme";
+        settings = {
+          theme = {
+            # background = /home/nx2/Pictures/
+            passwordFontSize = 12;
+            passwordInputCursorVisible = true;
+          };
        };
      };
    };
--- a/system-modules/grub.nix
+++ b/system-modules/grub.nix
@@ -30,50 +30,6 @@
        search --no-floppy --fs-uuid --set=root 0A97-7A2D
        chainloader /EFI/Microsoft/Boot/bootmgfw.efi
      }
-      menuentry 'Arch Linux ' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-simple-0c11547f-0294-419b-93d0-45c6d1f1c546' {
-        insmod part_gpt
-        insmod ext2
-        search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-        linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-        initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
-      }
-      submenu 'Arch (A.O.)' $menuentry_id_option 'osprober-gnulinux-advanced-0c11547f-0294-419b-93d0-45c6d1f1c546' {
-        menuentry 'Arch Linux (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
-        }
-        menuentry 'Arch Linux, with Linux linux-lts (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts.img
-        }
-        menuentry 'Arch Linux, with Linux linux-lts (fallback initramfs) (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux-lts--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux-lts root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux-lts-fallback.img
-        }
-        menuentry 'Arch Linux, with Linux linux (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux.img
-        }
-        menuentry 'Arch Linux, with Linux linux (fallback initramfs) (on /dev/nvme0n1p5)' --class gnu-linux --class gnu --class os $menuentry_id_option 'osprober-gnulinux-/boot/vmlinuz-linux--0c11547f-0294-419b-93d0-45c6d1f1c546' {
-          insmod part_gpt
-          insmod ext2
-          search --no-floppy --fs-uuid --set=root 0c11547f-0294-419b-93d0-45c6d1f1c546
-          linux /boot/vmlinuz-linux root=UUID=0c11547f-0294-419b-93d0-45c6d1f1c546 rw loglevel=3 quiet splash snd_hda_intel.dmic_detect=0
-          initrd /boot/intel-ucode.img /boot/initramfs-linux-fallback.img
-        }
-      }
    '';
  };
 }
--- a/system-modules/hardware-configuration.nix
+++ b/system-modules/hardware-configuration.nix
@@ -5,7 +5,8 @@

 {
  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
    ];

  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@@ -14,20 +15,29 @@
  boot.extraModulePackages = [ ];

  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9770465e-6b0e-40ec-944a-953fe71cf47a";
+    #    { device = "/dev/disk/by-uuid/9770465e-6b0e-40ec-944a-953fe71cf47a";
+    {
+      device = "/dev/disk/by-label/nixos";
      fsType = "ext4";
    };

  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C5AA-3190";
+    {
+      device = "/dev/disk/by-label/EFI";
      fsType = "vfat";
    };
  fileSystems."/home/${user}/shared" =
-    { device = "/dev/disk/by-uuid/C494BB0B94BAFF4C";
+    {
+      device = "/dev/disk/by-label/shared";
      fsType = "ntfs";
    };

-  swapDevices = [ ];
+  swapDevices = [
+    {
+      device = "/dev/disk/by-label/swap";
+      # size = 16 * 1024;
+    }
+  ];

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's