feat: yet another huge commit

sioodmy · Dec 11, 2023 · 6f20a05 · 6f20a05
1 parent fe1f5b5
commit 6f20a05
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 53 deletions.
diff --git a/home/cli/packages.nix b/home/cli/packages.nix
@@ -34,7 +34,7 @@
     imagemagick
 
     # premiere pro for acoustic people
-    ffmpeg
+    ffmpeg-full
 
     # preview images in terminal
     catimg
@@ -59,9 +59,6 @@
     # json thingy
     jq
 
-    # network traffic (track down Mossad spyware)
-    bandwhich
-
     # syncthnig for acoustic people
     rsync
   ];

diff --git a/home/cli/zsh/aliases.nix b/home/cli/zsh/aliases.nix
@@ -30,6 +30,7 @@ with pkgs; {
   kys = "shutdown now";
   gpl = "curl https://www.gnu.org/licenses/gpl-3.0.txt -o LICENSE";
   agpl = "curl https://www.gnu.org/licenses/agpl-3.0.txt -o LICENSE";
+  webcam = "ffplay /dev/video0";
   g = "git";
   n = "nix";
   mnt = "udisksctl mount -b";

diff --git a/home/misc/media.nix b/home/misc/media.nix
@@ -4,8 +4,15 @@
     mpv = {
       enable = true;
       defaultProfiles = ["gpu-hq"];
-      config.osc = false;
-      scripts = with pkgs.mpvScripts; [mpris thumbnail sponsorblock];
+      bindings = {
+        UP = "add volume +2";
+        DOWN = "add volume -2";
+      };
+      config = {
+        hwdec = "auto";
+        border = false;
+      };
+      scripts = with pkgs.mpvScripts; [mpris thumbnail sponsorblock ];
     };
 
     obs-studio = {

diff --git a/home/rice/anyrun.nix b/home/rice/anyrun.nix
@@ -17,7 +17,7 @@ in {
         inputs.cryptorun.packages.${pkgs.system}.default
       ];
 
-      width.fraction = 0.3;
+      width.fraction = 0.45;
       hidePluginInfo = true;
       closeOnClick = true;
       y.absolute = 15;

diff --git a/home/rice/gtk.nix b/home/rice/gtk.nix
@@ -17,7 +17,7 @@
     };
     font = {
       name = "Lexend";
-      size = 13;
+      size = 11;
     };
     gtk3.extraConfig = {
       gtk-xft-antialias = 1;

diff --git a/home/rice/hyprland/config.nix b/home/rice/hyprland/config.nix
@@ -62,7 +62,7 @@ in {
         gaps_out = 11;
 
         # border thiccness
-        border_size = 3;
+        border_size = 2;
 
         # active border color
         "col.active_border" = "rgb(89b4fa) rgb(cba6f7) 270deg";
@@ -98,9 +98,11 @@ in {
         # disable redundant renders
         disable_splash_rendering = true;
 
+        vfr = true;
+
         # window swallowing
         enable_swallow = true; # hide windows that spawn other windows
-        swallow_regex = "foot|thunar|nemo"; # windows for which swallow is applied
+        swallow_regex = "foot|footclient"; # windows for which swallow is applied
 
         # dpms
         mouse_move_enables_dpms = true; # enable dpms on mouse/touchpad action
@@ -110,6 +112,7 @@ in {
 
       animations = {
         enabled = true;
+        first_launch_animation = false;
 
         bezier = [
           "smoothOut, 0.36, 0, 0.66, -0.56"
@@ -168,6 +171,7 @@ in {
         "$MOD,mouse_up,workspace,e-1" # move to the previous ws
 
         "$MODSHIFT,S,exec,grimblast --notify --cursor copysave area" # screenshot and then pipe it to swappy
+        "$MOD,Print,exec, grimblast save area - | tee /home/sioodmy/pics/ss/$(date +'screenshot-%Y%m%d%H%M%S.png') | wl-copy && notify-send 'Screenshot taken'"
 
         "$MODSHIFT,L,exec,gtklock" # lock screen
       ];

diff --git a/home/rice/waybar/default.nix b/home/rice/waybar/default.nix
@@ -20,7 +20,7 @@ in {
         layer = "top";
         position = "top";
         height = 38;
-        spacing = 7;
+        spacing = 6;
         fixed-center = false;
         margin-left = null;
         margin-top = null;
@@ -33,9 +33,8 @@ in {
           "custom/lock"
           "backlight"
           "battery"
-          # "custom/eth"
         ];
-        modules-right = ["custom/weather" "pulseaudio" "network" "clock" "custom/power"];
+        modules-right = ["cpu" "memory" "custom/weather" "pulseaudio" "network" "clock" "custom/power"];
         "hyprland/workspaces" = {
           on-click = "activate";
           format = "{icon}";
@@ -145,22 +144,49 @@ in {
           tooltip-format = ''
             <big>{:%Y %B}</big>
             <tt><small>{calendar}</small></tt>'';
+          calendar = {
+            mode = "year";
+            mode-mon-col = 3;
+            weeks-pos = "right";
+            on-scroll = 1;
+            on-click-right = "mode";
+            format = {
+              months = "<span color='#f5c2e7'><b>{}</b></span>";
+              days = "<span color='#cdd6f4'><b>{}</b></span>";
+              weeks = "<span color='#cba6f7'><b>T{:%U}</b></span>";
+              weekdays = "<span color='#eba0ac'><b>{}</b></span>";
+              today = "<span color='#a6e3a1'><b><u>{}</u></b></span>";
+            };
+            actions = {
+              on-click-right = "mode";
+              on-click-forward = "tz_up";
+              on-click-backward = "tz_down";
+              on-scroll-up = "shift_up";
+              on-scroll-down = "shift_down";
+            };
+          };
         };
         backlight = {
           format = "{icon}  {percent}%";
           format-icons = ["" "" "" "" "" "" "" "" ""];
         };
-        cpu = {
-          interval = 5;
+        memory = {
+          interval = 2;
           format = "  {}%";
+          max-length = 10;
+        };
+        cpu = {
+          interval = 2;
+          format = "󰍛 {}%";
+          max-length = 10;
         };
         battery = {
           states = {
             warning = 30;
             critical = 15;
           };
-          format = "{icon} {capacity}%";
-          format-charging = "󰂄 {capacity}%";
+          format = "{icon} {capacity}% 󱐋{power}";
+          format-charging = "󰚥{icon} {capacity}% 󱐋{power}";
           format-alt = "{icon} {capacity}%";
           format-icons = ["󰂃" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
         };

diff --git a/home/rice/waybar/style.nix b/home/rice/waybar/style.nix
@@ -39,6 +39,10 @@ in ''
       color: #ef9f76;
     }
 
+    #memory {
+      color: #fab387;
+    }
+
     #clock {
       font-weight: 700;
       font-family: "Iosevka Term";

diff --git a/system/core/bootloader.nix b/system/core/bootloader.nix
@@ -26,9 +26,10 @@
       # disable obsolete vsyscalls
       "vsyscall=none"
 
-      # shut up
-      "quiet"
-      "loglevel=0"
+      "vga=current"
+      "rd.systemd.show_status=false"
+      "rd.udev.log_level=3"
+      "udev.log_priority=3"
       # security
       "lsm=landlock,lockdown,yama,apparmor,bpf"
       # disable noisy audit log
@@ -38,6 +39,7 @@
       # passthrough
       "iommu=pt"
     ];
+    consoleLogLevel = 0;
     initrd.verbose = false;
     # switch from old ass lts kernel
     kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;

diff --git a/system/core/network.nix b/system/core/network.nix
@@ -1,10 +1,5 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  environment.systemPackages = with pkgs; [speedtest-cli];
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [speedtest-cli bandwhich];
   networking = {
     # dns
     nameservers = ["127.0.0.1" "::1"];

diff --git a/system/core/nix.nix b/system/core/nix.nix
@@ -50,7 +50,9 @@
       allowBroken = true;
       permittedInsecurePackages = [
         "openssl-1.1.1u"
+                "electron-25.9.0"
       ];
+
       allowUnfreePredicate = pkg:
         builtins.elem (lib.getName pkg) [
           "steam-run"

diff --git a/system/core/schizo.nix b/system/core/schizo.nix
@@ -103,24 +103,12 @@
       enable = true;
       extraRules = [
         {
-          commands = [
-            {
-              command = "/run/current-system/sw/bin/poweroff";
+          commands =
+            builtins.map (command: {
+              command = "/run/current-system/sw/bin/${command}";
               options = ["NOPASSWD"];
-            }
-            {
-              command = "/run/current-system/sw/bin/reboot";
-              options = ["NOPASSWD"];
-            }
-            {
-              command = "/run/current-system/sw/bin/nixos-rebuild";
-              options = ["NOPASSWD"];
-            }
-            {
-              command = "/run/current-system/sw/bin/nh";
-              options = ["NOPASSWD"];
-            }
-          ];
+            })
+            ["poweroff" "reboot" "nixos-rebuild" "nh" "bandwhich"];
           groups = ["wheel"];
         }
       ];
@@ -130,8 +118,7 @@
   boot.kernel.sysctl = {
     # Hide kernel pointers from processes without the CAP_SYSLOG capability.
     "kernel.kptr_restrict" = 1;
-    # Prevent information leak from kernel logging to screen during boot.
-    "kernel.printk" = 3333;
+    "kernel.printk" = "3 3 3 3";
     # Restrict loading TTY line disciplines to the CAP_SYS_MODULE capability.
     "dev.tty.ldisc_autoload" = 0;
     # Make it so a user can only use the secure attention key which is required to access root securely.
@@ -209,7 +196,6 @@
     "minix"
     "nilfs2"
     "omfs"
-    "uvcvideo"
     "qnx4"
     "qnx6"
     "sysv"

diff --git a/system/core/system.nix b/system/core/system.nix
@@ -75,6 +75,7 @@
     variant = "u24n";
   in {
     font = "${pkgs.terminus_font}/share/consolefonts/ter-${variant}.psf.gz";
+    earlySetup = true;
     keyMap = "pl";
   };
 

diff --git a/system/wayland/default.nix b/system/wayland/default.nix
@@ -1,9 +1,4 @@
-{
-  pkgs,
-  lib,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [./fonts ./services.nix ./pipewire.nix];
   environment.etc."greetd/environments".text = ''
     Hyprland