[nix] Port over more changes from last home-manager build

This commit is contained in:
Sebastian Schulze 2021-03-08 15:04:02 +01:00
parent 10cb3513aa
commit 0b90bf90bc
Signed by: bascht
GPG Key ID: 5BCB1D3B4D38A35A
11 changed files with 19 additions and 40 deletions

View File

@ -1,5 +1,4 @@
PATH=$HOME/.local/bin:$HOME/bin:$HOME/bin/go/bin:$HOME/.cargo/bin:$HOME/.emacs.d/bin:$PATH
THIS_CAME_FROM_SYSTEM="yo"
XDG_CURRENT_DESKTOP=GNOME
MOZ_ENABLE_WAYLAND=1
MOZ_USE_XINPUT2=1

View File

@ -50,8 +50,8 @@ format_swap = "{SUpi}%"
[[block]]
block = "networkmanager"
on_click = "alacritty -e nmtui"
interface_name_exclude = ["br\\-[0-9a-f]{12}", "docker\\d+", "tun0", "virbr\\-[0-9]{12}"]
interface_name_include = []
#interface_name_exclude = ["br\\-[0-9a-f]{12}", "docker\\d+", "tun0", "virbr\\-[0-9]{12}"]
#interface_name_include = []
device_format = "{icon}{ap}"
[[block]]

View File

@ -199,7 +199,6 @@
services.nextcloud-client.enable = true;
services.emacs.enable = true;
services.emacs.socketActivation.enable = true;
programs.emacs.enable = true;
# This value determines the Home Manager release that your

View File

@ -62,7 +62,7 @@ set $display_coworking "Dell Inc. DELL U2713H C6F0K34O095L"
### Output configuration
#
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
output * bg ~/Pictures/Wallpapers/snowy-trees.png fill
output * bg ~/Pictures/Wallpapers/mountains-pale.jpg fill
output $display_dell transform 270 pos 0 0
output $display_lg mode 3440x1440@49.987000Hz pos 1200 290
output $display_coworking pos 2560 0
@ -107,7 +107,6 @@ input "2:7:SynPS/2_Synaptics_TouchPad" {
input "1133:45074:MX_Master_Mouse" {
natural_scroll enabled
accel_profile flat
}
input "1739:0:Synaptics_TM3381-002" {
@ -134,6 +133,7 @@ input "1390:269:ELECOM_TrackBall_Mouse_HUGE_TrackBall" {
natural_scroll enabled
scroll_button 279
scroll_method on_button_down
accel_profile adaptive
}
input "65261:4871:ErgoDox_EZ_ErgoDox_EZ" {
@ -163,18 +163,18 @@ bindsym $mod+shift+s sticky toggle
#
# Mine
bindsym XF86AudioRaiseVolume exec amixer -D pulse sset Master 1%+
bindsym $mod+Prior exec amixer -D pulse sset Master 1%+
bindsym XF86AudioLowerVolume exec amixer -D pulse sset Master 1%-
bindsym $mod+Next exec amixer -D pulse sset Master 1%-
bindsym XF86AudioMute exec amixer -D pulse set Master toggle
bindsym XF86AudioRaiseVolume exec pactl -- set-sink-volume @DEFAULT_SINK@ +1%
bindsym $mod+Prior exec pactl -- set-sink-volume @DEFAULT_SINK@ +1%
bindsym XF86AudioLowerVolume exec pactl -- set-sink-volume @DEFAULT_SINK@ -1%
bindsym $mod+Next exec pactl -- set-sink-volume @DEFAULT_SINK@ -1%
bindsym XF86AudioMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
bindsym XF86MonBrightnessUp exec brightnessctl set 5%+
bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
bindsym XF86AudioNext exec mpc next
bindsym XF86AudioPrev exec mpc prev
bindsym XF86AudioPlay exec mpc toggle
bindsym XF86AudioNext exec playerctl next
bindsym XF86AudioPrev exec playerctl prev
bindsym XF86AudioPlay exec playerctl play-pause
bindsym Print exec screenshot
bindsym shift+Print exec screenshot -s
@ -377,8 +377,7 @@ mode $mode_run {
bindsym w exec firefox; mode "default";
bindsym $mod+w exec chromium-browser; mode "default";
bindsym e exec em -c; mode "default"
bindsym $mod+e exec emacs; mode "default"
bindsym e exec alacritty --class emacs -e '/home/bascht/bin/em'; mode "default"
bindsym f exec screenshot-folder; mode "default"
bindsym $mod+f exec nautilus; mode "default"

View File

@ -1 +0,0 @@
/home/bascht/.config/systemd/user/emacs.service

View File

@ -1 +0,0 @@
/home/bascht/.config/systemd/user/mopidy.service

View File

@ -3,4 +3,5 @@ Description=Sync Owncloud + Todoist Calenders into OrgMode
[Service]
Type=oneshot
ExecStart=/home/bascht/Code/ical2org/sync.sh
ExecStart=/run/current-system/sw/bin/nix-shell --run ./sync.sh
WorkingDirectory=/home/bascht/Code/ical2org

View File

@ -1,16 +0,0 @@
[Unit]
Description=Mopidy
Description=Mopidy music server
After=avahi-daemon.service
After=dbus.service
After=network.target
After=nss-lookup.target
After=pulseaudio.service
After=remote-fs.target
After=sound.target
[Service]
ExecStart=/home/bascht/.local/bin/mopidy
[Install]
WantedBy=default.target

View File

@ -43,7 +43,7 @@
:checkers
(syntax +childframe) ; tasing you for every semicolon you forget
(spell +flyspell) ; tasing you for misspelling mispelling
(spell +flyspell +aspell) ; tasing you for misspelling mispelling
grammar ; tasing grammar mistake every you make
:tools
@ -67,6 +67,7 @@
json ; At least it ain't XML
ledger ; an accounting system in Emacs
markdown ; writing docs for people to ignore
nix ; I hereby declare "nix geht mehr!"
org ; organize your plain life in plain text
(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
sh ; she sells {ba,z,fi}sh shells on the C xor
@ -77,7 +78,7 @@
:app
calendar
everywhere ; *leave* Emacs!? You must be joking
;everywhere ; *leave* Emacs!? You must be joking
(rss +org) ; emacs as an RSS reader
:config

View File

@ -65,9 +65,6 @@
[branch]
autosetuprebase = always
[gpg]
program = /usr/bin/gpg2
[tig]
line-graphics = utf-8
reference-format = (branch) <tag>

View File

@ -37,6 +37,7 @@ export DISABLE_AUTO_UPDATE="true"
source $ZSH/oh-my-zsh.sh
source $ZSH_CUSTOM/plugins/fzf-marks/fzf-marks.plugin.zsh
source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
{{- if or (eq .chezmoi.hostname "pierogi") (eq .chezmoi.hostname "apfelstrudel") }}
export GPG_TTY="$(tty)"