From 177d3ca47c437d52b1d05f78ae40b77354a6674d Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 11 Feb 2026 10:37:35 -0500 Subject: [PATCH] fix --- config/rofi/config.rasi | 10 ++ config/rofi/themes/midnight.rasi | 150 +++++++++++++++++++++++++ home/modules/editor.nix | 7 +- home/modules/packages.nix | 13 ++- home/modules/shell.nix | 7 +- hosts/xps15/hardware-configuration.nix | 50 ++++++--- scripts/doc | 36 ------ 7 files changed, 211 insertions(+), 62 deletions(-) create mode 100644 config/rofi/config.rasi create mode 100644 config/rofi/themes/midnight.rasi delete mode 100755 scripts/doc diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi new file mode 100644 index 0000000..0a2d1c3 --- /dev/null +++ b/config/rofi/config.rasi @@ -0,0 +1,10 @@ +@import "themes/theme.rasi" + +configuration { + font: "Berkeley Mono 15"; +} + +listview { + scrollbar: false; + scrollbar-width: 0px; +} diff --git a/config/rofi/themes/midnight.rasi b/config/rofi/themes/midnight.rasi new file mode 100644 index 0000000..ae8aefe --- /dev/null +++ b/config/rofi/themes/midnight.rasi @@ -0,0 +1,150 @@ +/************************************************ + * ROFI Color theme + * User: leofa + * Copyright: 2017 leofa + ***********************************************/ + +* { + selected-normal-foreground: rgba ( 249, 249, 249, 100 % ); + foreground: rgba ( 196, 203, 212, 100 % ); + normal-foreground: @foreground; + alternate-normal-background: rgba ( 64, 69, 82, 100 % ); + red: rgba ( 220, 50, 47, 100 % ); + selected-urgent-foreground: rgba ( 249, 249, 249, 100 % ); + blue: rgba ( 38, 139, 210, 100 % ); + urgent-foreground: rgba ( 204, 102, 102, 100 % ); + alternate-urgent-background: rgba ( 75, 81, 96, 100 % ); + active-foreground: rgba ( 101, 172, 255, 100 % ); + lightbg: rgba ( 238, 232, 213, 100 % ); + selected-active-foreground: rgba ( 249, 249, 249, 100 % ); + alternate-active-background: rgba ( 75, 81, 96, 100 % ); + background: rgba ( 45, 48, 59, 100 % ); + alternate-normal-foreground: @foreground; + normal-background: @background; + lightfg: rgba ( 88, 104, 117, 100 % ); + selected-normal-background: rgba ( 64, 132, 214, 100 % ); + border-color: rgba ( 124, 131, 137, 100 % ); + spacing: 2; + separatorcolor: rgba ( 29, 31, 33, 100 % ); + urgent-background: rgba ( 29, 31, 33, 100 % ); + selected-urgent-background: rgba ( 165, 66, 66, 100 % ); + alternate-urgent-foreground: @urgent-foreground; + background-color: rgba ( 0, 0, 0, 0 % ); + alternate-active-foreground: @active-foreground; + active-background: rgba ( 29, 31, 33, 100 % ); + selected-active-background: rgba ( 68, 145, 237, 100 % ); +} +window { + background-color: @background; + border: 1; + padding: 5; +} +mainbox { + border: 0; + padding: 0; +} +message { + border: 2px 0px 0px ; + border-color: @separatorcolor; + padding: 1px ; +} +textbox { + text-color: @foreground; +} +listview { + fixed-height: 0; + border: 2px 0px 0px ; + border-color: @separatorcolor; + spacing: 2px ; + scrollbar: true; + padding: 2px 0px 0px ; +} +element { + border: 0; + padding: 1px ; +} +element-text { + background-color: inherit; + text-color: inherit; +} +element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; +} +element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; +} +element.normal.active { + background-color: @active-background; + text-color: @active-foreground; +} +element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} +element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; +} +element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; +} +element.alternate.normal { + background-color: @alternate-normal-background; + text-color: @alternate-normal-foreground; +} +element.alternate.urgent { + background-color: @alternate-urgent-background; + text-color: @alternate-urgent-foreground; +} +element.alternate.active { + background-color: @alternate-active-background; + text-color: @alternate-active-foreground; +} +scrollbar { + width: 4px ; + border: 0; + handle-color: @normal-foreground; + handle-width: 8px ; + padding: 0; +} +mode-switcher { + border: 2px 0px 0px ; + border-color: @separatorcolor; +} +button { + spacing: 0; + text-color: @normal-foreground; +} +button.selected { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} +inputbar { + spacing: 0; + text-color: @normal-foreground; + padding: 1px ; +} +case-indicator { + spacing: 0; + text-color: @normal-foreground; +} +entry { + spacing: 0; + text-color: @normal-foreground; +} +prompt { + spacing: 0; + text-color: @normal-foreground; +} +inputbar { + children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; +} +textbox-prompt-colon { + expand: false; + str: ":"; + margin: 0px 0.3em 0em 0em ; + text-color: @normal-foreground; +} diff --git a/home/modules/editor.nix b/home/modules/editor.nix index 82bd8c5..ad68459 100644 --- a/home/modules/editor.nix +++ b/home/modules/editor.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: let neovim = config.programs.neovim.enable; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index bf2405d..40d0774 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -15,12 +15,13 @@ let enableNeovim = config.programs.neovim.enable; in { - home.sessionVariables = lib.optionalAttrs enableZen { - BROWSER = "zen"; - } - // lib.optionalAttrs enableClaude { - CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude"; - }; + home.sessionVariables = + lib.optionalAttrs enableZen { + BROWSER = "zen"; + } + // lib.optionalAttrs enableClaude { + CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude"; + }; programs.mpv.enable = true; diff --git a/home/modules/shell.nix b/home/modules/shell.nix index ccf2933..df01c42 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -173,7 +173,7 @@ in dotDir = "${config.xdg.configHome}/zsh"; profileExtra = '' - start-hyprland + [ "$(tty)" = "/dev/tty1" ] && [ -z "$WAYLAND_DISPLAY" ] && start-hyprland ''; history = { @@ -201,7 +201,10 @@ in autosuggestion = { enable = true; - strategy = [ "history" "completion" ]; + strategy = [ + "history" + "completion" + ]; }; completionInit = '' diff --git a/hosts/xps15/hardware-configuration.nix b/hosts/xps15/hardware-configuration.nix index 2bd1fb1..356ba23 100644 --- a/hosts/xps15/hardware-configuration.nix +++ b/hosts/xps15/hardware-configuration.nix @@ -1,32 +1,48 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/384cbef3-bf3d-4ca8-9ccb-1594030aa93a"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/384cbef3-bf3d-4ca8-9ccb-1594030aa93a"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5646-BF32"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/c1c0175b-71d9-4cae-b7ed-bc10599309ab"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5646-BF32"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/c1c0175b-71d9-4cae-b7ed-bc10599309ab"; } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/scripts/doc b/scripts/doc deleted file mode 100755 index 2167604..0000000 --- a/scripts/doc +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -require() { - for cmd in "$@"; do - command -v "$cmd" >/dev/null 2>&1 || { - echo "doc: missing dependency: $cmd" >&2 - exit 1 - } - done -} - -require sioyek - -dir="$HOME/doc" -test -d "$dir" || exit - -if [ "$XDG_SESSION_TYPE" = x11 ]; then - require dmenu - picker() { dmenu -i -l 10 -p "Select file or folder: "; } -else - require rofi - picker() { rofi -dmenu -i -l 10 -p "Select file or folder"; } -fi - -while :; do - choice="$(find "$dir" -not -path "$dir/.*" -mindepth 1 -maxdepth 1 \( -type d -printf "%f/\n" -o -type f -printf "%f\n" \) | picker)" - - [ -n "$choice" ] || break - - if [ -d "$dir/${choice%/}" ]; then - dir="$dir/${choice%/}" - elif [ -f "$dir/$choice" ]; then - sioyek "$dir/$choice" & - break - fi -done