Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2021-01-20 17:50:40 -08:00
commit 07653c4d05
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
4 changed files with 58 additions and 31 deletions

View File

@ -3880,11 +3880,6 @@ I've disabled magithub because it causes magit to be super slow
(progn (progn
(add-hook 'magit-mode-hook 'turn-on-magit-gitflow))) (add-hook 'magit-mode-hook 'turn-on-magit-gitflow)))
#+END_SRC #+END_SRC
** git-timemachine
#+BEGIN_SRC emacs-lisp
(use-package git-timemachine
:commands git-timemachine)
#+END_SRC
** git-gutter ** git-gutter
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package git-gutter (use-package git-gutter

View File

@ -0,0 +1,7 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)" };
xkb_geometry { include "pc(pc105)" };
};

View File

@ -161,6 +161,7 @@ in
clipit clipit
feh feh
gnome3.gpaste gnome3.gpaste
gnome3.gnome-tweaks
kdeconnect kdeconnect
libnotify libnotify
lxqt.lxqt-powermanagement lxqt.lxqt-powermanagement
@ -339,36 +340,14 @@ in
desktopManager = { desktopManager = {
plasma5.enable = true; plasma5.enable = true;
}; };
windowManager = {
session = [
{
name = "xmonad";
start = ''
/usr/bin/env imalison-xmonad &
waitPID=$!
'';
}
{
name = "waymonad";
start = ''
/usr/bin/env waymonad
waitPID=$!
'';
}
];
};
displayManager = { displayManager = {
sddm = { sddm.enable = true;
enable = true;
};
sessionCommands = '' sessionCommands = ''
systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
''; '';
}; };
}; };
virtualisation.docker.enable = true;
users.extraUsers = let users.extraUsers = let
extraGroups = [ extraGroups = [
"audio" "audio"
@ -391,18 +370,15 @@ in
in { in {
imalison = userDefaults // { imalison = userDefaults // {
name = "imalison"; name = "imalison";
uid = 1000;
home = "/home/imalison"; home = "/home/imalison";
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
kat = userDefaults // { kat = userDefaults // {
name = "kat"; name = "kat";
uid = 1001;
home = "/home/kat"; home = "/home/kat";
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
}; };
nix.trustedUsers = ["imalison"];
nix = { nix = {
package = pkgs.nixFlakes; package = pkgs.nixFlakes;
@ -410,4 +386,5 @@ in
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
}; };
nix.trustedUsers = ["imalison" "kat"];
} }

48
nixos/machines/adele.nix Normal file
View File

@ -0,0 +1,48 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:
{
imports =
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
../configuration.nix
];
system.stateVersion = "20.03";
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
services.xserver.libinput.enable = true;
fileSystems."/" =
{ device = "/dev/disk/by-uuid/bfe4586b-2538-4aae-ad2f-b1277378de4a";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5C09-F06F";
fsType = "vfat";
};
swapDevices = [ ];
networking.hostName = "adele";
nix.maxJobs = lib.mkDefault 12;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
services.redshift.enable = true;
location = {
latitude = 37.8104601;
longitude = -122.2572529;
};
}