commit b5ff84d5179a65593737c29f56ae68d03e393c67
parent c73fcf72e088d0da6ed44c6fd661d23e4ae17e08
Author: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 5 Sep 2024 00:08:14 +0200
users/vincent: big cleanup
- remove a lot of files I do not need anymore
- also removes some packages I don't use that much
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
16 files changed, 4 insertions(+), 1133 deletions(-)
diff --git a/users/vincent/desktop/alacritty.nix b/users/vincent/desktop/alacritty.nix
@@ -1,94 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- programs.alacritty = {
- enable = true;
- settings = {
- env.TERM = "xterm-256color";
- font = {
- normal = {
- family = "Ubuntu Mono";
- style = "Regular";
- };
- bold = {
- family = "Ubuntu Mono";
- style = "Bold";
- };
- italic = {
- family = "Ubuntu Mono";
- style = "Italic";
- };
- size = 11;
- };
- colors = {
- primary = {
- background = "0x0A0E14";
- foreground = "0xB3B1AD";
- };
- normal = {
- black = "0x01060E";
- blue = "0x53BDFA";
- cyan = "0x90E1C6";
- green = "0x91B362";
- magenta = "0xFAE994";
- red = "0xEA6C73";
- white = "0xC7C7C7";
- yellow = "0xF9AF4F";
- };
- bright = {
- black = "0x686868";
- blue = "0x59C2FF";
- cyan = "0x95E6CB";
- green = "0xC2D94C";
- magenta = "0xFFEE99";
- red = "0xF07178";
- white = "0xFFFFFF";
- yellow = "0xFFB454";
- };
- };
- shell.program = "${pkgs.zsh}/bin/zsh";
- key_bindings = [
- {
- key = "V";
- mods = "Control|Shift";
- action = "Paste";
- }
- {
- key = "C";
- mods = "Control|Shift";
- action = "Copy";
- }
- {
- key = "Insert";
- mods = "Shift";
- action = "PasteSelection";
- }
- {
- key = "Key0";
- mods = "Control";
- action = "ResetFontSize";
- }
- {
- key = "Equals";
- mods = "Control";
- action = "IncreaseFontSize";
- }
- {
- key = "Plus";
- mods = "Control";
- action = "IncreaseFontSize";
- }
- {
- key = "Minus";
- mods = "Control";
- action = "DecreaseFontSize";
- }
- {
- key = "Return";
- mods = "Alt";
- action = "ToggleFullscreen";
- }
- ];
- };
- };
-}
diff --git a/users/vincent/desktop/autorandr.nix b/users/vincent/desktop/autorandr.nix
@@ -1,76 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
- # To get fingerprint : autorandr --fingerprint
- lg_ultrawide_curved = "00ffffffffffff001e6df6760cd105000a1b010380502278eaca95a6554ea1260f50542108007140818081c0a9c0b300d1c081000101e77c70a0d0a0295030203a00204f3100001a9d6770a0d0a0225030203a00204f3100001a000000fd00383d1e5a20000a202020202020000000fc004c4720554c545241574944450a012902031ef12309070749100403011f13595a128301000067030c00200038409f3d70a0d0a0155030203a00204f3100001a7e4800e0a0381f4040403a00204f31000018011d007251d01e206e285500204f3100001e8c0ad08a20e02d10103e9600204f31000018000000ff003731304e544a4a42373139360a0000000000000023";
- thinkpadt480s = "00ffffffffffff000daec91400000000081a0104951f11780228659759548e271e505400000001010101010101010101010101010101b43b804a71383440503c680035ad10000018000000fe004e3134304843412d4541420a20000000fe00434d4e0a202020202020202020000000fe004e3134304843412d4541420a20003e";
- thinkpadp1 = "00ffffffffffff000dae0c15000000002a1c0104b522137802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820405036680058c110000018363680a0703820405036680058c110000018000000fe00434d4e0a202020202020202020000000fe004e3135364843452d474e310a2001d102030f00e3058000e60605016a6a2400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005435313343363031415230320000000000000000000000000000000000de";
-in
-{
- programs.autorandr = {
- enable = true;
- hooks.postswitch."notify-i3" = "${config.xsession.windowManager.i3.package}/bin/i3-msg restart";
- hooks.postswitch."reset-background" = "systemctl --user start random-background.service";
- profiles = {
- p1-on-the-move = {
- fingerprint = {
- eDP-1 = thinkpadp1;
- };
- config = {
- eDP-1 = {
- enable = true;
- primary = true;
- position = "0x0";
- mode = "1920x1080";
- };
- };
- };
- p1-home = {
- fingerprint = {
- eDP-1 = thinkpadp1;
- DP-3-1 = lg_ultrawide_curved;
- };
- config = {
- eDP-1 = {
- enable = false;
- };
- DP-3-1 = {
- enable = true;
- primary = true;
- mode = "3440x1440";
- position = "0x0";
- };
- };
- };
- t480-on-the-move = {
- fingerprint = {
- eDP-1 = thinkpadt480s;
- };
- config = {
- eDP-1 = {
- enable = true;
- primary = true;
- position = "0x0";
- mode = "1920x1080";
- };
- };
- };
- t480-home = {
- fingerprint = {
- eDP-1 = thinkpadt480s;
- DP-1-1 = lg_ultrawide_curved;
- };
- config = {
- eDP-1 = {
- enable = false;
- };
- DP-1-1 = {
- enable = true;
- primary = true;
- mode = "3440x1440";
- position = "0x0";
- };
- };
- };
- };
- };
-}
diff --git a/users/vincent/desktop/dconf.nix b/users/vincent/desktop/dconf.nix
@@ -1,110 +0,0 @@
-{ lib, ... }:
-let
- mkTuple = lib.hm.gvariant.mkTuple;
-in
-{
- dconf.settings = {
- # Interface
- "org/gnome/desktop/interface" = {
- clock-show-date = true;
- clock-show-seconds = false;
- clock-show-weekday = true;
- # enable-animations=false;
- monospace-font-name = "Ubuntu Mono 13";
- show-battery-percentage = true;
- toolkit-accessibility = false;
- };
- # Inputs
- "org/gnome/desktop/input-sources" = {
- "current" = "uint32 0";
- "sources" = [ (mkTuple [ "xkb" "fr+bepo" ]) (mkTuple [ "xkb" "us" ]) ];
- "xkb-options" = [ "lv3:ralt_switch" "caps:ctrl_modifier" ];
- };
- # Window manager
- "org/gnome/desktop/wm/keybindings" = {
- activate-window-menu = [ "<Shift><Alt>nobreakspace" ];
- close = [ "<Shift><Super>b" ];
- panel-run-dialog = [ "<Super>j" ];
- switch-applications = [ "<Alt>Tab" ];
- switch-applications-backward = [ "<Shift><Alt>Tab" ];
- switch-windows = [ "<Super>Tab" ];
- switch-windows-backward = [ "<Shift><Super>Tab" ];
- toggle-fullscreen = [ "<Alt>F11" ];
- };
- "org/gnome/desktop/wm/preferences" = {
- action-middle-click-titlebar = "none";
- auto-raise = true;
- button-layout = "appmenu:close";
- focus-new-windows = "strict";
- resize-with-right-button = true;
- };
- # Background and screensaver
- "org/gnome/desktop/background" = {
- "picture-uri" = "file:///home/vincent/desktop/pictures/wallpapers/dynamics/firewatch/firewatch.xml";
- };
- "org/gnome/desktop/screensaver" = {
- "picture-uri" = "file:///home/vincent/desktop/pictures/wallpapers/dynamics/firewatch/firewatch.xml";
- };
- # settings
- "org/gnome/settings-daemon/plugins/color" = {
- night-light-enabled = true;
- night-light-last-coordinates = (mkTuple [ 48.844400719942406 2.3488000000000002 ]);
- };
- "org/gnome/settings-daemon/plugins/power" = {
- sleep-inactive-ac-type = "nothing";
- };
- # Tilix
- "com/gexperts/Tilix" = {
- "control-scoll-zoom" = true;
- "notify-on-process-complete" = true;
- "prompt-on-close" = true;
- "theme-variant" = "dark";
- };
- "com/gexperts/Tilix/keybindings" = {
- "session-add-down" = "<Primary><Alt>d";
- };
- "com/gexperts/Tilix/profiles" = {
- list = [ "2b7c4080-0ddd-46c5-8f23-563fd3ba789d" "3c416d51-7dbc-4c73-8448-de56ed4ac3c2" ];
- };
- "com/gexperts/Tilix/profiles/2b7c4080-0ddd-46c5-8f23-563fd3ba789d" = {
- background-color = "#272C34";
- badge-color-set = false;
- bold-color-set = false;
- cursor-colors-set = false;
- font = "Fira Code weight=450 13";
- foreground-color = "#BBC2CF";
- highlight-colors-set = false;
- palette = [ "#272C34" "#FF6C6B" "#98BE65" "#ECBE7A" "#50AFEF" "#C678DD" "#46D9FF" "#BBC2CF" "#4A4A4F4F5555" "#FF6C6B" "#98BE65" "#ECBE7A" "#50AFEF" "#C678DD" "#46D9FF" "#BBC2CF" ];
- shortcut = "<Primary><Shift><Alt>d";
- use-system-font = true;
- use-theme-colors = false;
- visible-name = "Default";
- };
- "com/gexperts/Tilix/profiles/3c416d51-7dbc-4c73-8448-de56ed4ac3c2" = {
- background-color = "#BBBBC2C2CFCF";
- badge-color = "#AC7EA8";
- badge-color-set = false;
- bold-color-set = false;
- cursor-colors-set = false;
- font = "Fira Code weight=450 12";
- foreground-color = "#26262C2C3434";
- highlight-colors-set = false;
- palette = [ "#272C34" "#FF6C6B" "#98BE65" "#ECBE7A" "#50AFEF" "#C678DD" "#46D9FF" "#BBC2CF" "#272C34" "#FF6C6B" "#98BE65" "#ECBE7A" "#50AFEF" "#C678DD" "#46D9FF" "#BBC2CF" ];
- shortcut = "<Primary><Shift><Alt>l";
- use-system-font = true;
- use-theme-colors = false;
- visible-name = "Light";
- };
- # Shell
- "org/gnome/shell" = {
- enabled-extensions = [ "drive-menu@gnome-shell-extensions.gcampax.github.com" "sound-output-device-chooser@kgshank.net" "user-theme@gnome-shell-extensions.gcampax.github.com" "launch-new-instance@gnome-shell-extensions.gcampax.github.com" "bluetooth-quick-connect@bjarosze.gmail.com" "noannoyance@sindex.com" ]; # "hidetopbar@mathieu.bidon.ca"
- };
- # Extensions
- "org/gnome/shell/extensions/hidetopbar" = {
- enable-active-window = false;
- enable-intellihide = true;
- mouse-sensitive = true;
- mouse-sensitive-fullscreen-window = false;
- };
- };
-}
diff --git a/users/vincent/desktop/default.nix b/users/vincent/desktop/default.nix
@@ -5,20 +5,18 @@ let
in
{
imports = [
- # autorandr
+ ./audio.nix
./finances.nix
./firefox.nix
./gtk.nix
./keyboard.nix
./mpv.nix
- ./spotify.nix
./passwordstore.nix
- ./audio.nix
+ ./spotify.nix
]
++ optionals nixosConfig.modules.desktop.xorg.enable [ ./xorg.nix ]
++ optionals nixosConfig.modules.desktop.wayland.enable [ ./wayland.nix ]
- ++ optionals nixosConfig.modules.desktop.wayland.sway.enable [ ./sway.nix ]
- ++ optionals nixosConfig.modules.desktop.wayland.hyprland.enable [ ./hyprland.nix ];
+ ++ optionals nixosConfig.modules.desktop.wayland.sway.enable [ ./sway.nix ];
home.sessionVariables = {
WEBKIT_DISABLE_COMPOSITING_MODE = 1;
@@ -28,21 +26,17 @@ in
aspellDicts.en
aspellDicts.fr
desktop-file-utils
- go-jira
hunspell
hunspellDicts.en_GB-ize
hunspellDicts.en_US-large
hunspellDicts.fr-any
keybase
- libreoffice-fresh
mpw
my.batzconverter
# nyxt
obs-studio
playerctl
profile-sync-daemon
- signal-desktop
- thunderbird
trash-cli
xdg-user-dirs
xdg-utils
@@ -70,10 +64,6 @@ in
xdg.configFile."xorg/emoji.compose".source = ./xorg/emoji.compose;
xdg.configFile."xorg/parens.compose".source = ./xorg/parens.compose;
xdg.configFile."xorg/modletters.compose".source = ./xorg/modletters.compose;
- home.file.".local/share/applications/google-meet.desktop".source = ./xorg/google-meet.desktop;
- home.file.".local/share/applications/chrome-slack.desktop".source = ./xorg/chrome-slack.desktop;
- home.file.".local/share/applications/notion.desktop".source = ./xorg/notion.desktop;
- home.file.".local/share/applications/todoist.desktop".source = ./xorg/todoist.desktop;
home.file.".oath" = {
source = config.lib.file.mkOutOfStoreSymlink "/home/vincent/desktop/documents/.oath";
recursive = true;
diff --git a/users/vincent/desktop/gnome.nix b/users/vincent/desktop/gnome.nix
@@ -1,60 +0,0 @@
-{ pkgs, ... }:
-
-{
- imports = [
- ./dconf.nix
- ];
- home.sessionVariables = { WEBKIT_DISABLE_COMPOSITING_MODE = 1; };
- home.packages = with pkgs; [
- gnome3.dconf-editor
- gnome3.gnome-tweak-tool
- gnome3.pomodoro
- gnome3.gnome-boxes
-
- #gnome3.gnome-documents
- gnome3.gnome-nettool
- gnome3.gnome-power-manager
- gnome3.gnome-todo
- gnome3.gnome-tweaks
- gnome3.gnome-usage
-
- gnomeExtensions.sound-output-device-chooser
- my.gnome-shell-extension-shell
- my.gnome-bluetooth-quick-connect
- my.noannoyance
- my.nightthemeswitcher
- gnome3.gnome-shell-extensions
-
- pop-gtk-theme
- pop-icon-theme
- pinentry-gnome
- # tilix
-
- aspell
- aspellDicts.en
- aspellDicts.fr
- hunspell
- hunspellDicts.en_US-large
- hunspellDicts.en_GB-ize
- hunspellDicts.fr-any
- wmctrl
- xclip
- xdg-user-dirs
- xdg-utils
- xsel
- # FIXME move this elsewhere
- keybase
- pass
- profile-sync-daemon
- desktop-file-utils
- gimp
- xev
- ];
-
- home.file.".XCompose".source = ./xorg/XCompose;
- home.file.".Xmodmap".source = ./xorg/Xmodmap;
- xdg.configFile."xorg/emoji.compose".source = ./xorg/emoji.compose;
- xdg.configFile."xorg/parens.compose".source = ./xorg/parens.compose;
- xdg.configFile."xorg/modletters.compose".source = ./xorg/modletters.compose;
-
-}
diff --git a/users/vincent/desktop/hyprland.nix b/users/vincent/desktop/hyprland.nix
@@ -1,226 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- xdg.configFile."hypr/hyprpaper.conf".text = ''
- preload = /home/vincent/desktop/pictures/lockscreen
- wallpaper = , /home/vincent/desktop/pictures/lockscreen
- ipc = off
- splash = off
- '';
- wayland.windowManager.hyprland = {
- enable = true;
- systemd.enable = true;
- xwayland.enable = true;
-
- settings = {
- env = [
- "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
- "SDL_VIDEODRIVER,wayland"
- "QT_QPA_PLATFORM,wayland"
- "_JAVA_AWT_WM_NONREPARTENTING,1"
- "MOZ_ENABLE_WAYLAND,1"
- ];
-
- exec-once = [
- "${pkgs.waybar}/bin/waybar -c ~/.config/waybar/config "
- "hyprctl setcursor Qogir 24"
- "wl-paste -p --watch cliphist store"
- "${pkgs.hyprpaper}/bin/hyprpaper"
- "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"
- "systemctl --user restart kanshi"
- ];
-
- general = {
- gaps_in = 4;
- gaps_out = 6;
- border_size = 2;
- "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
- "col.inactive_border" = "rgba(595959aa)";
- layout = "master";
- allow_tearing = false;
- };
-
- decoration = {
- rounding = 2;
-
- blur = {
- enabled = true;
- size = 3;
- passes = 1;
- };
-
- drop_shadow = "yes";
- shadow_range = 4;
- shadow_render_power = 3;
- "col.shadow" = "rgba(1a1a1aee)";
- };
-
- master = {
- # new_is_master = true;
- orientation = "right";
- };
-
- animations = {
- enabled = "no";
- };
-
- monitor = [
- # "eDP-1, 1920x1080, 0x0, 1"
- # "HDMI-A-1, 2560x1440, 1920x0, 1"
- # Old: Output eDP-1 'AU Optronics 0xD291 Unknown'
- # Output eDP-1 'Unknown 0xD291 Unknown'
- # Output DP-5 'LG Electronics LG ULTRAWIDE 0x0005D10C' (focused)
- # "eDP-1,preferred,0x0,1" # or 1460,1440
- # "DP-5,3440x1440,-1520x1440,1"
- ",preferred,auto,1"
- ];
-
- input = {
- kb_layout = "fr";
- kb_variant = "bepo";
- kb_options = "grp:menu_toggle,grp_led:caps,compose:caps";
-
- follow_mouse = 1;
- };
-
- # layerrule = [
- # "blur,notifications"
- # "blur,wofi"
- # ];
-
- workspace = [
- "2, on-create-empty:emacs"
- "special:scratchpad, on-created-empty:${pkgs.kitty}/bin/kitty --title metask --class metask"
- "special:emacs-scratchpad, on-created-empty:emacsclient -c"
- ];
- # workspace = 2, on-create-empty:emacs
- # workspace = special:scratchpad, on-created-empty:${pkgs.kitty}/bin/kitty --title metask --class metask tmux
- # workspace = special:emacs-scratchpad, on-created-empty:emacsclient -c
-
- # windowrulev2 = nomaximizerequest, class:.* # You'll probably like this.
- # windowrule = workspace 1, ^(firefox)$
- # windowrule = workspace 8, ^(com\.obsproject\.Studio)$
- windowrule = [
- "workspace 1, ^(firefox)$"
- "workspace 8, ^(com\.obsproject\.Studio)$"
- ];
- windowrulev2 = [
- "suppressevent maximize, class:.*" # You'll probably like this.
- ];
-
- "$mod" = "SUPER";
- bind = [
- "$mod, Return, exec, kitty"
- "$mod CTRL, Return, exec, emacs"
- "$mod SHIFT, Return, exec, emacsclient -c"
-
- "$mod, BACKSPACE, focuscurrentorlast"
-
- "$mod SHIFT, code:24, killactive,"
- "$mod, Q, exit,"
- "$mod SHIFT, Space, togglefloating,"
- "$mod, R, exec, wofi --show drun"
- # "$mod, P, pseudo, # dwindle"
- "$mod, P, togglesplit, # dwindle"
-
- "$mod, code:41, fullscreen"
- #"$mod SHIFT, code:41, fakefullscreen"
-
- "$mod CTRL, code:33, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji -G"
- "$mod, code:33, exec, ${pkgs.wofi}/bin/wofi -G --show drun -modi 'drun,run,window,ssh'"
-
- # Move focus with mainMod + arrow keys
- "$mod, left, movefocus, l"
- "$mod, right, movefocus, r"
- "$mod, up, movefocus, u"
- "$mod, down, movefocus, d"
-
- # swapactiveworkspaces
- "$mod SHIFT, left, movecurrentworkspacetomonitor, l"
- "$mod SHIFT, right, movecurrentworkspacetomonitor, r"
- "$mod SHIFT, up, movecurrentworkspacetomonitor, u"
- "$mod SHIFT, down, movecurrentworkspacetomonitor, d"
-
- "$mod CTRL, left, workspace, e-1" # FIXME: adapt ?
- "$mod CTRL, right, workspace, e+1" # FIXME: adapt ?
- "$mod CTRL, down, workspace, e-1"
- "$mod CTRL, up, workspace, e+1"
- "$mod SHIFT CTRL, left, movetoworkspace, e-1" # FIXME: adapt ?
- "$mod SHIFT CTRL, right, movetoworkspace, e+1" # FIXME: adapt ?
- "$mod SHIFT CTRL, down, movetoworkspace, e-1"
- "$mod SHIFT CTRL, up, movetoworkspace, e+1"
-
- # Scroll through existing workspaces with mainMod + scroll
- "$mod, mouse_down, workspace, e+1"
- "$mod, mouse_up, workspace, e-1"
-
- # Switch workspaces with mainMod + [0-9]
- "$mod, code:10, workspace, 1"
- "$mod, code:11, workspace, 2"
- "$mod, code:12, workspace, 3"
- "$mod, code:13, workspace, 4"
- "$mod, code:14, workspace, 5"
- "$mod, code:15, workspace, 6"
- "$mod, code:16, workspace, 7"
- "$mod, code:17, workspace, 8"
- "$mod, code:18, workspace, 9"
- "$mod, code:19, workspace, 10"
-
- # Move active window to a workspace with mainMod + SHIFT + [0-9]
- "$mod SHIFT, code:10, movetoworkspace, 1"
- "$mod SHIFT, code:11, movetoworkspace, 2"
- "$mod SHIFT, code:12, movetoworkspace, 3"
- "$mod SHIFT, code:13, movetoworkspace, 4"
- "$mod SHIFT, code:14, movetoworkspace, 5"
- "$mod SHIFT, code:15, movetoworkspace, 6"
- "$mod SHIFT, code:16, movetoworkspace, 7"
- "$mod SHIFT, code:17, movetoworkspace, 8"
- "$mod SHIFT, code:18, movetoworkspace, 9"
- "$mod SHIFT, code:19, movetoworkspace, 10"
-
- # Example special workspace (scratchpad)
- # "$mod, code:49, togglespecialworkspace, magic"
- # "$mod SHIFT, code:49, movetoworkspace, special:magic"
- "$mod, code:49, togglespecialworkspace, scratchpad"
- "$mod SHIFT, code:49, togglespecialworkspace, emacs-scratchpad"
-
- # Media CTRLs
- ", XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -ui 5"
- ", XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -ud 5"
- ", XF86AudioMicMute, exec, ${pkgs.pamixer}/bin/pamixer --default-source -m"
- ", XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -m"
- ", XF86AudioPlay, exec, playerctl play-pause"
- ", XF86AudioPause, exec, playerctl play-pause"
- ", XF86Messenger, exec, playerctl play-pause"
- ", XF86AudioNext, exec, playerctl next"
- ", XF86Go, exec, playerctl next"
- ", XF86AudioPrev, exec, playerctl previous"
- ", Cancel, exec, playerctl previous"
-
- ", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%+"
- ", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-"
- "Shift, XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 1%+"
- "Shift, XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 1%-"
-
- "$mod, F10, exec, ${pkgs.my.scripts}/bin/shot %d"
- "$mod SHIFT, F10, exec, ${pkgs.my.scripts}/bin/shotf %d"
-
- "$mod, F9, exec, ${pkgs.mako}/bin/makoctl mode -s do-not-disturb"
- "$mod SHIFT, F9, exec, ${pkgs.mako}/bin/makoctl mode -s default"
-
- "$mod, G, togglegroup"
- "$mod, tab, changegroupactive"
-
- "$mod, b, exec, pkill --signal=SIGUSR1 waybar"
- ];
- bindm = [
- "$mod, mouse:273, resizewindow"
- "$mod, mouse:272, movewindow"
- ];
- misc = {
- focus_on_activate = true;
- force_default_wallpaper = 0; # -1 for no wallpaper, 0 for default wallpaper, 1 for custom wallpaper
- };
- };
- };
-}
diff --git a/users/vincent/desktop/mpd.nix b/users/vincent/desktop/mpd.nix
@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib; {
- services.mpd = {
- enable = true;
- # FIXME put this into an option
- musicDirectory = "/net/sakhalin.home/export/gaia/music";
- network.listenAddress = "any";
- extraConfig = ''
- audio_output {
- type "pulse"
- name "Local MPD"
- }
- '';
- };
- services.mpdris2 = {
- enable = true;
- mpd.host = "127.0.0.1";
- };
- home.packages = with pkgs; [
- ario
- mpc_cli
- ncmpcpp
- ];
-}
diff --git a/users/vincent/desktop/redshift.nix b/users/vincent/desktop/redshift.nix
@@ -1,11 +0,0 @@
-{
- services = {
- redshift = {
- enable = true;
- brightness = { day = "1"; night = "0.9"; };
- latitude = "48.3";
- longitude = "7.5";
- tray = true;
- };
- };
-}
diff --git a/users/vincent/desktop/sway.nix b/users/vincent/desktop/sway.nix
@@ -250,10 +250,6 @@ in
};
home.packages = with pkgs; [
swaybg
- # swaynotificationcenter
- # terminals
- # FIXME move this away, they work on both Xorg and Wayland/Sway
- kitty
];
}
diff --git a/users/vincent/desktop/waybar.css b/users/vincent/desktop/waybar.css
@@ -1,132 +0,0 @@
-@keyframes blink-warning {
- to {
- background-color: #bf616a;
- }
-}
-
-@keyframes blink-critical {
- to {
- color: #2e3440;
- background-color: #bf616a;
- }
-}
-
-* {
- border: none;
- border-radius: 0;
- /* FontAwesome6Free, FontAwesome6Brands; */
- font-family: Ubuntu Mono, "Font Awesome 6 Free", monospace;
- font-size: 13px;
- min-height: 0;
- box-shadow: none;
- text-shadow: none;
-}
-
-window#waybar {
- background-color: #3b4252;
- color: #e5e9f0;
- opacity: 0.9;
-}
-
-#window {
- font-family: Ubuntu Sans, sans-serif;
-}
-
-#workspaces {
- background-color: #4c566a;
-}
-
-#workspaces button {
- padding: 3px 9px 0px 9px;
- background: transparent;
- color: #e5e9f0;
- border-bottom: 3px solid transparent;
- font-weight: 900;
-}
-
-#workspaces button.focused {
- background-color: #434c5e;
- color: #eceff4;
- border-bottom: 3px solid #ebcb8b;
-}
-
-#workspaces button:hover {
- background-color: #5e81ac;
-}
-
-#mode {
- padding: 0px 9px;
- background-color: #a3be8c;
- color: #3b4252;
- font-family: Ubuntu Sans, sans-serif;
- font-size: 14px;
- font-weight: bold;
-}
-
-#clock, #language, #pulseaudio, #tray, #memory, #cpu, #battery {
- padding: 0px 8px;
- color: #d8dee9;
- font-size: 14px;
-}
-
-#clock {
- background-color: #4c566a;
- font-weight: bold;
-}
-
-#language {
- color: #d8dee9;
- font-weight: bold;
-}
-
-#pulseaudio {
-}
-
-#pulseaudio.muted {
- color: #d08770;
-}
-
-#tray {
-}
-
-#cpu {
- padding-left: 0px;
- font-size: 13px;
-}
-
-#cpu.warning {
- color: #ebcb8b;
-}
-
-#cpu.critical {
- color: #d08770;
-}
-
-#memory {
- padding-left: 0px;
- font-size: 13px;
-}
-
-#memory.warning {
- color: #ebcb8b;
-}
-
-#memory.critical {
- color: #d08770;
-}
-
-#battery {
- animation-timing-function: ease-in-out;
- animation-iteration-count: infinite;
- animation-direction: alternate;
-}
-
-#battery.warning.discharging {
- animation-name: blink-warning;
- animation-duration: 3s;
-}
-
-#battery.critical.discharging {
- animation-name: blink-critical;
- animation-duration: 2s;
-}
diff --git a/users/vincent/desktop/wayland.nix b/users/vincent/desktop/wayland.nix
@@ -10,85 +10,6 @@
};
programs = {
- # waybar = {
- # enable = true;
- # # systemd.enable = true;
- # style = ./waybar.css;
- # settings = [{
- # layer = "bottom";
- # position = "bottom";
- # mode = "hide";
- # modifier-reset = "release";
- # modules-left = [ "sway/workspaces" "sway/mode" "custom/media" ];
- # modules-center = [ "clock" "custom/notification" ];
- # modules-right = [ "temperature" "pulseaudio" "backlight" "battery#bat0" "tray" ];
- # ipc = true;
- # id = "mainBar";
- # "clock" = {
- # "interval" = 30;
- # "format" = "{:<b>%H:%M</b>}";
- # "tooltip-format" = "<big><b>{:%Y %B}</b></big>\n{calendar}";
- # "format-alt" = "{:%A %d %B %Y}";
- # };
- # "battery#bat0" = {
- # "bat" = "BAT0";
- # "states" = {
- # "warning" = 30;
- # "critical" = 15;
- # };
- # "format" = "{icon} {capacity}";
- # "format-charging" = " {capacity}";
- # "format-plugged" = "";
- # "format-alt" = "{icon} {time}";
- # "format-full" = "";
- # "format-icons" = [ "" "" "" "" "" ];
- # };
- # "custom/notification" = {
- # "tooltip" = false;
- # "format" = "{icon} ";
- # "format-icons" = {
- # "notification" = "<span foreground='red'></span>";
- # "none" = "";
- # "dnd-notification" = "<sup></sup>";
- # "dnd-none" = "";
- # };
- # "return-type" = "json";
- # # "exec-if" = "which swaync-client";
- # "exec" = "swaync-client -swb";
- # "on-click" = "swaync-client -t -sw";
- # "on-click-right" = "swaync-client -d -sw";
- # "escape" = true;
- # };
- # "pulseaudio" = {
- # "format" = "{icon} {volume:2}% ";
- # "format-bluetooth" = "{icon} {volume}% ";
- # "format-muted" = " ";
- # "format-icons" = {
- # "phone" = [
- # " "
- # " "
- # " "
- # " "
- # ];
- # "default" = [
- # ""
- # ""
- # ""
- # ];
- # };
- # "scroll-step" = 10;
- # "on-click-right" = "${pkgs.pavucontrol}/bin/pavucontrol";
- # "on-click" = "${pkgs.pamixer}/bin/pamixer -t";
- # };
- # "backlight" = {
- # "format" = "{icon} {percent}% ";
- # "format-icons" = [
- # ""
- # ""
- # ];
- # };
- # }];
- # };
kitty = {
enable = true;
# shellIntegration.enableZshIntegration = true;
@@ -157,6 +78,7 @@
}
];
};
+ # FIXME: replace by rotification
mako = {
enable = true;
font = "Ubuntu Mono 12";
@@ -199,7 +121,6 @@
slurp
grim
zenity
- clipman
qogir-icon-theme
cliphist
];
diff --git a/users/vincent/desktop/xorg/alacritty.yml b/users/vincent/desktop/xorg/alacritty.yml
@@ -1,265 +0,0 @@
-env:
- TERM: xterm-256color
-
-window:
- dimensions:
- columns: 80
- lines: 24
-
- padding:
- x: 2
- y: 2
-
- decorations: full
-
-draw_bold_text_with_bright_colors: true
-
-font:
- normal:
- family: Fira Code
- bold:
- family: Fira Code
- italic:
- family: Fira Code
- size: 11.0
- offset:
- x: 0
- y: 0
- glyph_offset:
- x: 0
- y: 0
- use_thin_strokes: true
-
-cursor:
- style: Underline
- hide_when_typing: false
-
-# Colors (Tomorrow Night Bright)
-colors:
- # Default colors
- primary:
- background: '0x282c34'
- foreground: '0xbbc2cf'
-
- # Colors the cursor will use if `custom_cursor_colors` is true
- cursor:
- text: '0x000000'
- cursor: '0xffffff'
-
- # Normal colors
- normal:
- black: '0x282c34'
- red: '0xff6c6b'
- green: '0x98be65'
- yellow: '0xecbe7b'
- blue: '0x51afef'
- magenta: '0xc678dd'
- cyan: '0x46d9ff'
- white: '0xbbc2cf'
-
- # Bright colors
- bright:
- black: '0x666666'
- red: '0xff3334'
- green: '0x9ec400'
- yellow: '0xe7c547'
- blue: '0x7aa6da'
- magenta: '0xb77ee0'
- cyan: '0x54ced6'
- white: '0xffffff'
-
- # Dim colors (Optional)
- dim:
- black: '0x333333'
- red: '0xf2777a'
- green: '0x99cc99'
- yellow: '0xffcc66'
- blue: '0x6699cc'
- magenta: '0xcc99cc'
- cyan: '0x66cccc'
- white: '0xdddddd'
-
-visual_bell:
- animation: EaseOutExpo
- duration: 0
-
-# Background opacity
-background_opacity: 1.0
-
-mouse_bindings:
- - { mouse: Middle, action: PasteSelection }
- - { mouse: Right, action: Paste }
-
-mouse:
- double_click: { threshold: 300 }
- triple_click: { threshold: 300 }
- faux_scrolling_lines: 1
-
-scrolling:
- history: 10000
- multiplier: 3
-
-selection:
- semantic_escape_chars: ",│`|:\"' ()[]{}<>"
-
-dynamic_title: true
-
-live_config_reload: true
-
-# Shell
-#
-# You can set shell.program to the path of your favorite shell, e.g. /bin/fish.
-# Entries in shell.args are passed unmodified as arguments to the shell.
-#
-# shell:
-# program: /bin/bash
-# args:
-# - --login
-
-# Key bindings
-#
-# Each binding is defined as an object with some properties. Most of the
-# properties are optional. All of the alphabetical keys should have a letter for
-# the `key` value such as `V`. Function keys are probably what you would expect
-# as well (F1, F2, ..). The number keys above the main keyboard are encoded as
-# `Key1`, `Key2`, etc. Keys on the number pad are encoded `Number1`, `Number2`,
-# etc. These all match the glutin::VirtualKeyCode variants.
-#
-# A list with all available `key` names can be found here:
-# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants
-#
-# Possible values for `mods`
-# `Command`, `Super` refer to the super/command/windows key
-# `Control` for the control key
-# `Shift` for the Shift key
-# `Alt` and `Option` refer to alt/option
-#
-# mods may be combined with a `|`. For example, requiring control and shift
-# looks like:
-#
-# mods: Control|Shift
-#
-# The parser is currently quite sensitive to whitespace and capitalization -
-# capitalization must match exactly, and piped items must not have whitespace
-# around them.
-#
-# Either an `action`, `chars`, or `command` field must be present.
-# `action` must be one of `Paste`, `PasteSelection`, `Copy`, or `Quit`.
-# `chars` writes the specified string every time that binding is activated.
-# These should generally be escape sequences, but they can be configured to
-# send arbitrary strings of bytes.
-# `command` must be a map containing a `program` string, and `args` array of
-# strings. For example:
-# - { ... , command: { program: "alacritty", args: ["-e", "vttest"] } }
-#
-# Want to add a binding (e.g. "PageUp") but are unsure what the X sequence
-# (e.g. "\x1b[5~") is? Open another terminal (like xterm) without tmux,
-# then run `showkey -a` to get the sequence associated to a key combination.
-key_bindings:
- - { key: V, mods: Control|Shift, action: Paste }
- - { key: C, mods: Control|Shift, action: Copy }
- - { key: Q, mods: Command, action: Quit }
- - { key: W, mods: Command, action: Quit }
- - { key: Insert, mods: Shift, action: PasteSelection }
- - { key: Key0, mods: Control, action: ResetFontSize }
- - { key: Equals, mods: Control, action: IncreaseFontSize }
- - { key: Subtract, mods: Control, action: DecreaseFontSize }
-# - { key: Home, mods: Shift, action: ScrollToTop }
- - { key: Home, chars: "\x1bOH", mode: AppCursor }
- - { key: Home, chars: "\x1b[H", mode: ~AppCursor }
-# - { key: End, mods: Shift, action: ScrollToBottom }
- - { key: End, chars: "\x1bOF", mode: AppCursor }
- - { key: End, chars: "\x1b[F", mode: ~AppCursor }
-# - { key: PageUp, mods: Shift, action: ScrollPageUp }
- - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" }
- - { key: PageUp, mods: Control, chars: "\x1b[5;5~" }
- - { key: PageUp, chars: "\x1b[5~" }
-# - { key: PageDown, mods: Shift, action: ScrollPageDown }
- - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" }
- - { key: PageDown, mods: Control, chars: "\x1b[6;5~" }
- - { key: PageDown, chars: "\x1b[6~" }
- - { key: Tab, mods: Shift, chars: "\x1b[Z" }
- - { key: Back, chars: "\x7f" }
- - { key: Back, mods: Alt, chars: "\x1b\x7f" }
- - { key: Insert, chars: "\x1b[2~" }
- - { key: Delete, chars: "\x1b[3~" }
- - { key: Left, mods: Shift, chars: "\x1b[1;2D" }
- - { key: Left, mods: Control, chars: "\x1b[1;5D" }
- - { key: Left, mods: Alt, chars: "\x1b[1;3D" }
- - { key: Left, chars: "\x1b[D", mode: ~AppCursor }
- - { key: Left, chars: "\x1bOD", mode: AppCursor }
- - { key: Right, mods: Shift, chars: "\x1b[1;2C" }
- - { key: Right, mods: Control, chars: "\x1b[1;5C" }
- - { key: Right, mods: Alt, chars: "\x1b[1;3C" }
- - { key: Right, chars: "\x1b[C", mode: ~AppCursor }
- - { key: Right, chars: "\x1bOC", mode: AppCursor }
- - { key: Up, mods: Shift, chars: "\x1b[1;2A" }
- - { key: Up, mods: Control, chars: "\x1b[1;5A" }
- - { key: Up, mods: Alt, chars: "\x1b[1;3A" }
- - { key: Up, chars: "\x1b[A", mode: ~AppCursor }
- - { key: Up, chars: "\x1bOA", mode: AppCursor }
- - { key: Down, mods: Shift, chars: "\x1b[1;2B" }
- - { key: Down, mods: Control, chars: "\x1b[1;5B" }
- - { key: Down, mods: Alt, chars: "\x1b[1;3B" }
- - { key: Down, chars: "\x1b[B", mode: ~AppCursor }
- - { key: Down, chars: "\x1bOB", mode: AppCursor }
- - { key: F1, chars: "\x1bOP" }
- - { key: F2, chars: "\x1bOQ" }
- - { key: F3, chars: "\x1bOR" }
- - { key: F4, chars: "\x1bOS" }
- - { key: F5, chars: "\x1b[15~" }
- - { key: F6, chars: "\x1b[17~" }
- - { key: F7, chars: "\x1b[18~" }
- - { key: F8, chars: "\x1b[19~" }
- - { key: F9, chars: "\x1b[20~" }
- - { key: F10, chars: "\x1b[21~" }
- - { key: F11, chars: "\x1b[23~" }
- - { key: F12, chars: "\x1b[24~" }
- - { key: F1, mods: Shift, chars: "\x1b[1;2P" }
- - { key: F2, mods: Shift, chars: "\x1b[1;2Q" }
- - { key: F3, mods: Shift, chars: "\x1b[1;2R" }
- - { key: F4, mods: Shift, chars: "\x1b[1;2S" }
- - { key: F5, mods: Shift, chars: "\x1b[15;2~" }
- - { key: F6, mods: Shift, chars: "\x1b[17;2~" }
- - { key: F7, mods: Shift, chars: "\x1b[18;2~" }
- - { key: F8, mods: Shift, chars: "\x1b[19;2~" }
- - { key: F9, mods: Shift, chars: "\x1b[20;2~" }
- - { key: F10, mods: Shift, chars: "\x1b[21;2~" }
- - { key: F11, mods: Shift, chars: "\x1b[23;2~" }
- - { key: F12, mods: Shift, chars: "\x1b[24;2~" }
- - { key: F1, mods: Control, chars: "\x1b[1;5P" }
- - { key: F2, mods: Control, chars: "\x1b[1;5Q" }
- - { key: F3, mods: Control, chars: "\x1b[1;5R" }
- - { key: F4, mods: Control, chars: "\x1b[1;5S" }
- - { key: F5, mods: Control, chars: "\x1b[15;5~" }
- - { key: F6, mods: Control, chars: "\x1b[17;5~" }
- - { key: F7, mods: Control, chars: "\x1b[18;5~" }
- - { key: F8, mods: Control, chars: "\x1b[19;5~" }
- - { key: F9, mods: Control, chars: "\x1b[20;5~" }
- - { key: F10, mods: Control, chars: "\x1b[21;5~" }
- - { key: F11, mods: Control, chars: "\x1b[23;5~" }
- - { key: F12, mods: Control, chars: "\x1b[24;5~" }
- - { key: F1, mods: Alt, chars: "\x1b[1;6P" }
- - { key: F2, mods: Alt, chars: "\x1b[1;6Q" }
- - { key: F3, mods: Alt, chars: "\x1b[1;6R" }
- - { key: F4, mods: Alt, chars: "\x1b[1;6S" }
- - { key: F5, mods: Alt, chars: "\x1b[15;6~" }
- - { key: F6, mods: Alt, chars: "\x1b[17;6~" }
- - { key: F7, mods: Alt, chars: "\x1b[18;6~" }
- - { key: F8, mods: Alt, chars: "\x1b[19;6~" }
- - { key: F9, mods: Alt, chars: "\x1b[20;6~" }
- - { key: F10, mods: Alt, chars: "\x1b[21;6~" }
- - { key: F11, mods: Alt, chars: "\x1b[23;6~" }
- - { key: F12, mods: Alt, chars: "\x1b[24;6~" }
- - { key: F1, mods: Super, chars: "\x1b[1;3P" }
- - { key: F2, mods: Super, chars: "\x1b[1;3Q" }
- - { key: F3, mods: Super, chars: "\x1b[1;3R" }
- - { key: F4, mods: Super, chars: "\x1b[1;3S" }
- - { key: F5, mods: Super, chars: "\x1b[15;3~" }
- - { key: F6, mods: Super, chars: "\x1b[17;3~" }
- - { key: F7, mods: Super, chars: "\x1b[18;3~" }
- - { key: F8, mods: Super, chars: "\x1b[19;3~" }
- - { key: F9, mods: Super, chars: "\x1b[20;3~" }
- - { key: F10, mods: Super, chars: "\x1b[21;3~" }
- - { key: F11, mods: Super, chars: "\x1b[23;3~" }
- - { key: F12, mods: Super, chars: "\x1b[24;3~" }
diff --git a/users/vincent/desktop/xorg/chrome-slack.desktop b/users/vincent/desktop/xorg/chrome-slack.desktop
@@ -1,9 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Version=1.0
-Terminal=false
-Type=Application
-Name=CoreOS Slack
-Exec=google-chrome-stable --profile-directory=Default --app-id=bcehlkhnkohehajdlpdmffdkmcgecfjm
-Icon=chrome-bcehlkhnkohehajdlpdmffdkmcgecfjm-Default
-StartupWMClass=crx_bcehlkhnkohehajdlpdmffdkmcgecfjm
diff --git a/users/vincent/desktop/xorg/google-meet.desktop b/users/vincent/desktop/xorg/google-meet.desktop
@@ -1,9 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Version=1.0
-Terminal=false
-Type=Application
-Name=Google Meet
-Exec=google-chrome-stable --profile-directory=Default --app-id=kjgfgldnnfoeklkmfkjfagphfepbbdan
-Icon=chrome-kjgfgldnnfoeklkmfkjfagphfepbbdan-Default
-StartupWMClass=crx_kjgfgldnnfoeklkmfkjfagphfepbbdan
diff --git a/users/vincent/desktop/xorg/notion.desktop b/users/vincent/desktop/xorg/notion.desktop
@@ -1,9 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Version=1.0
-Terminal=false
-Type=Application
-Name=Notion
-Exec=google-chrome-stable "--profile-directory=Profile 1" --app-id=hfmmdbehdafhnbfbcjfihndbonkponlk
-Icon=chrome-hfmmdbehdafhnbfbcjfihndbonkponlk-Profile_1
-StartupWMClass=crx_hfmmdbehdafhnbfbcjfihndbonkponlk
diff --git a/users/vincent/desktop/xorg/todoist.desktop b/users/vincent/desktop/xorg/todoist.desktop
@@ -1,10 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Version=1.0
-Terminal=false
-Type=Application
-Name=Todoist
-Exec=google-chrome-stable "--profile-directory=Profile 1" --app-id=elldfnmogicegdcphgljaoaklkpcnbnn
-Icon=chrome-elldfnmogicegdcphgljaoaklkpcnbnn-Profile_1
-NoDisplay=true
-StartupWMClass=crx_elldfnmogicegdcphgljaoaklkpcnbnn
