Compare commits

...

10 commits

Author SHA1 Message Date
7c09847c30 flake.lock: Update
Some checks failed
EVAL x86_64-linux.picard
BUILD x86_64-linux.picard
UPLOAD x86_64-linux.picard
DOWNLOAD x86_64-linux.picard
CACHIX x86_64-linux.picard
ATTIC x86_64-linux.picard
/ test (push) Successful in 16m15s
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/49f8aa791f81ff2402039b3efe0c35b9386c4bcf' (2025-01-06)
  → 'github:nix-community/disko/33827d2bd16bfe2e21b62956526c72d313595dfd' (2025-01-11)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/42b7368d193ad1939c32e87b48e970423f22f242' (2025-01-08)
  → 'github:nix-community/emacs-overlay/8e1fd211d50232c3227a6e7a555515e5b3d3e333' (2025-01-11)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d' (2025-01-04)
  → 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912' (2025-01-08)
• Updated input 'homeManager':
    'github:nix-community/home-manager/456e599f9101ed153dde268b4401c5d294ba6c8c' (2025-01-08)
  → 'github:nix-community/home-manager/2532b500c3ed2b8940e831039dcec5a5ea093afc' (2025-01-10)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=3413ab56292f12ac03ee49270bcaf16038020cb3' (2025-01-07)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=d953e138a20d222c8bdbbc2a138afe0e18f79338' (2025-01-10)
• Updated input 'nix-fast-build':
    'github:Mic92/nix-fast-build/a06a8b2c079f7b6dab491a12555387bdb737cc44' (2025-01-06)
  → 'github:Mic92/nix-fast-build/906af17fcd50c84615a4660d9c08cf89c01cef7d' (2025-01-11)
• Updated input 'nix-fast-build/flake-parts':
    'github:hercules-ci/flake-parts/f2f7418ce0ab4a5309a4596161d154cfc877af66' (2025-01-01)
  → 'github:hercules-ci/flake-parts/b905f6fc23a9051a6e1b741e1438dbfc0634c6de' (2025-01-06)
• Updated input 'nix-fast-build/treefmt-nix':
    'github:numtide/treefmt-nix/29806abab803e498df96d82dd6f34b32eb8dd2c8' (2025-01-03)
  → 'github:numtide/treefmt-nix/13c913f5deb3a5c08bb810efd89dc8cb24dd968b' (2025-01-06)
• Updated input 'nixDarwin':
    'github:LnL7/nix-darwin/ba9b3173b0f642ada42b78fb9dfc37ca82266f6c' (2025-01-05)
  → 'github:LnL7/nix-darwin/57733bd1dc81900e13438e5b4439239f1b29db0e' (2025-01-08)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/4f339f6be2b61662f957c2ee9eda0fa597d8a6d6' (2025-01-07)
  → 'github:NixOS/nixos-hardware/8870dcaff63dfc6647fb10648b827e9d40b0a337' (2025-01-09)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d' (2025-01-04)
  → 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912' (2025-01-08)
2025-01-11 15:01:46 +00:00
e0d5144389
Re-style waybar
Some checks failed
EVAL x86_64-linux.picard
BUILD x86_64-linux.picard
UPLOAD x86_64-linux.picard
DOWNLOAD x86_64-linux.picard
CACHIX x86_64-linux.picard
ATTIC x86_64-linux.picard
/ test (push) Successful in 30m25s
2025-01-10 20:51:00 +01:00
37de97df46
Use rofi-power-menu 2025-01-10 20:50:46 +01:00
66fd1c3066
Format 2025-01-10 20:43:25 +01:00
12f1800aed
Emacs experiments 2025-01-10 20:42:58 +01:00
0c4a52f6ec
Emacs default frame title 2025-01-10 20:42:46 +01:00
1411269c58
Move out the waybar config 2025-01-10 10:41:05 +01:00
8c18115208
Add math-preview executable used by the math-preview Emacs package 2025-01-10 10:40:37 +01:00
ba9775666b
Re-enable Sway Notification Center 2025-01-10 10:39:29 +01:00
12698af186
Add math-preview Emacs package 2025-01-10 10:39:18 +01:00
9 changed files with 201 additions and 220 deletions

68
flake.lock generated
View file

