diff --git a/apply.sh b/apply.sh new file mode 100755 index 0000000..f833c85 --- /dev/null +++ b/apply.sh @@ -0,0 +1 @@ +home-manager switch --flake .?submodules=1 diff --git a/i3.nix b/i3.nix index 27c7792..0e6a2fc 100644 --- a/i3.nix +++ b/i3.nix @@ -2,49 +2,38 @@ imports = [ ./programs/firefox.nix ./programs/polybar.nix + ./programs/chromium.nix ./programs/gnome-terminal.nix ]; + programs.browserpass.enable = true; + + home.packages = with pkgs; [ + feh + arandr + brightnessctl + pavucontrol + blueman + rofi + pinentry-qt + gnome-terminal + networkmanagerapplet + loupe + xorg.xkill + ]; + home.file = { ".config/IJHack/QtPass.conf".source = ./assets/QtPass.conf; - - "fixbluetooth" = { - executable = true; - source = ./assets/resetbluetooth.sh; - }; - }; - - # Dell Precision Nonsense - home.packages = with pkgs; [ - alsa-utils - ]; - home.file."precision/fixmicrophone" = { - executable = true; - text = '' - # https://github.com/NixOS/nixpkgs/issues/294170 - sudo ln -s /run/current-system/sw/bin/rm /bin - sudo ln -s /run/current-system/sw/bin/mkdir /bin - - # https://discourse.nixos.org/t/dell-xps-13-9320-microphone-not-working/40932/3 - sudo alsactl init - systemctl --user restart pipewire - ''; - }; - - programs.browserpass.enable = true; - programs.chromium = { - enable = true; - extensions = [ - { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # UBlock Origin - { id = "dbepggeogbaibhgnhhndojpepiihcmeb"; } # Vimium - { id = "naepdomgkenhinolocfifgehidddafch"; } # Browserpass - ]; }; # picom --vsync --experimental-backend xsession.windowManager.i3 = { enable = true; - config.bars = []; + + config = { + bars = []; + }; + extraConfig = '' ################################################################################ set $mod Mod4 @@ -74,7 +63,7 @@ exec nm-applet # Allow gnome apps to prompt for password - exec --no-startup-id /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 & + #exec --no-startup-id /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 & # Various gnome-settings-daemon helpers exec --no-startup-id /usr/libexec/gsd-backlight-helper & @@ -241,16 +230,6 @@ bindsym $mod+Ctrl+8 workspace 18 bindsym $mod+Ctrl+9 workspace 19 bindsym $mod+Ctrl+0 workspace 20 - bindsym $mod+mod1+Ctrl+1 workspace 21 - bindsym $mod+mod1+Ctrl+2 workspace 22 - bindsym $mod+mod1+Ctrl+3 workspace 23 - bindsym $mod+mod1+Ctrl+4 workspace 24 - bindsym $mod+mod1+Ctrl+5 workspace 25 - bindsym $mod+mod1+Ctrl+6 workspace 26 - bindsym $mod+mod1+Ctrl+7 workspace 27 - bindsym $mod+mod1+Ctrl+8 workspace 28 - bindsym $mod+mod1+Ctrl+9 workspace 29 - bindsym $mod+mod1+Ctrl+0 workspace 30 # move focused container to workspace bindsym $mod+Shift+1 move container to workspace 1 @@ -273,16 +252,6 @@ bindsym $mod+Ctrl+Shift+8 move container to workspace 18 bindsym $mod+Ctrl+Shift+9 move container to workspace 19 bindsym $mod+Ctrl+Shift+0 move container to workspace 20 - bindsym $mod+mod1+Ctrl+Shift+1 move container to workspace 21 - bindsym $mod+mod1+Ctrl+Shift+2 move container to workspace 22 - bindsym $mod+mod1+Ctrl+Shift+3 move container to workspace 23 - bindsym $mod+mod1+Ctrl+Shift+4 move container to workspace 24 - bindsym $mod+mod1+Ctrl+Shift+5 move container to workspace 25 - bindsym $mod+mod1+Ctrl+Shift+6 move container to workspace 26 - bindsym $mod+mod1+Ctrl+Shift+7 move container to workspace 27 - bindsym $mod+mod1+Ctrl+Shift+8 move container to workspace 28 - bindsym $mod+mod1+Ctrl+Shift+9 move container to workspace 29 - bindsym $mod+mod1+Ctrl+Shift+0 move container to workspace 30 ################################################################################ # Other @@ -294,15 +263,11 @@ bindsym $mod+Control+Shift+l move workspace to output right # Cycle Through Workspaces - #bindsym $mod+Ctrl+j focus workspace prevonoutput - #bindsym $mod+Ctrl+semicolon focus workspace nextonoutput bindsym $mod+Ctrl+h focus workspace prevonoutput bindsym $mod+Ctrl+l focus workspace nextonoutput # Custom Workspace Names bindsym $mod+Control+r exec i3-input -F 'rename workspace to "%s"' -P 'Rename workspace to: ' - bindsym $mod+Control+s exec i3-input -F 'workspace "%s"' -P 'Switch to workspace: ' - bindsym $mod+Control+Shift+s exec i3-input -F 'move container to workspace "%s"' -P 'Move to workspace: ' # Move Windows through cycle bindsym $mod+Ctrl+Shift+Left move container to workspace prevonoutput diff --git a/programs/chromium.nix b/programs/chromium.nix new file mode 100644 index 0000000..0c965b6 --- /dev/null +++ b/programs/chromium.nix @@ -0,0 +1,10 @@ +{ ... }: { + programs.chromium = { + enable = true; + extensions = [ + { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # UBlock Origin + { id = "dbepggeogbaibhgnhhndojpepiihcmeb"; } # Vimium + { id = "naepdomgkenhinolocfifgehidddafch"; } # Browserpass + ]; + }; +} diff --git a/programs/polybar.nix b/programs/polybar.nix index d447ba2..e838869 100644 --- a/programs/polybar.nix +++ b/programs/polybar.nix @@ -1,4 +1,13 @@ { pkgs, home-manager, ... }: { + home.packages = with pkgs; [ + # TODO: Why no work? + #nerdfonts + + siji + font-awesome + font-awesome_5 + ]; + services.polybar = { enable = true; package = pkgs.polybar.override { diff --git a/systems/latitude-e5591.nix b/systems/latitude-e5591.nix new file mode 100644 index 0000000..7e1cb72 --- /dev/null +++ b/systems/latitude-e5591.nix @@ -0,0 +1,33 @@ +{ ... }: { + home.file = { + "latitude/tv" = { + executable = true; + text = '' + xrandr \ + --output eDP-1 --mode 1920x1080 --primary \ + --output DP-2-2 --mode 1920x1080 + ''; + }; + "latitude/desk" = { + executable = true; + text = '' + xrandr \ + --output eDP-1 --off \ + --output DP-2-1 --mode 3840x2160 --rate 30 --right-of DP-2-2 \ + --output DP-2-2 --mode 3840x2160 --rate 30 --primary + i3-msg restart + ''; + }; + "latitude/standalone" = { + executable = true; + text = '' + xrandr \ + --output eDP-1 --mode 1920x1080 --primary \ + --output DP-2-1 --off \ + --output DP-2-2 --off \ + --output DP-2-3 --off + i3-msg restart + ''; + }; + }; +} diff --git a/systems/ll-latitude-e5591.nix b/systems/ll-latitude-e5591.nix index 5ebe299..e3f34ae 100644 --- a/systems/ll-latitude-e5591.nix +++ b/systems/ll-latitude-e5591.nix @@ -1,81 +1,39 @@ -#{ pkgs, pkgs-unstable, ... }: { { pkgs, ... }: { imports = [ + ./latitude-e5591.nix + ../programs/thunderbird.nix ]; - - home.file = { - "latitude/tv" = { - executable = true; - text = '' - xrandr \ - --output eDP-1 --mode 1920x1080 --primary \ - --output DP-2-2 --mode 1920x1080 - ''; - }; - "latitude/desk" = { - executable = true; - text = '' - xrandr \ - --output eDP-1 --off \ - --output DP-2-1 --mode 3840x2160 --rate 30 --right-of DP-2-2 \ - --output DP-2-2 --mode 3840x2160 --rate 30 --primary - i3-msg restart - ''; - }; - "latitude/standalone" = { - executable = true; - text = '' - xrandr \ - --output eDP-1 --mode 1920x1080 --primary \ - --output DP-2-1 --off \ - --output DP-2-2 --off \ - --output DP-2-3 --off - i3-msg restart - ''; - }; - }; home.packages = with pkgs; [ - # TODO: Polybar Stuff - siji - font-awesome - font-awesome_5 - networkmanagerapplet + # TODO: Figure these ones out + #dunst + #xidlehook? - # TODO: i3 Stuff - gnome-terminal - rofi - i3status - i3lock - i3blocks - nemo-with-extensions - dunst - pinentry-qt - brightnessctl - shutter - pavucontrol - arandr - blueman - gparted - loupe + # Lauren Base GUI vlc mpv - xorg.xkill + gparted + shutter + nemo-with-extensions # Other Apps chromium - qtpass - - #pkgs-unstable.yt-dlp - #pkgs-unstable.openscad-unstable - yt-dlp + librecad + libreoffice + virt-manager + sublime-merge openscad-unstable - sublime-merge - libreoffice + # Dotspace gthumb + qtpass ledger sound-juicer + #pkgs-unstable.yt-dlp + #pkgs-unstable.openscad-unstable + + # ll-latitude-e5591 + wine ]; } diff --git a/systems/precision-xxxxx.nix b/systems/precision-xxxxx.nix new file mode 100644 index 0000000..d4dcdc1 --- /dev/null +++ b/systems/precision-xxxxx.nix @@ -0,0 +1,54 @@ +{ ... }: { + home.packages = with pkgs; [ + alsa-utils + ]; + + home.file = { + "precision/fixmicrophone" = { + executable = true; + text = '' + # https://github.com/NixOS/nixpkgs/issues/294170 + sudo ln -s /run/current-system/sw/bin/rm /bin + sudo ln -s /run/current-system/sw/bin/mkdir /bin + + # https://discourse.nixos.org/t/dell-xps-13-9320-microphone-not-working/40932/3 + sudo alsactl init + systemctl --user restart pipewire + ''; + }; + + "precision/home" = { + executable = true; + text = '' + xrandr \ + --output DP-4-3 --mode 3840x2160 --rate 30 --primary \ + --output DP-4-1 --mode 3840x2160 --rate 30 --right-of DP-4-3 \ + --output eDP-1 --off + i3-msg restart + ''; + }; + "precision/office" = { + executable = true; + text = '' + xrandr \ + --output DP-2-2 --mode 3840x2160 --rate 30 --primary \ + --output DP-2-1 --mode 3840x2160 --rate 30 --right-of DP-2-2 \ + --output eDP-1 --off + i3-msg restart + ''; + }; + "precision/standalone" = { + executable = true; + text = '' + xrandr \ + --output eDP-1 --mode 1920x1200 --primary \ + --output DP-4 --off \ + --output DP-2-1 --off \ + --output DP-2-2 --off \ + --output DP-4-1 --off \ + --output DP-4-3 --off + i3-msg restart + ''; + }; + }; +}