From 5bc1b7fc2b55f7f3e285bf2d9724d23f81655873 Mon Sep 17 00:00:00 2001 From: Jade Date: Sat, 22 Apr 2023 13:10:34 +0200 Subject: [PATCH] move some files around --- flake.nix | 6 +- haskell/xmonad/xmonad.hs | 2 +- .../monosodium-glutamate-g}/configuration.nix | 4 +- .../hardware-configuration.nix | 0 .../potatobook-g}/configuration.nix | 4 +- .../potatobook-g}/hardware-configuration.nix | 0 {potatobook-g => hosts/potatobook-g}/iso.nix | 0 .../schrottserver}/configuration.nix | 8 +- .../schrottserver}/hardware-configuration.nix | 0 .../schrottserver}/microbin.nix | 0 .../schrottserver}/mumble.nix | 0 .../schrottserver}/nextcloud.nix | 0 .../schrottserver}/penpot.nix | 0 .../schrottserver}/proxy.nix | 0 .../schrottserver}/synapse.nix | 0 .../schrottserver}/vaultwarden.nix | 0 modules/desktop/default.nix | 253 ++---------------- modules/desktop/i3/default.nix | 159 +++++++++++ .../scripts}/desktop/desktopctl.nix | 8 +- .../scripts}/desktop/macros/play-loop.sh | 0 .../scripts}/desktop/macros/play.sh | 0 .../scripts}/desktop/macros/record.sh | 0 .../scripts}/desktop/menu-qalc.sh | 0 .../scripts}/desktop/ocr-screenshot.sh | 0 .../scripts}/desktop/permaclip/pc-get.sh | 0 .../scripts}/desktop/permaclip/pc-set.sh | 0 .../scripts}/desktop/searchwolf.nix | 0 .../scripts}/desktop/searchwolf.sh | 0 .../scripts}/desktop/window-screenshot.sh | 0 29 files changed, 197 insertions(+), 247 deletions(-) rename {monosodium-glutamate-g => hosts/monosodium-glutamate-g}/configuration.nix (98%) rename {monosodium-glutamate-g => hosts/monosodium-glutamate-g}/hardware-configuration.nix (100%) rename {potatobook-g => hosts/potatobook-g}/configuration.nix (99%) rename {potatobook-g => hosts/potatobook-g}/hardware-configuration.nix (100%) rename {potatobook-g => hosts/potatobook-g}/iso.nix (100%) rename {schrottserver => hosts/schrottserver}/configuration.nix (93%) rename {schrottserver => hosts/schrottserver}/hardware-configuration.nix (100%) rename {schrottserver => hosts/schrottserver}/microbin.nix (100%) rename {schrottserver => hosts/schrottserver}/mumble.nix (100%) rename {schrottserver => hosts/schrottserver}/nextcloud.nix (100%) rename {schrottserver => hosts/schrottserver}/penpot.nix (100%) rename {schrottserver => hosts/schrottserver}/proxy.nix (100%) rename {schrottserver => hosts/schrottserver}/synapse.nix (100%) rename {schrottserver => hosts/schrottserver}/vaultwarden.nix (100%) create mode 100644 modules/desktop/i3/default.nix rename {scripts => other/scripts}/desktop/desktopctl.nix (71%) rename {scripts => other/scripts}/desktop/macros/play-loop.sh (100%) rename {scripts => other/scripts}/desktop/macros/play.sh (100%) rename {scripts => other/scripts}/desktop/macros/record.sh (100%) rename {scripts => other/scripts}/desktop/menu-qalc.sh (100%) rename {scripts => other/scripts}/desktop/ocr-screenshot.sh (100%) rename {scripts => other/scripts}/desktop/permaclip/pc-get.sh (100%) rename {scripts => other/scripts}/desktop/permaclip/pc-set.sh (100%) rename {scripts => other/scripts}/desktop/searchwolf.nix (100%) rename {scripts => other/scripts}/desktop/searchwolf.sh (100%) rename {scripts => other/scripts}/desktop/window-screenshot.sh (100%) diff --git a/flake.nix b/flake.nix index 60e74a3..4ae43af 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ }; system = "x86_64-linux"; modules = [ - ./monosodium-glutamate-g/configuration.nix + ./hosts/monosodium-glutamate-g/configuration.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -49,7 +49,7 @@ system = "x86_64-linux"; modules = [ "${mac-brcm-fw}" - ./potatobook-g/configuration.nix + ./hosts/potatobook-g/configuration.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -67,7 +67,7 @@ }; system = "x86_64-linux"; modules = [ - ./schrottserver/configuration.nix + ./hosts/schrottserver/configuration.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/haskell/xmonad/xmonad.hs b/haskell/xmonad/xmonad.hs index 0332554..318c927 100644 --- a/haskell/xmonad/xmonad.hs +++ b/haskell/xmonad/xmonad.hs @@ -271,7 +271,7 @@ defaults = def , keys = myKeys , mouseBindings = myMouseBindings -- hooks, layouts - , layoutHook = myLayout + , layoutHook = spacingRaw True (Border 0 10 10 10) True (Border 10 10 10 10) True $ myLayout , manageHook = myManageHook , handleEventHook = myEventHook , logHook = myLogHook diff --git a/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix similarity index 98% rename from monosodium-glutamate-g/configuration.nix rename to hosts/monosodium-glutamate-g/configuration.nix index 8989eb3..9f18ec1 100644 --- a/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -6,8 +6,8 @@ { imports = [ ./hardware-configuration.nix - ../common.nix - ../modules + ../../common.nix + ../../modules ]; #nixpkgs = { diff --git a/monosodium-glutamate-g/hardware-configuration.nix b/hosts/monosodium-glutamate-g/hardware-configuration.nix similarity index 100% rename from monosodium-glutamate-g/hardware-configuration.nix rename to hosts/monosodium-glutamate-g/hardware-configuration.nix diff --git a/potatobook-g/configuration.nix b/hosts/potatobook-g/configuration.nix similarity index 99% rename from potatobook-g/configuration.nix rename to hosts/potatobook-g/configuration.nix index ace2196..6d890f2 100644 --- a/potatobook-g/configuration.nix +++ b/hosts/potatobook-g/configuration.nix @@ -12,8 +12,8 @@ # ./t2.nix # "${builtins.fetchGit { url = "https://github.com/kekrby/nixos-hardware.git"; }}/apple/t2" ./hardware-configuration.nix - ../common.nix - ../modules + ../../common.nix + ../../modules #inputs.mms.module ]; diff --git a/potatobook-g/hardware-configuration.nix b/hosts/potatobook-g/hardware-configuration.nix similarity index 100% rename from potatobook-g/hardware-configuration.nix rename to hosts/potatobook-g/hardware-configuration.nix diff --git a/potatobook-g/iso.nix b/hosts/potatobook-g/iso.nix similarity index 100% rename from potatobook-g/iso.nix rename to hosts/potatobook-g/iso.nix diff --git a/schrottserver/configuration.nix b/hosts/schrottserver/configuration.nix similarity index 93% rename from schrottserver/configuration.nix rename to hosts/schrottserver/configuration.nix index ab764c8..a426de4 100644 --- a/schrottserver/configuration.nix +++ b/hosts/schrottserver/configuration.nix @@ -8,15 +8,15 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../common.nix + ../../common.nix ./proxy.nix ./vaultwarden.nix ./nextcloud.nix ./mumble.nix ./microbin.nix - ../modules/neovim.nix - ../modules/zsh.nix - ../modules/firewall.nix + ../../modules/neovim.nix + ../../modules/zsh.nix + ../../modules/firewall.nix #./synapse.nix ./penpot.nix ]; diff --git a/schrottserver/hardware-configuration.nix b/hosts/schrottserver/hardware-configuration.nix similarity index 100% rename from schrottserver/hardware-configuration.nix rename to hosts/schrottserver/hardware-configuration.nix diff --git a/schrottserver/microbin.nix b/hosts/schrottserver/microbin.nix similarity index 100% rename from schrottserver/microbin.nix rename to hosts/schrottserver/microbin.nix diff --git a/schrottserver/mumble.nix b/hosts/schrottserver/mumble.nix similarity index 100% rename from schrottserver/mumble.nix rename to hosts/schrottserver/mumble.nix diff --git a/schrottserver/nextcloud.nix b/hosts/schrottserver/nextcloud.nix similarity index 100% rename from schrottserver/nextcloud.nix rename to hosts/schrottserver/nextcloud.nix diff --git a/schrottserver/penpot.nix b/hosts/schrottserver/penpot.nix similarity index 100% rename from schrottserver/penpot.nix rename to hosts/schrottserver/penpot.nix diff --git a/schrottserver/proxy.nix b/hosts/schrottserver/proxy.nix similarity index 100% rename from schrottserver/proxy.nix rename to hosts/schrottserver/proxy.nix diff --git a/schrottserver/synapse.nix b/hosts/schrottserver/synapse.nix similarity index 100% rename from schrottserver/synapse.nix rename to hosts/schrottserver/synapse.nix diff --git a/schrottserver/vaultwarden.nix b/hosts/schrottserver/vaultwarden.nix similarity index 100% rename from schrottserver/vaultwarden.nix rename to hosts/schrottserver/vaultwarden.nix diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index b91878f..158cebb 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -2,20 +2,20 @@ let cfg = config.jade.desktop; - window-screenshot = pkgs.writeShellScriptBin "window-screenshot.sh" (builtins.readFile ../../scripts/desktop/window-screenshot.sh); + window-screenshot = pkgs.writeShellScriptBin "window-screenshot.sh" (builtins.readFile ../../other/scripts/desktop/window-screenshot.sh); # desktop-ctl = pkgs.writeShellScriptBin "desktop-ctl.sh" (builtins.readFile ../scripts/desktop/desktop-ctl.sh); - desktop-ctl = import ../../scripts/desktop/desktopctl.nix { pkgs = pkgs; }; + desktop-ctl = import ../../other/scripts/desktop/desktopctl.nix { inherit pkgs; }; # search and open in browser - searchwolf = import ../../scripts/desktop/searchwolf.nix { pkgs = pkgs; }; + searchwolf = import ../../other/scripts/desktop/searchwolf.nix { inherit pkgs; }; # permaclip - pc-get = pkgs.writeShellScriptBin "pc-get.sh" (builtins.readFile ../../scripts/desktop/permaclip/pc-get.sh); - pc-set = pkgs.writeShellScriptBin "pc-set.sh" (builtins.readFile ../../scripts/desktop/permaclip/pc-set.sh); - em-record = pkgs.writeShellScriptBin "em-record.sh" (builtins.readFile ../../scripts/desktop/macros/record.sh); - em-play = pkgs.writeShellScriptBin "em-play.sh" (builtins.readFile ../../scripts/desktop/macros/play.sh); - em-play-loop = pkgs.writeShellScriptBin "em-play-loop.sh" (builtins.readFile ../../scripts/desktop/macros/play-loop.sh); - ocr-screenshot = pkgs.writeShellScriptBin "ocr-screenshot.sh" (builtins.readFile ../../scripts/desktop/ocr-screenshot.sh); + pc-get = pkgs.writeShellScriptBin "pc-get.sh" (builtins.readFile ../../other/scripts/desktop/permaclip/pc-get.sh); + pc-set = pkgs.writeShellScriptBin "pc-set.sh" (builtins.readFile ../../other/scripts/desktop/permaclip/pc-set.sh); + em-record = pkgs.writeShellScriptBin "em-record.sh" (builtins.readFile ../../other/scripts/desktop/macros/record.sh); + em-play = pkgs.writeShellScriptBin "em-play.sh" (builtins.readFile ../../other/scripts/desktop/macros/play.sh); + em-play-loop = pkgs.writeShellScriptBin "em-play-loop.sh" (builtins.readFile ../../other/scripts/desktop/macros/play-loop.sh); + ocr-screenshot = pkgs.writeShellScriptBin "ocr-screenshot.sh" (builtins.readFile ../../other/scripts/desktop/ocr-screenshot.sh); # rofi calculator copied from https://github.com/barbuk/menu-qalc - menu-qalc = pkgs.writeShellScriptBin "menu-qalc" (builtins.readFile ../../scripts/desktop/menu-qalc.sh); + menu-qalc = pkgs.writeShellScriptBin "menu-qalc" (builtins.readFile ../../other/scripts/desktop/menu-qalc.sh); #bitw = pkgs.buildGo118Module rec { #pname = "bitw"; #version = "0.1.0"; @@ -138,244 +138,35 @@ in with lib; { home-manager.users.jade = { pkgs, ... }: { programs.rofi.theme = ../../other/rofi-themes/applauncher.rasi; home.packages = with pkgs; [ - i3lock-fancy - rofi - rofimoji - feh - xorg.xinput - dunst - arandr - flameshot - tesseract5 - imagemagick - xclip - xmacro - libwacom - wacomtablet - xorg.xev + i3lock-fancy rofi rofimoji feh xorg.xinput dunst arandr flameshot + tesseract5 imagemagick xclip xmacro libwacom wacomtablet xorg.xev # categories # filemanager - xfce.thunar - xfce.tumbler - xfce.thunar-archive-plugin - gnome.file-roller + xfce.thunar xfce.tumbler xfce.thunar-archive-plugin gnome.file-roller # media/file viewers - vlc - evince - nomacs + vlc evince nomacs # from environment.systemPackages cleanup - font-manager - xdotool - xorg.xwininfo - gparted - librewolf - firefox - uhk-agent - cool-retro-term - xdg-desktop-portal-gtk - nheko - obsidian - virt-manager - ddccontrol-db - firebird-emu - godot - gitg - gpick - qdirstat - ffmpeg_5 + font-manager xdotool xorg.xwininfo gparted librewolf firefox uhk-agent + cool-retro-term xdg-desktop-portal-gtk nheko obsidian virt-manager + ddccontrol-db firebird-emu godot gitg gpick qdirstat ffmpeg_5 # external - libnotify - i3lock-fancy - rofi - rofimoji - feh - xorg.xinput - dunst - arandr - flameshot - tesseract5 - imagemagick - xclip - polybar - kitty - xmacro - brightnessctl - drawing # drwaing! - libqalculate # needed by menu-qalc - ddgr jq # needed by searchwolf - brillo # kb backlight + libnotify i3lock-fancy rofi rofimoji feh xorg.xinput dunst arandr + flameshot tesseract5 imagemagick xclip polybar kitty xmacro + brightnessctl drawing libqalculate ddgr jq brillo # custom scripts - window-screenshot - desktop-ctl - em-record - em-play - em-play-loop - ocr-screenshot - menu-qalc - pc-get - pc-set - searchwolf + window-screenshot desktop-ctl em-record em-play em-play-loop + ocr-screenshot menu-qalc pc-get pc-set searchwolf # meow oneko - ]; - # i3 {{{ xsession = { enable = true; - windowManager.i3 = { - enable = false; - config = { - bars = []; - workspaceAutoBackAndForth = true; - focus = { - followMouse = false; - }; - # Startup {{{ - startup = [ - # wallpaper - { - command = "feh --bg-fill ${../../other/wallpaper.jpg}"; - always = true; - notification = false; - } - - # meowmeowmeow - { - command = "pkill oneko; oneko -tofocus -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"; - always = true; - } - ]; - # }}} - # Assigns {{{ - assigns = { - "1" = [ - { class = "discord"; } - { class = "nheko"; } - ]; - "2" = [ - { class = "librewolf"; } - ]; - }; - # }}} - # Keyboard shortcuts {{{ - modifier = "Mod4"; - modes = { - resize = with { - # mod = builtins.break config.xsession.windowManager.i3.config.modifier; - mod = builtins.break "Mod4"; - }; { - aaa = builtins.break "a"; - "${mod}+h" = "resize shrink width 10 px or 10 ppt"; - "${mod}+j" = "resize grow height 10 px or 10 ppt"; - "${mod}+k" = "resize shrink height 10 px or 10 ppt"; - "${mod}+l" = "resize grow width 10 px or 10 ppt"; - - "Return" = "mode default"; - "Escape" = "mode default"; - "${mod}+r" = "mode default"; - }; - }; - keybindings = with { - #mod = config.xsession.windowManager.i3.config.modifier; - mod = "Mod4"; - }; lib.mkOptionDefault { - # switch window focus - "${mod}+h" = "focus left"; - "${mod}+j" = "focus down"; - "${mod}+k" = "focus up"; - "${mod}+l" = "focus right"; - # move windows - "${mod}+Shift+h" = "move left"; - "${mod}+Shift+j" = "move down"; - "${mod}+Shift+k" = "move up"; - "${mod}+Shift+l" = "move right"; - # layout shit - "${mod}+shift+semicolon" = "split h"; - "${mod}+semicolon" = "split v"; - "${mod}+f" = "fullscreen toggle"; - "${mod}+Shift+w" = "layout tabbed"; - "${mod}+e" = "layout toggle split"; - "${mod}+Shift+space" = "floating toggle"; - # focus parents/children - "${mod}+Shift+a" = "focus parent"; - "${mod}+Shift+c" = "focus child"; - # screenshot - "${mod}+w" = "exec window-screenshot.sh"; - "${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots"; - "${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots"; - "${mod}+t" = "exec ocr-screenshot.sh"; - - # rofi fuckery - "${mod}+d" = "exec --no-startup-id rofi -show drun -theme ${../../other/rofi-themes/applauncher.rasi}"; - "${mod}+space" = "exec --no-startup-id rofi -show combi -combi-show window#run -modes combi -theme ${../../other/rofi-themes/applauncher.rasi}"; - "${mod}+i" = "exec --no-startup-id rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"; - "${mod}+Shift+e" = "exec --no-startup-id rofi -show \"desktopctl\" -modes \"desktopctl:${desktop-ctl.outPath}/bin/desktopctl\" -theme ${../../other/rofi-themes/applauncher.rasi}"; - "${mod}+m" = "exec --no-startup-id menu-qalc"; - - "${mod}+o" = "exec --no-startup-id rofi -show searchwolf -modes \"searchwolf:${searchwolf.outPath}/bin/searchwolf\""; - - # audio - "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status"; - "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status"; - "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status"; - "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status"; - - "XF86AudioNext" = "exec playerctl next"; - "XF86AudioPrev" = "exec playerctl previous"; - "XF86AudioPause" = "exec playerctl pause"; - "XF86AudioPlay" = "exec playerctl play"; - "XF86AudioStop" = "exec playerctl stop"; - - "XF86MonBrightnessUp" = "exec brightnessctl set 5%+"; - "XF86MonBrightnessDown" = "exec brightnessctl set 5%-"; - - "XF86KbdBrightnessUp" = "exec brillo -kA 10.0"; - "XF86KbdBrightnessDown" = "exec brillo -kU 10.0"; - - # macros - "${mod}+q" = "exec em-record.sh"; - "${mod}+p" = "exec em-play.sh"; - "${mod}+Shift+p" = "exec em-play-loop.sh"; - - # permaclip - "${mod}+c" = "exec rofi -show register -modes \"register:${pc-set.outPath}/bin/pc-set.sh\" -theme gruvbox-dark"; - "${mod}+v" = "exec rofi -show register -modes \"register:${pc-get.outPath}/bin/pc-get.sh\" -theme gruvbox-dark"; - }; - # }}} - # Visuals {{{ - fonts = { - names = [ "Atkinson Hyperlegible" ]; - style = "Regular"; - size = 9.0; - }; - gaps = { - #top = 24; - inner = 15; - outer = 0; - smartGaps = true; - smartBorders = "on"; - }; - colors = { - background = "#1d2021"; - focused = { background = "#282828"; border = "#504945"; childBorder = "#7c6f64"; indicator = "#504945"; text = "#ebdbb2"; }; - focusedInactive = { background = "#1d2021"; border = "#504945"; childBorder = "#665c54"; indicator = "#664c54"; text = "#d5c4a1"; }; - placeholder = { background = "#1d2021"; border = "#00ff00"; childBorder = "#504945"; indicator = "#504945"; text = "#928374"; }; - unfocused = { background = "#1d2021"; border = "#3c3836"; childBorder = "#504945"; indicator = "#504945"; text = "#bdae93"; }; - urgent = { background = "#9d0006"; border = "#cc241d"; childBorder = "#3c3836"; indicator = "#fb4943"; text = "#ebdbb2"; }; - }; - window = { - border = 2; - titlebar = false; - }; - # }}} - }; - }; }; }; }; diff --git a/modules/desktop/i3/default.nix b/modules/desktop/i3/default.nix new file mode 100644 index 0000000..4fa0289 --- /dev/null +++ b/modules/desktop/i3/default.nix @@ -0,0 +1,159 @@ +{ config, lib, pkgs, ... }: +with lib; { + options.jade.desktop.i3wm = { + enable = mkEnableOption "Enable i3wm"; + }; + config = mkIf cfg.enable { + services.xserver.windowManager.i3.enable = true; + home-manager.users.jade = { pkgs, ... }: { + xsession.windowManager.i3 = { + enable = false; + config = { + bars = []; + workspaceAutoBackAndForth = true; + focus = { + followMouse = false; + }; + # Startup {{{ + startup = [ + # wallpaper + { + command = "feh --bg-fill ${../../other/wallpaper.jpg}"; + always = true; + notification = false; + } + + # meowmeowmeow + { + command = "pkill oneko; oneko -tofocus -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"; + always = true; + } + ]; + # }}} + # Assigns {{{ + assigns = { + "1" = [ + { class = "discord"; } + { class = "nheko"; } + ]; + "2" = [ + { class = "librewolf"; } + ]; + }; + # }}} + # Keyboard shortcuts {{{ + modifier = "Mod4"; + modes = { + resize = with { + # mod = builtins.break config.xsession.windowManager.i3.config.modifier; + mod = builtins.break "Mod4"; + }; { + aaa = builtins.break "a"; + "${mod}+h" = "resize shrink width 10 px or 10 ppt"; + "${mod}+j" = "resize grow height 10 px or 10 ppt"; + "${mod}+k" = "resize shrink height 10 px or 10 ppt"; + "${mod}+l" = "resize grow width 10 px or 10 ppt"; + + "Return" = "mode default"; + "Escape" = "mode default"; + "${mod}+r" = "mode default"; + }; + }; + keybindings = with { + #mod = config.xsession.windowManager.i3.config.modifier; + mod = "Mod4"; + }; lib.mkOptionDefault { + # switch window focus + "${mod}+h" = "focus left"; + "${mod}+j" = "focus down"; + "${mod}+k" = "focus up"; + "${mod}+l" = "focus right"; + # move windows + "${mod}+Shift+h" = "move left"; + "${mod}+Shift+j" = "move down"; + "${mod}+Shift+k" = "move up"; + "${mod}+Shift+l" = "move right"; + # layout shit + "${mod}+shift+semicolon" = "split h"; + "${mod}+semicolon" = "split v"; + "${mod}+f" = "fullscreen toggle"; + "${mod}+Shift+w" = "layout tabbed"; + "${mod}+e" = "layout toggle split"; + "${mod}+Shift+space" = "floating toggle"; + # focus parents/children + "${mod}+Shift+a" = "focus parent"; + "${mod}+Shift+c" = "focus child"; + # screenshot + "${mod}+w" = "exec window-screenshot.sh"; + "${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots"; + "${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots"; + "${mod}+t" = "exec ocr-screenshot.sh"; + + # rofi fuckery + "${mod}+d" = "exec --no-startup-id rofi -show drun -theme ${../../other/rofi-themes/applauncher.rasi}"; + "${mod}+space" = "exec --no-startup-id rofi -show combi -combi-show window#run -modes combi -theme ${../../other/rofi-themes/applauncher.rasi}"; + "${mod}+i" = "exec --no-startup-id rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy"; + "${mod}+Shift+e" = "exec --no-startup-id rofi -show \"desktopctl\" -modes \"desktopctl:${desktop-ctl.outPath}/bin/desktopctl\" -theme ${../../other/rofi-themes/applauncher.rasi}"; + "${mod}+m" = "exec --no-startup-id menu-qalc"; + + "${mod}+o" = "exec --no-startup-id rofi -show searchwolf -modes \"searchwolf:${searchwolf.outPath}/bin/searchwolf\""; + + # audio + "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status"; + "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status"; + "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status"; + "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status"; + + "XF86AudioNext" = "exec playerctl next"; + "XF86AudioPrev" = "exec playerctl previous"; + "XF86AudioPause" = "exec playerctl pause"; + "XF86AudioPlay" = "exec playerctl play"; + "XF86AudioStop" = "exec playerctl stop"; + + "XF86MonBrightnessUp" = "exec brightnessctl set 5%+"; + "XF86MonBrightnessDown" = "exec brightnessctl set 5%-"; + + "XF86KbdBrightnessUp" = "exec brillo -kA 10.0"; + "XF86KbdBrightnessDown" = "exec brillo -kU 10.0"; + + # macros + "${mod}+q" = "exec em-record.sh"; + "${mod}+p" = "exec em-play.sh"; + "${mod}+Shift+p" = "exec em-play-loop.sh"; + + # permaclip + "${mod}+c" = "exec rofi -show register -modes \"register:${pc-set.outPath}/bin/pc-set.sh\" -theme gruvbox-dark"; + "${mod}+v" = "exec rofi -show register -modes \"register:${pc-get.outPath}/bin/pc-get.sh\" -theme gruvbox-dark"; + }; + # }}} + # Visuals {{{ + fonts = { + names = [ "Atkinson Hyperlegible" ]; + style = "Regular"; + size = 9.0; + }; + gaps = { + #top = 24; + inner = 15; + outer = 0; + smartGaps = true; + smartBorders = "on"; + }; + colors = { + background = "#1d2021"; + focused = { background = "#282828"; border = "#504945"; childBorder = "#7c6f64"; indicator = "#504945"; text = "#ebdbb2"; }; + focusedInactive = { background = "#1d2021"; border = "#504945"; childBorder = "#665c54"; indicator = "#664c54"; text = "#d5c4a1"; }; + placeholder = { background = "#1d2021"; border = "#00ff00"; childBorder = "#504945"; indicator = "#504945"; text = "#928374"; }; + unfocused = { background = "#1d2021"; border = "#3c3836"; childBorder = "#504945"; indicator = "#504945"; text = "#bdae93"; }; + urgent = { background = "#9d0006"; border = "#cc241d"; childBorder = "#3c3836"; indicator = "#fb4943"; text = "#ebdbb2"; }; + }; + window = { + border = 2; + titlebar = false; + }; + # }}} + }; + }; + }; + }; +} diff --git a/scripts/desktop/desktopctl.nix b/other/scripts/desktop/desktopctl.nix similarity index 71% rename from scripts/desktop/desktopctl.nix rename to other/scripts/desktop/desktopctl.nix index c255298..a369eda 100644 --- a/scripts/desktop/desktopctl.nix +++ b/other/scripts/desktop/desktopctl.nix @@ -28,8 +28,8 @@ pkgs.writeShellScriptBin "desktopctl" '' # fixes brown line below input bar echo -en "\0theme\x1finputbar{margin:0;}\n" - echo -en "Lock Screen\0icon\x1f${../../other/assets/desktopctl/lock-screen.svg}\n" - echo -en "Log Out\0icon\x1f${../../other/assets/desktopctl/logout.svg}\n" - echo -en "Shut Down\0icon\x1f${../../other/assets/desktopctl/shutdown.svg}\n" - echo -en "Reboot\0icon\x1f${../../other/assets/desktopctl/reboot.svg}\n" + echo -en "Lock Screen\0icon\x1f${../../../other/assets/desktopctl/lock-screen.svg}\n" + echo -en "Log Out\0icon\x1f${../../../other/assets/desktopctl/logout.svg}\n" + echo -en "Shut Down\0icon\x1f${../../../other/assets/desktopctl/shutdown.svg}\n" + echo -en "Reboot\0icon\x1f${../../../other/assets/desktopctl/reboot.svg}\n" '' diff --git a/scripts/desktop/macros/play-loop.sh b/other/scripts/desktop/macros/play-loop.sh similarity index 100% rename from scripts/desktop/macros/play-loop.sh rename to other/scripts/desktop/macros/play-loop.sh diff --git a/scripts/desktop/macros/play.sh b/other/scripts/desktop/macros/play.sh similarity index 100% rename from scripts/desktop/macros/play.sh rename to other/scripts/desktop/macros/play.sh diff --git a/scripts/desktop/macros/record.sh b/other/scripts/desktop/macros/record.sh similarity index 100% rename from scripts/desktop/macros/record.sh rename to other/scripts/desktop/macros/record.sh diff --git a/scripts/desktop/menu-qalc.sh b/other/scripts/desktop/menu-qalc.sh similarity index 100% rename from scripts/desktop/menu-qalc.sh rename to other/scripts/desktop/menu-qalc.sh diff --git a/scripts/desktop/ocr-screenshot.sh b/other/scripts/desktop/ocr-screenshot.sh similarity index 100% rename from scripts/desktop/ocr-screenshot.sh rename to other/scripts/desktop/ocr-screenshot.sh diff --git a/scripts/desktop/permaclip/pc-get.sh b/other/scripts/desktop/permaclip/pc-get.sh similarity index 100% rename from scripts/desktop/permaclip/pc-get.sh rename to other/scripts/desktop/permaclip/pc-get.sh diff --git a/scripts/desktop/permaclip/pc-set.sh b/other/scripts/desktop/permaclip/pc-set.sh similarity index 100% rename from scripts/desktop/permaclip/pc-set.sh rename to other/scripts/desktop/permaclip/pc-set.sh diff --git a/scripts/desktop/searchwolf.nix b/other/scripts/desktop/searchwolf.nix similarity index 100% rename from scripts/desktop/searchwolf.nix rename to other/scripts/desktop/searchwolf.nix diff --git a/scripts/desktop/searchwolf.sh b/other/scripts/desktop/searchwolf.sh similarity index 100% rename from scripts/desktop/searchwolf.sh rename to other/scripts/desktop/searchwolf.sh diff --git a/scripts/desktop/window-screenshot.sh b/other/scripts/desktop/window-screenshot.sh similarity index 100% rename from scripts/desktop/window-screenshot.sh rename to other/scripts/desktop/window-screenshot.sh