@ -117,11 +117,11 @@
]
},
"locked": {
"lastModified": 1736199437,
"narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=",
"lastModified": 1736591904,
"narHash": "sha256-LFO8pSrPKrH8OPq2HaAuBG5skk8/MNJ/9YmK3KsnSks=",
"owner": "nix-community",
"repo": "disko",
"rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf",
"rev": "33827d2bd16bfe2e21b62956526c72d313595dfd",
"type": "github"
},
"original": {
@ -156,11 +156,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1736327656,
"narHash": "sha256-vDli473KKyf13uexB4Ja9Jt7KmeUSbHbeuwIDP0M2yM=",
"lastModified": 1736586776,
"narHash": "sha256-UAt225bI+EmplGmmiWQHzXN18ZxaK2l3PfF/SV/Zldo=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "42b7368d193ad1939c32e87b48e970423f22f242",
"rev": "8e1fd211d50232c3227a6e7a555515e5b3d3e333",
"type": "github"
},
"original": {
@ -267,11 +267,11 @@
]
},
"locked": {
"lastModified": 1735774679,
"narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github"
},
"original": {
@ -582,11 +582,11 @@
]
},
"locked": {
"lastModified": 1736349537,
"narHash": "sha256-jE6CXoJLBmvuq9bWjv+EQusiEtSxPiNasWbD+N4575U=",
"lastModified": 1736508663,
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "456e599f9101ed153dde268b4401c5d294ba6c8c",
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
"type": "github"
},
"original": {
@ -687,11 +687,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1736275188,
"narHash": "sha256-IWu1aN1MeRCtx0PYIKTvG5iDSOx/JVegm4Y+0lAZGTE=",
"lastModified": 1736547794,
"narHash": "sha256-fNZm37beJ0ly8NW48bTsLqkxPWROueqvygp33njkxaw=",
"ref": "refs/heads/main",
"rev": "3413ab56292f12ac03ee49270bcaf16038020cb3",
"revCount": 16605,
"rev": "d953e138a20d222c8bdbbc2a138afe0e18f79338",
"revCount": 16608,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@ -776,11 +776,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1736168988,
"narHash": "sha256-jqH3cfg98+mRSB59WmJuWnvsSyOUNIOVZxf16Mh9/8s=",
"lastModified": 1736592044,
"narHash": "sha256-HkaJeIFgxncLm8MC1BaWRTkge9b1/+mjPcbzXTRshoM=",
"owner": "Mic92",
"repo": "nix-fast-build",
"rev": "a06a8b2c079f7b6dab491a12555387bdb737cc44",
"rev": "906af17fcd50c84615a4660d9c08cf89c01cef7d",
"type": "github"
},
"original": {
@ -864,11 +864,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1736085891,
"narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=",
"lastModified": 1736370755,
"narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c",
"rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
"type": "github"
},
"original": {
@ -900,11 +900,11 @@
},
"nixosHardware": {
"locked": {
"lastModified": 1736283893,
"narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=",
"lastModified": 1736441705,
"narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6",
"rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
"type": "github"
},
"original": {
@ -1087,11 +1087,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1736012469,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"lastModified": 1736344531,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github"
},
"original": {
@ -1164,11 +1164,11 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1736012469,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"lastModified": 1736344531,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github"
},
"original": {
@ -1497,11 +1497,11 @@
]
},
"locked": {
"lastModified": 1735905407,
"narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=",
"lastModified": 1736154270,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github"
},
"original": {

View file

@ -47,6 +47,7 @@ in
qadwaitadecorations
kdePackages.qtwayland
copilot-node-server
math-preview
]
++ (with hunspellDicts; [
en_US-large

View file

@ -56,6 +56,7 @@
(mouse-autoselect-window t)
(treesit-font-lock-level 4)
(custom-file "~/.config/emacs/custom.el")
(frame-title-format "%b - Emacs")
:config
(set-face-background 'vertical-border (face-background 'default))
(set-display-table-slot standard-display-table 'vertical-border (make-glyph-code ?┃))
@ -1020,7 +1021,7 @@ This is meant to be an helper to be called from the window manager."
"test"
(interactive)
(with-selected-frame
(make-frame '((name . "floating")
(make-frame '((name . "Emacs Selector")
(minibuffer . only)
(fullscreen . 0) ; no fullscreen
(undecorated . t) ; remove title bar

View file

@ -27,7 +27,7 @@ in
../waybar
../swayidle
../gammastep
# ../swaync
../swaync
../foot
];

View file

@ -280,26 +280,29 @@ window-rule {
}
window-rule {
geometry-corner-radius 4
clip-to-geometry true
geometry-corner-radius 4
clip-to-geometry true
}
window-rule {
match app-id=r#"^spotify$"#
open-maximized true
open-on-workspace "spotify"
match app-id=r#"^spotify$"#
open-maximized true
open-on-workspace "spotify"
}
window-rule {
match app-id=r#"^Slack$"#
open-maximized true
match app-id=r#"^Slack$"#
open-maximized true
}
window-rule {
match app-id=r#"^Element"#
open-maximized true
match app-id=r#"^Element"#
open-maximized true
}
window-rule {
match app-id=r#"^Emacs Selector$"#
}
@ -332,6 +335,7 @@ binds {
Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))"; }
Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
Super+Alt+L { spawn "swaylock"; }
Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
// Example volume keys mappings for PipeWire & WirePlumber.

View file

@ -0,0 +1,78 @@
{
"layer": "top",
"position": "left",
"width": 36,
"margin": "12 0 12 0",
"spacing": 2,
"modules-left": ["clock", "custom/sep", "niri/window"],
"modules-center": ["niri/workspaces"],
"modules-right": [
"tray",
"custom/sep",
"temperature",
"custom/sep",
"pulseaudio",
"custom/powermenu"
],
"custom/sep": {
"format": "──"
// "format": ""
},
"custom/powermenu": {
"on-click": "rofi -show menu -modi menu:rofi-power-menu",
"format": "",
"tooltip": false
},
"niri/workspaces": {
"format": "{icon}",
"on-click": "activate",
"format-icons": {
"active": "",
"urgent": "",
"default": ""
}
},
"niri/window": {
"rotate": 90,
"rewrite": {
"(.*) — Mozilla Firefox": " $1",
"(.*) - Emacs": " $1",
"(.*) - Slack": " $1"
}
},
"clock": {
"tooltip": true,
"format": "{:%H\n%M}",
"tooltip-format": "{:%Y-%m-%d}"
},
"tray": {
"icon-size": 20,
"spacing": 5,
"show-passive-items": "false"
},
"temperature": {
"rotate": 90,
"hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80,
"format": "{icon} {temperatureC}°C",
"format-icons": ["", "", ""]
},
"pulseaudio": {
"rotate": 90,
"format": "{icon} {volume}%",
"format-bluetooth": "{icon} {volume}%",
"format-muted": "MUTE ",
"format-icons": {
"headphones": "",
"handsfree": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": ["", ""]
},
"scroll-step": 3,
"on-click": "pavucontrol",
"on-click-right": "pactl set-source-mute @DEFAULT_SOURCE@ toggle"
}
}

View file

@ -7,144 +7,23 @@
programs.waybar = {
enable = true;
systemd.enable = true;
style = builtins.readFile ./style.css;
settings = {
mainBar = {
ipc = true;
layer = "top";
position = "top";
height = 30;
modules-left = [
"wlr/mode"
"hyprland/workspaces"
"niri/workspaces"
];
modules-center = [
"hyprland/window"
"niri/window"
];
modules-right = [
"network"
"tray"
"pulseaudio"
"cpu"
"memory"
"temperature"
"backlight"
"battery"
"clock"
];
"hyprland/workspaces" = {
all-outputs = true;
disable-scroll-wraparound = true;
# format = "{icon}";
on-click = "activate";
# format-icons = {
# "1" = "";
# "2" = "";
# "3" = "";
# "9" = "ﬧ";
# urgent = "";
# };
# sort-by-number = true;
};
"wlr/mode" = {
tooltip = false;
};
"wlr/window" = {
max_length = 50;
};
tray = {
spacing = 10;
};
battery = {
format = "{capacity}% {icon}";
format-alt = "{time} {icon}";
format-charging = "{capacity}% ";
format-icons = [
" "
" "
" "
" "
" "
];
format-plugged = "{capacity}% ";
states = {
critical = 15;
warning = 30;
};
};
clock = {
format-alt = "{:%Y-%m-%d}";
tooltip-format = "{:%Y-%m-%d | %H:%M}";
};
cpu = {
format = "{usage}% ";
tooltip = false;
};
memory = {
format = "{}% ";
};
network = {
interval = 1;
format-alt = "{ifname}: {ipaddr}/{cidr}";
format-disconnected = "Disconnected ";
format-ethernet = "{ifname}: {ipaddr}/{cidr} 󰈀 up: {bandwidthUpBits:>4} down: {bandwidthDownBits:>4}";
format-linked = "{ifname} (No IP) ";
format-wifi = "{essid} ({signalStrength}%) {ipaddr}/{cidr} up: {bandwidthUpBits:>4} down: {bandwidthDownBits:>4}";
};
pulseaudio = {
format = "{volume}% {icon} {format_source}";
format-bluetooth = "{volume}% {icon} {format_source}";
format-bluetooth-muted = " {icon} {format_source}";
format-icons = {
car = "";
default = [
" "
" "
" "
];
handsfree = "";
headphones = " ";
headset = "";
phone = "";
portable = "";
};
format-muted = " {format_source}";
format-source = "{volume}% ";
format-source-muted = "";
on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
};
"wlr/mode" = {
format = ''<span style="italic">{}</span>'';
};
temperature = {
critical-threshold = 80;
format = "{temperatureC}°C {icon}";
format-icons = [
""
""
""
];
hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input"; # picard FIXME
# hwmon-path = "/sys/class/thermal/thermal_zone4/temp"; # thinkpad
};
backlight = {
device = "ddcci2";
format = "{percent}% {icon}";
format-icons = [
" "
" "
];
};
};
};
};
catppuccin.waybar.enable = lib.mkForce false;
home.activation.linkWaybarConfig = lib.hm.dag.entryAnywhere ''
if [ ! -d "$HOME/.config/waybar" ]; then
$DRY_RUN_CMD mkdir -p "$HOME/.config/waybar"
$DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/waybar/config.json" "$HOME/.config/waybar/config"
$DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/waybar/style.css" "$HOME/.config/waybar/style.css"
fi
'';
home.packages = with pkgs; [
rofi-power-menu
];
# waybar needs the hyprctl binary in PATH when started in hyprland
# TODO still needed?
systemd.user.services.waybar.Service.Environment = "PATH=${lib.makeBinPath [ pkgs.hyprland ]}";
}

View file

@ -1,54 +1,71 @@
* {
border: none;
border-radius: 0;
min-height: 0;
font-family: Fira Code;
font-family: "Iosevka Comfy", "FontAwesome", "Nerd Font";
font-size: 1.35rem;
font-weight: 600;
background: none;
}
window#waybar {
background: rgba(255, 255, 255, 0.05);
color: white;
font-size: 1.2rem;
color: #a5adcb;
background-color: #181926;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}
.modules-left,
.modules-right,
.modules-center {
padding: 12px 4px;
}
#workspaces button {
padding: 0 10px;
background: transparent;
color: white;
font-size: 2rem;
tooltip {
color: #a5adcb;
background-color: #181926;
text-shadow: none;
}
#workspaces button.active {
box-shadow: inset 0 -5px red;
tooltip * {
color: #a5adcb;
text-shadow: none;
}
#workspaces button.focused,
#custom-sep {
color: #494d64;
}
#workspaces button:hover {
box-shadow: inset 0 -5px white;
box-shadow: inherit;
text-shadow: inherit;
}
#workspaces button {
color: #5b6078;
background: none;
padding: 0;
}
#workspaces button:hover {
color: #a6da95;
}
#workspaces button.active {
color: #f5bde6;
}
#temperature {
color: #eed49f;
}
#clock {
font-weight: 600;
color: #8bd5ca;
}
#custom-bluetooth_devices {
color: #8aadf4;
}
#pulseaudio {
color: #a6da95;
}
#pulseaudio.muted {
color: #ed8796;
}
#workspaces button.urgent {
/* background: @theme_fg_color; */
/* color: @theme_selected_bg_color; */
}
#mode {
margin: 0 4px;
padding: 0 4px;
/* background: @theme_fg_color; */
/* color: @unfocused_borders; */
}
#pulseaudio,
#network,
#cpu,
#memory,
#disk,
#temperature,
#battery,
#language,
#clock,
#tray {
margin: 0 4px;
padding: 0 2px;
#custom-powermenu {
margin: 12px 0 0 0;
color: #6e738d;
}

View file

@ -164,6 +164,7 @@ let
terraform-mode
diredfl
org-modern
math-preview
org-roam
org-roam-ql
org-roam-ui