diff --git a/flake.lock b/flake.lock index d52b663e..76d0e13c 100644 --- a/flake.lock +++ b/flake.lock @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1740617792, - "narHash": "sha256-abLwwwbgWxqCMpwa8oM7e4J12Q/BG7V86SqhMFnwWOk=", + "lastModified": 1740732706, + "narHash": "sha256-EJ4SDC9BihleEgwkf9EUmUYvi9yski5Sy/i8lEyBAzM=", "owner": "kittywitch", "repo": "konawall-py", - "rev": "a3beecbfaaebf786051ff5c23c4cdecc267f8d20", + "rev": "8e4f5895b06cea6f5461cba977a4d0317c024f89", "type": "github" }, "original": { diff --git a/home/environments/i3/i3.nix b/home/environments/i3/i3.nix index b1e83079..1f4dc34c 100644 --- a/home/environments/i3/i3.nix +++ b/home/environments/i3/i3.nix @@ -29,20 +29,34 @@ in { other_modifier = "Mod1"; mod = 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 { inherit modifier; - fonts = [ - "Monaspace Krypton" - "FontAwesome 6" - ]; + fonts = { + size = 10.0; + style = "Regular"; + names = [ + "Monaspace Krypton" + "FontAwesome 6" + ]; + }; startup = [ { command = "~/.screenlayout/main.sh"; } { command = "blueman-applet"; } ]; keybindings = let bindWorkspace = key: workspace: { - "${mod}+${key}" = "workspace number ${workspace}"; - "${mod}+shift+${key}" = "move container to workspace number ${workspace}"; + "${mod}+${key}" = "workspace number ${workspaceNamer workspace}"; + "${mod}+shift+${key}" = "move container to workspace number ${workspaceNamer workspace}"; }; mapDefaultAttrs = e: mapAttrs (_: mkDefault) e; 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)); normalBindings = { - "Print" = "exec --no-startup-id maim \"/home/$USER/Pictures/$(date)\""; - "${mod2}+Print" = "exec --no-startup-id maim --window $(xdotool getactivewindow) \"/home/$USER/Pictures/$(date)\""; - "Shift+Print" = "exec --no-startup-id maim --select \"/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/Screenshots/$(date).png\""; + "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+${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}"; }; in mkMerge (map mapDefaultAttrs ([ normalBindings ] ++ workspaceBindings)); + assigns = { + ${workspaceNamer 2} = [ + { + class = "^steam_app_default$"; + } + ]; + ${workspaceNamer 13} = [ + { + class = "^Spotify$"; + } + ]; + }; workspaceAutoBackAndForth = true; colors = { focused = { @@ -118,7 +144,7 @@ in { "FontAwesome 6 Free" "FontAwesome 6 Brands" ]; - size = "8"; + size = 10.0; }; colors = { background = "$base"; @@ -149,6 +175,9 @@ in { }; }; trayOutput = "primary"; + extraConfig = '' + strip_workspace_numbers yes + ''; statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${config.xdg.configHome}/i3status-rust/config-gaybar.toml"; } ]; diff --git a/home/environments/i3/konawall.nix b/home/environments/i3/konawall.nix index 26d2418a..3051e0dc 100644 --- a/home/environments/i3/konawall.nix +++ b/home/environments/i3/konawall.nix @@ -7,10 +7,12 @@ konawallConfig = { interval = 30 * 60; rotate = true; - source = "konachan"; + api_key = "odD1Jo17zKWBYq8kMciskPWf"; + source = "e621"; tags = [ #"rating:s" - "touhou" + #"touhou" + "-male" "score:>=50" "width:>=1500" ]; diff --git a/home/profiles/graphical/documents.nix b/home/profiles/graphical/documents.nix new file mode 100644 index 00000000..ba5eebf2 --- /dev/null +++ b/home/profiles/graphical/documents.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + calibre + okular + ]; +} diff --git a/home/profiles/graphical/intellij.nix b/home/profiles/graphical/intellij.nix deleted file mode 100644 index 64b0df1c..00000000 --- a/home/profiles/graphical/intellij.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - jetbrains.pycharm-community - ]; -} diff --git a/home/profiles/graphical/packages.nix b/home/profiles/graphical/packages.nix index bca8087c..78fc3d46 100644 --- a/home/profiles/graphical/packages.nix +++ b/home/profiles/graphical/packages.nix @@ -12,11 +12,8 @@ # Music spotify - strawberry-qt6 # Chat - fractal # Matrix - element-desktop tdesktop # Telegram dino # XMPP signal-desktop diff --git a/nixos/profiles/gaming/lutris.nix b/nixos/profiles/gaming/lutris.nix index 913e7267..a909760f 100644 --- a/nixos/profiles/gaming/lutris.nix +++ b/nixos/profiles/gaming/lutris.nix @@ -9,6 +9,7 @@ driversi686Linux.mesa ]; }; +programs.gamescope.enable = true; environment.systemPackages = with pkgs; [ (lutris.override { extraPkgs = pkgs: [