From bc0ebb27a85b2e9bdd375e0767732b4f76f55fe6 Mon Sep 17 00:00:00 2001 From: jasmine Date: Mon, 12 May 2025 09:56:08 +0800 Subject: [PATCH 1/5] remove dunst --- .../features/desktop/dunst/default.nix | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 home-manager/sajenim/features/desktop/dunst/default.nix diff --git a/home-manager/sajenim/features/desktop/dunst/default.nix b/home-manager/sajenim/features/desktop/dunst/default.nix deleted file mode 100644 index 8afb5a5..0000000 --- a/home-manager/sajenim/features/desktop/dunst/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{...}: { - services.dunst = { - enable = true; - settings = { - global = { - width = 300; - height = 300; - origin = "top-right"; - offset = "20x20"; - frame_width = 5; - frame_color = "#32302f"; - corner_radius = 10; - }; - - urgency_low = { - background = "#282828"; - foreground = "#d4be98"; - }; - - urgency_normal = { - background = "#282828"; - foreground = "#d4be98"; - }; - - urgency_critical = { - background = "#282828"; - foreground = "#d4be98"; - }; - }; - }; -} From 9b2957484c3749695433d29b81e032dd090d1f80 Mon Sep 17 00:00:00 2001 From: jasmine Date: Mon, 12 May 2025 09:56:32 +0800 Subject: [PATCH 2/5] remove rofi --- .../sajenim/features/desktop/rofi/default.nix | 16 --- .../rofi/gruvbox-material/gruvbox-common.rasi | 127 ------------------ .../gruvbox-material-dark-medium.rasi | 62 --------- 3 files changed, 205 deletions(-) delete mode 100644 home-manager/sajenim/features/desktop/rofi/default.nix delete mode 100644 home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-common.rasi delete mode 100644 home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-medium.rasi diff --git a/home-manager/sajenim/features/desktop/rofi/default.nix b/home-manager/sajenim/features/desktop/rofi/default.nix deleted file mode 100644 index 3c657ad..0000000 --- a/home-manager/sajenim/features/desktop/rofi/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{pkgs, ...}: { - programs.rofi = { - enable = true; - font = "Fisa Code 10"; - plugins = with pkgs; [ - rofi-calc - ]; - theme = ./gruvbox-material/gruvbox-material-dark-medium.rasi; - }; - - xdg.configFile.theme = { - source = ./gruvbox-material; - target = "rofi/themes/gruvbox"; - recursive = true; - }; -} diff --git a/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-common.rasi b/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-common.rasi deleted file mode 100644 index 6d95f8c..0000000 --- a/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-common.rasi +++ /dev/null @@ -1,127 +0,0 @@ -/* ========================================================================== - File: gruvbox-common.rasi - Desc: Shared rules between all gruvbox themes - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:06:47 PST -0800 - ========================================================================== */ - -window { - background-color: @background; - border: 2; - padding: 2; -} - -mainbox { - border: 0; - padding: 0; -} - -message { - border: 2px 0 0; - border-color: @separatorcolor; - padding: 1px; -} - -textbox { - highlight: @highlight; - text-color: @foreground; -} - -listview { - border: 2px solid 0 0; - padding: 2px 0 0; - border-color: @separatorcolor; - spacing: 2px; - scrollbar: @scrollbar; -} - -element { - border: 0; - padding: 2px; -} - -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: 40px; - border: 0; - handle-color: @scrollbar-handle; - handle-width: 8px; - padding: 0; -} - -sidebar { - border: 2px 0 0; - border-color: @separatorcolor; -} - -inputbar { - spacing: 0; - text-color: @normal-foreground; - padding: 2px; - children: [ prompt, textbox-prompt-sep, entry, case-indicator ]; -} - -case-indicator, -entry, -prompt, -button { - spacing: 0; - text-color: @normal-foreground; -} - -button.selected { - background-color: @selected-normal-background; - text-color: @selected-normal-foreground; -} - -textbox-prompt-sep { - expand: false; - str: ":"; - text-color: @normal-foreground; - margin: 0 0.3em 0 0; -} diff --git a/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-medium.rasi b/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-medium.rasi deleted file mode 100644 index 0181baa..0000000 --- a/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-medium.rasi +++ /dev/null @@ -1,62 +0,0 @@ -/* ========================================================================== - Rofi color theme - - Based on the Gruvbox color scheme for Vim by morhetz - https://github.com/morhetz/gruvbox - - File: gruvbox-dark-hard.rasi - Desc: Gruvbox dark (hard contrast) color theme for Rofi - Author: bardisty - Source: https://github.com/bardisty/gruvbox-rofi - Modified: Mon Feb 12 2018 06:04:26 PST -0800 - ========================================================================== */ - -* { - /* Theme settings */ - highlight: bold italic; - scrollbar: true; - - /* Gruvbox dark colors */ - gruvbox-dark-bg0: #282828; - gruvbox-dark-bg1: #32302f; - gruvbox-dark-bg2: #32302f; - gruvbox-dark-fg0: #d4be98; - gruvbox-dark-fg1: #ddc7a1; - gruvbox-dark-red-dark: #cc241d; - gruvbox-dark-red-light: #fb4934; - gruvbox-dark-yellow-dark: #d79921; - gruvbox-dark-yellow-light: #fabd2f; - gruvbox-dark-gray: #a89984; - - /* Theme colors */ - background: @gruvbox-dark-bg0; - background-color: @background; - foreground: @gruvbox-dark-fg1; - border-color: @gruvbox-dark-bg1; - separatorcolor: @border-color; - scrollbar-handle: @gruvbox-dark-bg2; - - normal-background: @background; - normal-foreground: @gruvbox-dark-gray; - alternate-normal-background: @normal-background; - alternate-normal-foreground: @normal-foreground; - selected-normal-background: @gruvbox-dark-bg2; - selected-normal-foreground: @gruvbox-dark-fg0; - - active-background: @gruvbox-dark-yellow-dark; - active-foreground: @background; - alternate-active-background: @active-background; - alternate-active-foreground: @active-foreground; - selected-active-background: @gruvbox-dark-yellow-light; - selected-active-foreground: @active-foreground; - - urgent-background: @gruvbox-dark-red-dark; - urgent-foreground: @background; - alternate-urgent-background: @urgent-background; - alternate-urgent-foreground: @urgent-foreground; - selected-urgent-background: @gruvbox-dark-red-light; - selected-urgent-foreground: @urgent-foreground; -} - -@import "gruvbox-common.rasi" - From 0535f68752e740c414db65639216d780631c7f04 Mon Sep 17 00:00:00 2001 From: jasmine Date: Mon, 12 May 2025 09:58:09 +0800 Subject: [PATCH 3/5] fix unused imports, install dmenu --- home-manager/sajenim/features/desktop/default.nix | 2 -- nixos/common/users/sajenim/xmonad/default.nix | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/sajenim/features/desktop/default.nix b/home-manager/sajenim/features/desktop/default.nix index af0487b..1340f78 100644 --- a/home-manager/sajenim/features/desktop/default.nix +++ b/home-manager/sajenim/features/desktop/default.nix @@ -5,10 +5,8 @@ }: { imports = [ ./cava - ./dunst ./mpv ./picom - ./rofi ./wezterm ]; diff --git a/nixos/common/users/sajenim/xmonad/default.nix b/nixos/common/users/sajenim/xmonad/default.nix index 3230320..202356a 100644 --- a/nixos/common/users/sajenim/xmonad/default.nix +++ b/nixos/common/users/sajenim/xmonad/default.nix @@ -10,6 +10,8 @@ systemPackages = [ # Required for some XFCE/GTK stuff pkgs.dconf + # Dynamic menu for X + pkgs.dmenu # Picture viewer pkgs.xfce.ristretto # Install our XMonad and Xmobar configuration From 6c63ea48fb15b334147872669f2268cd0dc79b7b Mon Sep 17 00:00:00 2001 From: jasmine Date: Mon, 12 May 2025 09:58:36 +0800 Subject: [PATCH 4/5] chore: bump inputs --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index f538b66..f2670d0 100644 --- a/flake.lock +++ b/flake.lock @@ -406,11 +406,11 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -494,11 +494,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1745891977, - "narHash": "sha256-BYQSzHBiU5Fku0DZLDQYkm9xHNAv8DSbTUq6Y2jnKwc=", + "lastModified": 1746669743, + "narHash": "sha256-QxWruaCkxR4Qb8a9dGKvnxwu0y4WHZ/Ib+dDKWPOoNQ=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "0fac4e42dc31f712155c13ecc092af221ad409ae", + "rev": "195c6e72f08f4efcd0309c1c5a18305d93ed0567", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -602,11 +602,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -997,11 +997,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1746711743, - "narHash": "sha256-LqW1a5RJ2EED1MQLsjss2Z3NeshoQyuVdt+1RTb76sU=", + "lastModified": 1747014850, + "narHash": "sha256-kF0JEhlFXtsUuCnajxIehiTx2QzFX1u7UklgYrDtTew=", "ref": "refs/heads/master", - "rev": "f840b1d49e0061f81f58c067374421681ef4091c", - "revCount": 22, + "rev": "1c496f9adf0402ead829c2654d498b6e338c5883", + "revCount": 30, "type": "git", "url": "https://git.sajenim.dev/jasmine/xmonad-config.git" }, From fc61369b8912a2e1762f664dc51ba25daf0eb17b Mon Sep 17 00:00:00 2001 From: jasmine Date: Mon, 12 May 2025 09:58:53 +0800 Subject: [PATCH 5/5] install qmk --- home-manager/sajenim/features/cli/default.nix | 1 + nixos/fuchsia/hardware-configuration.nix | 1 + nixos/fuchsia/services/udev/default.nix | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/sajenim/features/cli/default.nix b/home-manager/sajenim/features/cli/default.nix index 0592bf7..514eae0 100644 --- a/home-manager/sajenim/features/cli/default.nix +++ b/home-manager/sajenim/features/cli/default.nix @@ -11,5 +11,6 @@ home.packages = with pkgs; [ pulsemixer + unstable.qmk ]; } diff --git a/nixos/fuchsia/hardware-configuration.nix b/nixos/fuchsia/hardware-configuration.nix index a7f7b76..ee33041 100644 --- a/nixos/fuchsia/hardware-configuration.nix +++ b/nixos/fuchsia/hardware-configuration.nix @@ -55,6 +55,7 @@ rocmPackages.clr.icd ]; }; + keyboard.qmk.enable = true; }; # Setup our filesystems diff --git a/nixos/fuchsia/services/udev/default.nix b/nixos/fuchsia/services/udev/default.nix index 3b17d92..2122e6e 100644 --- a/nixos/fuchsia/services/udev/default.nix +++ b/nixos/fuchsia/services/udev/default.nix @@ -3,6 +3,6 @@ services.udev.packages = with pkgs; [ android-udev-rules openrgb - qmk-udev-rules + unstable.qmk-udev-rules ]; }