feat: i3 updates, ...

This commit is contained in:
Kat Inskip 2025-02-28 02:20:44 -08:00
parent c0fe107cfe
commit 3e73809781
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
7 changed files with 53 additions and 23 deletions

6
flake.lock generated
View file

@ -540,11 +540,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740617792, "lastModified": 1740732706,
"narHash": "sha256-abLwwwbgWxqCMpwa8oM7e4J12Q/BG7V86SqhMFnwWOk=", "narHash": "sha256-EJ4SDC9BihleEgwkf9EUmUYvi9yski5Sy/i8lEyBAzM=",
"owner": "kittywitch", "owner": "kittywitch",
"repo": "konawall-py", "repo": "konawall-py",
"rev": "a3beecbfaaebf786051ff5c23c4cdecc267f8d20", "rev": "8e4f5895b06cea6f5461cba977a4d0317c024f89",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -29,20 +29,34 @@ in {
other_modifier = "Mod1"; other_modifier = "Mod1";
mod = modifier; mod = modifier;
mod2 = other_modifier; mod2 = other_modifier;
workspaceNames = {
"1" = "";
"2" = "";
"11" = "";
"12" = "";
"13" = "";
};
workspaceNamer = num: let
numStr = builtins.toString num;
in if numStr ? workspaceNames then "${numStr}:${numStr} ${workspaceNames.numStr}" else "${numStr}:${numStr}";
in { in {
inherit modifier; inherit modifier;
fonts = [ fonts = {
"Monaspace Krypton" size = 10.0;
"FontAwesome 6" style = "Regular";
]; names = [
"Monaspace Krypton"
"FontAwesome 6"
];
};
startup = [ startup = [
{ command = "~/.screenlayout/main.sh"; } { command = "~/.screenlayout/main.sh"; }
{ command = "blueman-applet"; } { command = "blueman-applet"; }
]; ];
keybindings = let keybindings = let
bindWorkspace = key: workspace: { bindWorkspace = key: workspace: {
"${mod}+${key}" = "workspace number ${workspace}"; "${mod}+${key}" = "workspace number ${workspaceNamer workspace}";
"${mod}+shift+${key}" = "move container to workspace number ${workspace}"; "${mod}+shift+${key}" = "move container to workspace number ${workspaceNamer workspace}";
}; };
mapDefaultAttrs = e: mapAttrs (_: mkDefault) e; mapDefaultAttrs = e: mapAttrs (_: mkDefault) e;
workspaceBindings = workspaceBindings =
@ -54,9 +68,9 @@ in {
] ]
++ list.imap (i: v: bindWorkspace v "${toString (11 + i)}") (list.map (n: "F${builtins.toString n}") (std.list.range 1 12)); ++ list.imap (i: v: bindWorkspace v "${toString (11 + i)}") (list.map (n: "F${builtins.toString n}") (std.list.range 1 12));
normalBindings = { normalBindings = {
"Print" = "exec --no-startup-id maim \"/home/$USER/Pictures/$(date)\""; "Print" = "exec --no-startup-id maim \"/home/$USER/Pictures/$(date).png\"";
"${mod2}+Print" = "exec --no-startup-id maim --window $(xdotool getactivewindow) \"/home/$USER/Pictures/$(date)\""; "${mod2}+Print" = "exec --no-startup-id maim --window $(xdotool getactivewindow) \"/home/$USER/Pictures/Screenshots/$(date).png\"";
"Shift+Print" = "exec --no-startup-id maim --select \"/home/$USER/Pictures/$(date)\""; "Shift+Print" = "exec --no-startup-id maim --select \"/home/$USER/Pictures/Screenshots/$(date).png\"";
"Ctrl+Print" = "exec --no-startup-id maim | xclip -selection clipboard -t image/png"; "Ctrl+Print" = "exec --no-startup-id maim | xclip -selection clipboard -t image/png";
"Ctrl+${mod2}+Print" = "exec --no-startup-id maim --window $(xdotool getactivewindow) | xclip -selection clipboard -t image/png"; "Ctrl+${mod2}+Print" = "exec --no-startup-id maim --window $(xdotool getactivewindow) | xclip -selection clipboard -t image/png";
@ -69,6 +83,18 @@ in {
"${mod}+Shift+Tab" = "exec ${config.services.i3gopher.focus-last}"; "${mod}+Shift+Tab" = "exec ${config.services.i3gopher.focus-last}";
}; };
in mkMerge (map mapDefaultAttrs ([ normalBindings ] ++ workspaceBindings)); in mkMerge (map mapDefaultAttrs ([ normalBindings ] ++ workspaceBindings));
assigns = {
${workspaceNamer 2} = [
{
class = "^steam_app_default$";
}
];
${workspaceNamer 13} = [
{
class = "^Spotify$";
}
];
};
workspaceAutoBackAndForth = true; workspaceAutoBackAndForth = true;
colors = { colors = {
focused = { focused = {
@ -118,7 +144,7 @@ in {
"FontAwesome 6 Free" "FontAwesome 6 Free"
"FontAwesome 6 Brands" "FontAwesome 6 Brands"
]; ];
size = "8"; size = 10.0;
}; };
colors = { colors = {
background = "$base"; background = "$base";
@ -149,6 +175,9 @@ in {
}; };
}; };
trayOutput = "primary"; trayOutput = "primary";
extraConfig = ''
strip_workspace_numbers yes
'';
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${config.xdg.configHome}/i3status-rust/config-gaybar.toml"; statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${config.xdg.configHome}/i3status-rust/config-gaybar.toml";
} }
]; ];

View file

@ -7,10 +7,12 @@
konawallConfig = { konawallConfig = {
interval = 30 * 60; interval = 30 * 60;
rotate = true; rotate = true;
source = "konachan"; api_key = "odD1Jo17zKWBYq8kMciskPWf";
source = "e621";
tags = [ tags = [
#"rating:s" #"rating:s"
"touhou" #"touhou"
"-male"
"score:>=50" "score:>=50"
"width:>=1500" "width:>=1500"
]; ];

View file

@ -0,0 +1,6 @@
{ pkgs, ... }: {
home.packages = with pkgs; [
calibre
okular
];
}

View file

@ -1,5 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
jetbrains.pycharm-community
];
}

View file

@ -12,11 +12,8 @@
# Music # Music
spotify spotify
strawberry-qt6
# Chat # Chat
fractal # Matrix
element-desktop
tdesktop # Telegram tdesktop # Telegram
dino # XMPP dino # XMPP
signal-desktop signal-desktop

View file

@ -9,6 +9,7 @@
driversi686Linux.mesa driversi686Linux.mesa
]; ];
}; };
programs.gamescope.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(lutris.override { (lutris.override {
extraPkgs = pkgs: [ extraPkgs = pkgs: [