Compare commits
4 Commits
b19b1a8fcc
...
4c0add9c7b
Author | SHA1 | Date | |
---|---|---|---|
4c0add9c7b | |||
715b67db90 | |||
99baccad32 | |||
9e0e63dd48 |
70
flake.lock
generated
70
flake.lock
generated
@ -263,24 +263,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1714641030,
|
|
||||||
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": [
|
"systems": [
|
||||||
@ -751,18 +733,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1714640452,
|
|
||||||
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740743217,
|
"lastModified": 1740743217,
|
||||||
@ -875,22 +845,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1715534503,
|
|
||||||
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nur": {
|
"nur": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
@ -948,8 +902,7 @@
|
|||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"stylix": "stylix",
|
"stylix": "stylix"
|
||||||
"tlock": "tlock"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
@ -1117,27 +1070,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tlock": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts_2",
|
|
||||||
"nixpkgs": "nixpkgs_8"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1716429453,
|
|
||||||
"narHash": "sha256-6raIb7D7B/KQtKy63ixVRAJ7AN30JI7w/XGI2W8fuRk=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "5091452ae294c4b424293ae4ffdcdbc8f04601fb",
|
|
||||||
"revCount": 343,
|
|
||||||
"submodules": true,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/eklairs/tlock"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"submodules": true,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/eklairs/tlock"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
stylix.url = "github:danth/stylix";
|
stylix.url = "github:danth/stylix";
|
||||||
ags.url = "github:Aylur/ags";
|
ags.url = "github:Aylur/ags";
|
||||||
ayugram-desktop.url = "github:/ayugram-port/ayugram-desktop/release?submodules=1";
|
ayugram-desktop.url = "github:/ayugram-port/ayugram-desktop/release?submodules=1";
|
||||||
tlock.url = "git+https://github.com/eklairs/tlock?submodules=1";
|
|
||||||
|
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
hyprland-plugins = {
|
hyprland-plugins = {
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./user/kitty.nix
|
|
||||||
./user/qt.nix
|
./user/qt.nix
|
||||||
./user/sops.nix
|
./user/sops.nix
|
||||||
./user/neofetch.nix
|
./user/neofetch.nix
|
||||||
@ -12,6 +11,7 @@
|
|||||||
./user/btop.nix
|
./user/btop.nix
|
||||||
./user/wofi.nix
|
./user/wofi.nix
|
||||||
./user/mako.nix
|
./user/mako.nix
|
||||||
|
./user/ghostty.nix
|
||||||
./user/packages/art.nix
|
./user/packages/art.nix
|
||||||
./user/packages/desktop.nix
|
./user/packages/desktop.nix
|
||||||
./user/packages/coding.nix
|
./user/packages/coding.nix
|
||||||
|
@ -16,6 +16,10 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
pulsemixer
|
||||||
|
];
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings.exec-once = [ "ags run" ];
|
wayland.windowManager.hyprland.settings.exec-once = [ "ags run" ];
|
||||||
|
|
||||||
xdg.configFile."ags".source = (pkgs.callPackage ./packages/drvs/ags.nix { colors = config.lib.stylix.colors; });
|
xdg.configFile."ags".source = (pkgs.callPackage ./packages/drvs/ags.nix { colors = config.lib.stylix.colors; });
|
||||||
|
11
modules/user/ghostty.nix
Normal file
11
modules/user/ghostty.nix
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
programs.ghostty = {
|
||||||
|
enable = true;
|
||||||
|
enableZshIntegration = true;
|
||||||
|
settings = {
|
||||||
|
confirm-close-surface = false;
|
||||||
|
copy-on-select = false;
|
||||||
|
title-report = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,14 +0,0 @@
|
|||||||
{ lib, pkgs, ... }: {
|
|
||||||
programs.kitty = {
|
|
||||||
enable = true;
|
|
||||||
settings = lib.mkDefault {
|
|
||||||
dynamic_background_opacity = "yes";
|
|
||||||
background_opacity = 0.5;
|
|
||||||
background_blur = true;
|
|
||||||
background = "#1d2021";
|
|
||||||
font_size = 13.0;
|
|
||||||
cursor_blink_interval = "0.5 ease-in-out";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
programs.zsh.envExtra = "TERM=xterm-256color";
|
|
||||||
}
|
|
@ -1,11 +1,16 @@
|
|||||||
import { bind } from "astal"
|
import { bind } from "astal"
|
||||||
|
import { execAsync } from "astal/process"
|
||||||
import Wp from "gi://AstalWp"
|
import Wp from "gi://AstalWp"
|
||||||
|
|
||||||
export default function Audio() {
|
export default function Audio() {
|
||||||
const speaker = Wp.get_default()?.audio.defaultSpeaker!
|
const speaker = Wp.get_default()?.audio.defaultSpeaker!
|
||||||
|
|
||||||
return <box className="AudioSlider">
|
return <button
|
||||||
|
className="AudioSlider"
|
||||||
|
onClicked={() => { execAsync("ghostty --title=pulsemixer -e pulsemixer") }}>
|
||||||
|
<box>
|
||||||
<icon icon={bind(speaker, "volumeIcon")} />
|
<icon icon={bind(speaker, "volumeIcon")} />
|
||||||
<label label={bind(speaker, "volume").as(v => `${Math.floor(v*100)}%`)} />
|
<label label={bind(speaker, "volume").as(v => `${Math.floor(v*100)}%`)} />
|
||||||
</box>
|
</box>
|
||||||
|
</button>
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@ export default function Wifi() {
|
|||||||
{wifi.as(wifi => wifi && (
|
{wifi.as(wifi => wifi && (
|
||||||
<button
|
<button
|
||||||
className="Wifi"
|
className="Wifi"
|
||||||
onClicked={() => {execAsync("kitty nmtui")}}>
|
onClicked={() => {execAsync("ghostty --title=nmtui -e nmtui")}}>
|
||||||
<box>
|
<box>
|
||||||
<icon
|
<icon
|
||||||
tooltipText={bind(wifi, "ssid").as(String)}
|
tooltipText={bind(wifi, "ssid").as(String)}
|
||||||
|
@ -13,10 +13,12 @@
|
|||||||
gparted
|
gparted
|
||||||
git-lfs
|
git-lfs
|
||||||
unrar
|
unrar
|
||||||
inputs.tlock.packages.${system}.default
|
|
||||||
hexyl
|
hexyl
|
||||||
jq
|
jq
|
||||||
litecli
|
litecli
|
||||||
trashy
|
trashy
|
||||||
|
dig
|
||||||
|
mtr
|
||||||
|
imagemagick
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ pkgs, lib, config, collection, swww_flags, inputs }: {
|
{ pkgs, lib, config, collection, swww_flags, inputs }: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
kitty
|
ghostty
|
||||||
pamixer
|
pamixer
|
||||||
wofi
|
wofi
|
||||||
clipse
|
clipse
|
||||||
@ -130,8 +130,10 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
windowrulev2 = [
|
windowrulev2 = [
|
||||||
"float, class:(clipse)"
|
"float, title:(nmtui)"
|
||||||
"size 622 652, class:(clipse)"
|
"float, title:(pulsemixer)"
|
||||||
|
"float, title:(clipse)"
|
||||||
|
"size 622 652, title:(clipse)"
|
||||||
];
|
];
|
||||||
|
|
||||||
exec-once = [
|
exec-once = [
|
||||||
@ -144,12 +146,12 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
bind = [
|
bind = [
|
||||||
"$mainMod, V, exec, kitty --class clipse -e clipse"
|
"$mainMod, V, exec, ghostty --title=clipse -e clipse"
|
||||||
|
|
||||||
"$mainMod, Return, exec, kitty"
|
"$mainMod, Return, exec, ghostty"
|
||||||
"$mainMod, Q, killactive,"
|
"$mainMod, Q, killactive,"
|
||||||
"$mainMod, M, exit,"
|
"$mainMod, M, exit,"
|
||||||
"$mainMod, E, exec, kitty -e sh -c yazi"
|
"$mainMod, E, exec, ghostty -e sh -c yazi"
|
||||||
"$mainMod, F, togglefloating,"
|
"$mainMod, F, togglefloating,"
|
||||||
"$mainMod, D, exec, wofi --show drun"
|
"$mainMod, D, exec, wofi --show drun"
|
||||||
"$mainMod, P, pseudo, # dwindle"
|
"$mainMod, P, pseudo, # dwindle"
|
||||||
@ -204,8 +206,8 @@
|
|||||||
"$mainMod, mouse_up, workspace, e-1"
|
"$mainMod, mouse_up, workspace, e-1"
|
||||||
|
|
||||||
# Keyboard backlight
|
# Keyboard backlight
|
||||||
"$mainMod, F3, exec, brightnessctl -d *::kbd_backlight set +33%"
|
"$mainMod, F3, exec, ${lib.getExe pkgs.brightnessctl} -d *::kbd_backlight set +33%"
|
||||||
"$mainMod, F2, exec, brightnessctl -d *::kbd_backlight set 33%-"
|
"$mainMod, F2, exec, ${lib.getExe pkgs.brightnessctl} -d *::kbd_backlight set 33%-"
|
||||||
|
|
||||||
# Volume and Media Control
|
# Volume and Media Control
|
||||||
", XF86AudioRaiseVolume, exec, pamixer -i 5 "
|
", XF86AudioRaiseVolume, exec, pamixer -i 5 "
|
||||||
@ -214,8 +216,8 @@
|
|||||||
", XF86AudioMicMute, exec, pamixer --default-source -m"
|
", XF86AudioMicMute, exec, pamixer --default-source -m"
|
||||||
|
|
||||||
# Brightness control
|
# Brightness control
|
||||||
", XF86MonBrightnessDown, exec, brightnessctl set 5%- "
|
", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} set 5%- "
|
||||||
", XF86MonBrightnessUp, exec, brightnessctl set +5% "
|
", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} set +5% "
|
||||||
|
|
||||||
# Waybar
|
# Waybar
|
||||||
"$mainMod, B, exec, pkill -SIGUSR1 waybar"
|
"$mainMod, B, exec, pkill -SIGUSR1 waybar"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user