Switch to vicinae
This commit is contained in:
parent
d92f99bc5c
commit
3260a9771d
77
flake.lock
77
flake.lock
|
|
@ -132,11 +132,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764636297,
|
"lastModified": 1764912896,
|
||||||
"narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=",
|
"narHash": "sha256-ftxQocr098v5ngqB3SXa9tW6aqovBSBOEdIRcLEj44c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827",
|
"rev": "6bcb2395ab9ed05616052262da526cd7c5b4b123",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -184,11 +184,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764517877,
|
"lastModified": 1764667669,
|
||||||
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
"rev": "418468ac9527e799809c900eda37cbff999199b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -200,11 +200,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764517877,
|
"lastModified": 1764667669,
|
||||||
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
"rev": "418468ac9527e799809c900eda37cbff999199b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -215,6 +215,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1762111121,
|
||||||
|
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730200266,
|
"lastModified": 1730200266,
|
||||||
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
||||||
|
|
@ -236,11 +252,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764683664,
|
"lastModified": 1764912878,
|
||||||
"narHash": "sha256-Mr5HKf/bjAJ8H7/H0qJSk2BEV/OILkDIFKrGK0dUVUk=",
|
"narHash": "sha256-Wk/ZdwaC2215wh4ivsbGKWeZ91GHNYMZa5tLezZEiDE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "b8b40e258cf4c959b06b7322648c87674633629b",
|
"rev": "6920615d6c99049c67e686805b09c0d2fc760474",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -258,13 +274,48 @@
|
||||||
"nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor",
|
"nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
|
"vicinae": "vicinae",
|
||||||
"worktimer": "worktimer"
|
"worktimer": "worktimer"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"vicinae": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs_4",
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1765272078,
|
||||||
|
"narHash": "sha256-etv2HJA9OWvTkjnrjaNSqvebu9gWLIGPYb9PWr4qkfM=",
|
||||||
|
"owner": "vicinaehq",
|
||||||
|
"repo": "vicinae",
|
||||||
|
"rev": "32cf6b1f82e007cddba9c9ae037eff670219cd55",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "vicinaehq",
|
||||||
|
"repo": "vicinae",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"worktimer": {
|
"worktimer": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_3",
|
"flake-parts": "flake-parts_3",
|
||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739738223,
|
"lastModified": 1739738223,
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
};
|
};
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||||
|
vicinae.url = "github:vicinaehq/vicinae";
|
||||||
worktimer = {
|
worktimer = {
|
||||||
type = "git";
|
type = "git";
|
||||||
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
||||||
|
|
@ -40,15 +41,17 @@
|
||||||
]; }
|
]; }
|
||||||
{
|
{
|
||||||
networking.hostName = host;
|
networking.hostName = host;
|
||||||
time.timeZone = "Asia/Bangkok";
|
time.timeZone = "Europe/Brussels";
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://cuda-maintainers.cachix.org"
|
"https://cuda-maintainers.cachix.org"
|
||||||
|
"https://vicinae.cachix.org"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||||
|
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
|
||||||
];
|
];
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
experimental-features = [ "nix-command" "flakes" ];
|
||||||
trusted-users = [ "root" user ];
|
trusted-users = [ "root" user ];
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ in
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# jetbrains.pycharm-professional
|
# jetbrains.pycharm-professional
|
||||||
|
rclone
|
||||||
zed-editor
|
zed-editor
|
||||||
distrobox
|
distrobox
|
||||||
gnome-disk-utility
|
gnome-disk-utility
|
||||||
|
|
@ -31,21 +32,11 @@ in
|
||||||
smile
|
smile
|
||||||
];
|
];
|
||||||
|
|
||||||
services.hyprpaper = {
|
|
||||||
settings = {
|
|
||||||
wallpaper = [
|
|
||||||
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
|
|
||||||
"DP-1,${./hyprland/files/wallpaper.png}"
|
|
||||||
"eDP-1,${./hyprland/files/wallpaper.png}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
wayland.windowManager.hyprland.settings = {
|
wayland.windowManager.hyprland.settings = {
|
||||||
monitor = [
|
monitor = [
|
||||||
"eDP-1,2880x1800@120.00Hz,0x284,1.2,vrr,1"
|
"eDP-1,2880x1800@120.00Hz,480x0,1.2,vrr,1"
|
||||||
"DP-1,1920x1080,6240x500,1"
|
"DP-1,1920x1080,6240x500,1"
|
||||||
"HDMI-A-1,3840x2160@60.00Hz,2400x0,1"
|
"HDMI-A-1,3840x2160@60.00Hz,0x-2160,1"
|
||||||
];
|
];
|
||||||
bind = [
|
bind = [
|
||||||
", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
|
", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
|
||||||
|
|
|
||||||
|
|
@ -7,17 +7,7 @@ let
|
||||||
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
||||||
terminal-name = "foot";
|
terminal-name = "foot";
|
||||||
terminal = "${pkgs.foot}/bin/footclient";
|
terminal = "${pkgs.foot}/bin/footclient";
|
||||||
rofi = "${pkgs.rofi}/bin/rofi";
|
|
||||||
jq = "${pkgs.jq}/bin/jq";
|
jq = "${pkgs.jq}/bin/jq";
|
||||||
rofi-ykman = pkgs.writeShellScriptBin "rofi-ykman" ''
|
|
||||||
accounts=$(${pkgs.yubikey-manager}/bin/ykman oath accounts list)
|
|
||||||
prompt="YubiKey OATH"
|
|
||||||
account=$(echo "''${accounts/, TOTP/\n}" | awk '{ print $0 "\0icon\x1fyubioath"; }' | ${rofi} -dmenu -i -p "$prompt" ''${shortcuts[@]})
|
|
||||||
code=$(${pkgs.yubikey-manager}/bin/ykman oath accounts code "$account")
|
|
||||||
IFS=', ' read -r -a code <<< "$code"
|
|
||||||
echo -n "''${code[-1]}" | ${pkgs.wl-clipboard}/bin/wl-copy;
|
|
||||||
'';
|
|
||||||
|
|
||||||
# workspace_command_prefix = "split-";
|
# workspace_command_prefix = "split-";
|
||||||
# hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ];
|
# hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ];
|
||||||
|
|
||||||
|
|
@ -81,12 +71,11 @@ in {
|
||||||
services.hyprpaper = {
|
services.hyprpaper = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
ipc = "off";
|
ipc = "on";
|
||||||
splash = false;
|
splash = false;
|
||||||
preload = [ "${./files/wallpaper.png}" ];
|
preload = [ "${./files/wallpaper.png}" ];
|
||||||
wallpaper = [
|
wallpaper = [
|
||||||
# Fill in by host-specific config!
|
",${./files/wallpaper.png}"
|
||||||
# "Display,${./files/wallpaper.png}"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -136,8 +125,6 @@ in {
|
||||||
"hyprpaper"
|
"hyprpaper"
|
||||||
"foot --server"
|
"foot --server"
|
||||||
"hyprctl dispatch exec ags run"
|
"hyprctl dispatch exec ags run"
|
||||||
"${wl-paste} --type text --watch cliphist store"
|
|
||||||
"${wl-paste} --type image --watch cliphist store"
|
|
||||||
"${pkgs.mate.mate-polkit}/bin/polkit-mate"
|
"${pkgs.mate.mate-polkit}/bin/polkit-mate"
|
||||||
];
|
];
|
||||||
env = [
|
env = [
|
||||||
|
|
@ -161,7 +148,7 @@ in {
|
||||||
"bordersize 0, floating:0, onworkspace:f[1]"
|
"bordersize 0, floating:0, onworkspace:f[1]"
|
||||||
"rounding 0, floating:0, onworkspace:f[1]"
|
"rounding 0, floating:0, onworkspace:f[1]"
|
||||||
];
|
];
|
||||||
layerrule = [ "noanim,ags_bar_0" "noanim,selection" ];
|
layerrule = [ "noanim,ags_bar_0" "noanim,selection" "blur,vicinae" "ignorealpha 0, vicinae" "noanim, vicinae"];
|
||||||
general = {
|
general = {
|
||||||
gaps_in = 1;
|
gaps_in = 1;
|
||||||
gaps_out = pkgs.lib.mkDefault 5;
|
gaps_out = pkgs.lib.mkDefault 5;
|
||||||
|
|
@ -223,7 +210,7 @@ in {
|
||||||
"f[1], gapsout:0, gapsin:0"
|
"f[1], gapsout:0, gapsin:0"
|
||||||
];
|
];
|
||||||
bindr = [
|
bindr = [
|
||||||
"$mainMod, $mainMod, exec, pkill rofi || ${rofi} -show drun"
|
"$mainMod, $mainMod, exec, vicinae toggle"
|
||||||
];
|
];
|
||||||
bindm = [
|
bindm = [
|
||||||
"$mainMod, mouse:272, movewindow"
|
"$mainMod, mouse:272, movewindow"
|
||||||
|
|
@ -247,11 +234,8 @@ in {
|
||||||
"$mainMod, F, togglefloating,"
|
"$mainMod, F, togglefloating,"
|
||||||
"$mainMod, SPACE, togglesplit, # dwindle"
|
"$mainMod, SPACE, togglesplit, # dwindle"
|
||||||
"CONTROL_L ALT_L, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
"CONTROL_L ALT_L, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
||||||
''$mainMod, C, exec, cliphist list | awk '{print $0, "\0icon\x1fcom.github.davidmhewitt.clipped"; }' | ${rofi} -dmenu -display-columns 2 | cliphist decode | wl-copy''
|
"$mainMod, C, exec, vicinae vicinae://extensions/vicinae/clipboard/history"
|
||||||
"$mainMod, Y, exec, ${rofi-ykman}/bin/rofi-ykman"
|
"$mainMod, W, exec, vicinae vicinae://extensions/vicinae/wm/switch-windows"
|
||||||
"$mainMod, N, exec, ${./files/rofi-ssh.sh}"
|
|
||||||
"$mainMod, Escape, exec, ${rofi} -show power-menu -modi power-menu:${ ./files/rofi-power-menu.sh }"
|
|
||||||
|
|
||||||
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%"
|
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%"
|
||||||
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-"
|
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-"
|
||||||
",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0"
|
",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0"
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
(import ../hyprland { inherit inputs pkgs; })
|
(import ../hyprland { inherit inputs pkgs; })
|
||||||
(import ../ags { inherit inputs pkgs; })
|
(import ../ags { inherit inputs pkgs; })
|
||||||
../rofi
|
../rofi
|
||||||
|
../vicinae
|
||||||
../alacritty
|
../alacritty
|
||||||
../foot
|
../foot
|
||||||
../kitty
|
../kitty
|
||||||
|
|
@ -78,8 +79,6 @@
|
||||||
package = pkgs.adwaita-icon-theme;
|
package = pkgs.adwaita-icon-theme;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.cliphist = { enable = true; };
|
|
||||||
|
|
||||||
services.mpris-proxy.enable = true; # Bluetooth media control
|
services.mpris-proxy.enable = true; # Bluetooth media control
|
||||||
|
|
||||||
xdg.mimeApps = {
|
xdg.mimeApps = {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
{ inputs, ... }: # Add inputs here
|
||||||
|
{
|
||||||
|
# Import the module definition here
|
||||||
|
imports = [ inputs.vicinae.homeManagerModules.default ];
|
||||||
|
|
||||||
|
services.vicinae = {
|
||||||
|
enable = true;
|
||||||
|
autoStart = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue