diff --git a/modules/both/i3/default.nix b/modules/both/i3/default.nix index b656214..56cca1f 100644 --- a/modules/both/i3/default.nix +++ b/modules/both/i3/default.nix @@ -38,11 +38,22 @@ modifier = mod; terminal = "kitty"; menu = "rofi -show drun"; + defaultWorkspace = "workspace ${ws1}"; keybindings = { "${mod}+Return" = "exec ${config.xsession.windowManager.i3.config.terminal}"; "${mod}+d" = "exec ${config.xsession.windowManager.i3.config.menu}"; "${mod}+Shift+q" = "kill"; + "${mod}+h" = "focus left"; + "${mod}+j" = "focus down"; + "${mod}+k" = "focus up"; + "${mod}+l" = "focus right"; + + "${mod}+Shift+h" = "move left"; + "${mod}+Shift+j" = "move down"; + "${mod}+Shift+k" = "move up"; + "${mod}+Shift+l" = "move right"; + "${mod}+Left" = "focus left"; "${mod}+Down" = "focus down"; "${mod}+Up" = "focus up"; @@ -53,8 +64,8 @@ "${mod}+Shift+Up" = "move up"; "${mod}+Shift+Right" = "move right"; - "${mod}+h" = "split h"; - "${mod}+v" = "split v"; + "${mod}+Shift+semicolon" = "split v"; + "${mod}+Shift+backslash" = "split h"; "${mod}+f" = "fullscreen toggle"; "${mod}+e" = "layout stacking"; @@ -170,6 +181,8 @@ }; gaps = { inner = 5; + smartBorders = "on"; + smartGaps = true; }; fonts = { names = ["Fira Code"]; @@ -183,12 +196,20 @@ {class = "helvum";} ]; }; + startup = [ + { + command = "~/.fehbg"; + notification = false; + } + ]; }; }; imports = [ ../../home-manager/kitty.nix ../../home-manager/rofi.nix ../../home-manager/dunst.nix + ../../home-manager/feh.nix + ../../home-manager/picom.nix ]; }; imports = [ diff --git a/modules/home-manager/dunst.nix b/modules/home-manager/dunst.nix index f2f2981..f5a59a9 100644 --- a/modules/home-manager/dunst.nix +++ b/modules/home-manager/dunst.nix @@ -11,7 +11,7 @@ font = "Fira Code"; follow = "keyboard"; origin = "top-right"; - transparency = 5; + transparency = 20; padding = 6; horizontal_padding = 6; }; @@ -20,6 +20,7 @@ # Otherwise the "#" and following would be interpreted as a comment. frame_color = "#3B7C87"; foreground = "#3B7C87"; + highlight = "#3B7C87"; background = "#191311"; #background = "#2B313C" timeout = 4; @@ -30,6 +31,7 @@ urgency_normal = { frame_color = "#5B8234"; foreground = "#5B8234"; + highlight = "#5B8234"; background = "#191311"; #background = "#2B313C" timeout = 6; @@ -40,6 +42,7 @@ urgency_critical = { frame_color = "#B7472A"; foreground = "#B7472A"; + highlight = "#B7472A"; background = "#191311"; #background = "#2B313C" timeout = 8; diff --git a/modules/home-manager/feh.nix b/modules/home-manager/feh.nix new file mode 100644 index 0000000..6134553 --- /dev/null +++ b/modules/home-manager/feh.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + lib, + ... +}: { + programs.feh.enable = true; + + programs.nushell.extraConfig = '' + # display a slideshow of all pics in a directory, recursively + def slideshow [delay: int = 10] { + feh --full-screen --randomize --auto-zoom --recursive --slideshow-delay $delay + } + ''; + programs.zsh.shellAliases. slideshow = "feh --full-screen --randomize --auto-zoom --recursive --slideshow-delay"; +} diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix index 1212600..adba147 100644 --- a/modules/home-manager/kitty.nix +++ b/modules/home-manager/kitty.nix @@ -11,5 +11,8 @@ name = "Fira Code"; }; theme = "Gruvbox Dark"; + settings={ + background_opacity="0.8"; + }; }; } diff --git a/modules/home-manager/nextcloud.nix b/modules/home-manager/nextcloud.nix new file mode 100644 index 0000000..6ac15f0 --- /dev/null +++ b/modules/home-manager/nextcloud.nix @@ -0,0 +1,9 @@ +{ + config, + pkgs, + lib, + ... +}: { + services.nextcloud-client.enable = true; + services.gnome-keyring.enable = true; +} diff --git a/modules/home-manager/picom.nix b/modules/home-manager/picom.nix new file mode 100644 index 0000000..3553e24 --- /dev/null +++ b/modules/home-manager/picom.nix @@ -0,0 +1,18 @@ +{ + config, + pkgs, + lib, + ... +}: { + services.picom = { + enable = true; + # backend = "glx"; + }; + xsession.windowManager.i3.config.startup = [ + { + command = "systemctl --user restart picom"; + always = true; + notification = false; + } + ]; +} diff --git a/modules/home-manager/terminal/nushell/config.nu b/modules/home-manager/terminal/nushell/config.nu index ae6ad58..9c20fc9 100644 --- a/modules/home-manager/terminal/nushell/config.nu +++ b/modules/home-manager/terminal/nushell/config.nu @@ -39,10 +39,6 @@ alias doc2pdf = loffice --convert-to pdf --headless *.docx #common options for sshfs alias sshmnt = sshfs -o idmap=user,compression=no,reconnect,follow_symlinks,dir_cache=yes,ServerAliveInterval=15 -# display a slideshow of all pics in a directory, recursively -def slideshow [delay: int = 10] { - feh --full-screen --randomize --auto-zoom --recursive --slideshow-delay $delay -} #look up something on cheat.sh def cheat [query: string] { diff --git a/modules/home-manager/terminal/zsh.nix b/modules/home-manager/terminal/zsh.nix index a96dca9..5ea8be6 100644 --- a/modules/home-manager/terminal/zsh.nix +++ b/modules/home-manager/terminal/zsh.nix @@ -23,7 +23,6 @@ ll = "ls -lh"; la = "-lha"; please = "sudo $(fc -ln -1)"; - slideshow = "feh --full-screen --randomize --auto-zoom --recursive --slideshow-delay"; pyactivate = "source ./.venv/bin/activate"; }; syntaxHighlighting = {