From 95eecb68569f080d66336a2f20850862d9cf7055 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 14 Jun 2018 16:04:36 -0700 Subject: [PATCH] Misc tweaks --- dotfiles/config/gtk-3.0/gtk.css | 1 - dotfiles/gitignore | 1 + dotfiles/xprofile | 2 +- nixos/configuration.nix | 1 + nixos/machines/imalison-home.nix | 6 ++++++ tasks/shell/enable_user_units.sh | 2 -- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dotfiles/config/gtk-3.0/gtk.css b/dotfiles/config/gtk-3.0/gtk.css index d51e3994..7c9d0cb2 100644 --- a/dotfiles/config/gtk-3.0/gtk.css +++ b/dotfiles/config/gtk-3.0/gtk.css @@ -22,7 +22,6 @@ bind "d" { "delete-from-cursor" (word-ends, 1) }; bind "BackSpace" { "delete-from-cursor" (word-ends, -1) }; bind "k" { "delete-from-cursor" (paragraph-ends, 1) }; - bind "backslash" { "delete-from-cursor" (whitespace, 1) }; bind "space" { "delete-from-cursor" (whitespace, 1) "insert-at-cursor" (" ") }; diff --git a/dotfiles/gitignore b/dotfiles/gitignore index 5223d35e..95e40732 100644 --- a/dotfiles/gitignore +++ b/dotfiles/gitignore @@ -1,4 +1,5 @@ # emacs +.#* .emacs.desktop .emacs* projectile.cache diff --git a/dotfiles/xprofile b/dotfiles/xprofile index ea51963e..82bcdf19 100644 --- a/dotfiles/xprofile +++ b/dotfiles/xprofile @@ -3,8 +3,8 @@ # If there are issues with path, check /etc/profile for hard overrides of PATH. . "$HOME/.lib/login.sh" # XXX: prevents https://github.com/xmonad/xmonad/issues/86 from affecting startup +rm -f ~/.xmonad -rm -f ~/.xmonad/xmonad.state load_xkb_map.sh run_if_exists systemctl --user import-environment XDG_DATA_DIRS diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 9656b557..7f77237c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -132,6 +132,7 @@ in # Miscellaneous android-udev-rules librsvg + transmission-gtk ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/nixos/machines/imalison-home.nix b/nixos/machines/imalison-home.nix index 53fd22b5..a3f78654 100644 --- a/nixos/machines/imalison-home.nix +++ b/nixos/machines/imalison-home.nix @@ -9,6 +9,7 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + boot.loader.systemd-boot.enable = true; fileSystems."/" = { device = "/dev/disk/by-uuid/110e3bf8-19b7-4a39-8e2a-b4c3c0d59d0e"; @@ -25,6 +26,11 @@ fsType = "ext4"; }; + # fileSystems."/shared" = { + # device = "/dev/disk/by-uuid/4b6f1ca8-6b68-4bdb-b92c-d2d7ba080928"; + # fsType = "ntfs"; + # }; + swapDevices = [ { device = "/dev/disk/by-uuid/a6933b22-c7f4-4c57-b330-1450f313922e"; } { device = "/dev/disk/by-uuid/dbd49a76-4b3e-4b5c-9a88-68a9e61f6210"; } diff --git a/tasks/shell/enable_user_units.sh b/tasks/shell/enable_user_units.sh index 9679fedd..8c0fd8d4 100755 --- a/tasks/shell/enable_user_units.sh +++ b/tasks/shell/enable_user_units.sh @@ -6,8 +6,6 @@ enable_git_sync () { systemctl --user enable "$unit_name" } - unit_name=$(systemd-escape -p "$HOME/.password-store" --template git-sync@.service) - cd "$HOME/.config/systemd/user/" find * -type f | grep -v git-sync | grep -E "\.service$" | xargs -I unitname sh -c 'echo unitname && systemctl --user enable unitname'