MORE CLEANING

master
Dustin Swan 5 years ago
parent c734deb12f
commit b14adb2b4b

Binary file not shown.

@ -1,15 +0,0 @@
ipfs
keybase
mobile-shell
mopidy
mopidy-notifier
mopidy-spotify
msmtp
mu
ncmpcpp
perforce
pinentry-mac
qemu
terminal-notifier
w3m
vdirsyncer

@ -8,7 +8,6 @@
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./vpn.nix
]; ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -36,25 +35,17 @@
inputMethod = { inputMethod = {
enabled = "fcitx"; enabled = "fcitx";
fcitx.engines = with pkgs.fcitx-engines; [ anthy mozc ]; fcitx.engines = with pkgs.fcitx-engines; [ anthy mozc libpinyin ];
}; };
}; };
time.timeZone = "US/Eastern"; time.timeZone = "America/New_York";
environment.systemPackages = with pkgs; [ # environment.systemPackages = with pkgs; [
wget vim clipit compton feh firefox fzf git gparted gucharmap htop keepass keepassx2 keychain ncmpcpp neovim pandoc polybar qutebrowser rofi silver-searcher tmux tree unzip wirelesstools xcape xclip anki pavucontrol ranger blueman gifsicle networkmanager paprefs steam xscreensaver hledger hledger-web ledger mpv nnn nodejs pinentry vlc gnupg nitrogen alacritty wine tldr yarn spotify signal-desktop mu mosh ispell google-chrome emacs-all-the-icons-fonts gnupg python udiskie veracrypt bashmount exfat exfat-utils neofetch w3m toot rtv newsboat neomutt dunst # ];
];
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
packageOverrides = pkgs: rec {
polybar = pkgs.polybar.override {
i3Support = true;
mpdSupport = true;
};
};
}; };
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
@ -62,12 +53,12 @@
# programs.bash.enableCompletion = true; # programs.bash.enableCompletion = true;
# programs.mtr.enable = true; # programs.mtr.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
services = { services = {
zerotierone = {
enable = true;
joinNetworks = [ "1d719394045bb17d" ];
};
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
# services.openssh.enable = true; # services.openssh.enable = true;
@ -75,36 +66,14 @@
enable = true; enable = true;
}; };
mopidy = {
enable = true;
extensionPackages = [ pkgs.mopidy-spotify pkgs.mopidy-youtube pkgs.mopidy-iris ];
configuration = ''
[audio]
output = pulsesink server=127.0.0.1
[local]
enabled = true
media_dir = /home/dustinswan/Music
[spotify]
enabled = true
username =
password =
client_id =
client_secret =
bitrate = 320
[scrobbler]
enabled = true
username = dustinswan
'';
};
locate.enable = true; locate.enable = true;
udisks2.enable = true; udisks2.enable = true;
printing.enable = true; printing = {
enable = true;
drivers = [ pkgs.gutenprint pkgs.brlaser ];
};
upower.enable = true; upower.enable = true;
@ -128,57 +97,33 @@
displayManager = { displayManager = {
lightdm.enable = true; lightdm.enable = true;
lightdm.background = "/home/dustinswan/Sync/Pictures/Wallpaper/green_squares.png"; lightdm.background = "/home/dustinswan/Sync/Pictures/Wallpaper/green_squares.png";
lightdm.autoLogin.user = "dustinswan"; # sessionCommands = ''
sessionCommands = '' # setxkbmap -option ctrl:nocaps -option compose:ralt
setxkbmap -option ctrl:nocaps -option compose:ralt # xcape -e 'Control_L=Escape'
xcape -e 'Control_L=Escape' # xmodmap -e "keycode 96 = dead_greek dead_greek dead_greek dead_greek"
xmodmap -e "keycode 96 = dead_greek dead_greek dead_greek dead_greek" # compton -b --inactive-opacity 0.90
compton -b --inactive-opacity 0.90 # sh ~/dotfiles/logitech_linux_mouse.sh
sh ~/dotfiles/logitech_linux_mouse.sh # xsetroot -solid black -cursor_name left_ptr
xsetroot -solid black -cursor_name left_ptr # nitrogen --restore &
nitrogen --restore & # qsyncthingtray &
qsyncthingtray & # pasystray &
pasystray & # '';
'';
}; };
windowManager = { windowManager = {
i3 = { i3 = {
enable = true; enable = true;
package = pkgs.i3-gaps; package = pkgs.i3-gaps;
extraPackages = with pkgs; [
dmenu
i3status
i3lock
];
}; };
default = "i3"; default = "i3";
}; };
}; };
syncthing = {
enable = true;
dataDir = "/home/dustinswan";
user = "dustinswan";
};
urxvtd.enable = true;
emacs = {
enable = true;
defaultEditor = true;
};
ipfs = {
enable = true;
};
synergy.server = { synergy.server = {
enable = true; enable = true;
screenName = "pc"; screenName = "pc";
}; };
}; };
hardware = { hardware = {
@ -199,8 +144,6 @@
sound.enable = true; sound.enable = true;
sound.mediaKeys.enable = true; sound.mediaKeys.enable = true;
programs.fish.enable = true;
fonts = { fonts = {
enableFontDir = true; enableFontDir = true;
fonts = with pkgs; [ fonts = with pkgs; [
@ -213,13 +156,15 @@
virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.enable = true;
virtualisation.docker.enable = true;
users.users.dustinswan = { users.users.dustinswan = {
createHome = true; createHome = true;
description = "Dustin Swan"; description = "Dustin Swan";
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "sound" "pulse" "audio" "networkmanager" "vboxusers" ]; extraGroups = [ "wheel" "sound" "pulse" "audio" "networkmanager" "vboxusers" "docker" ];
uid = 1000; uid = 1000;
shell = pkgs.fish; shell = pkgs.zsh;
}; };
environment.etc."synergy-server.conf" = { text = '' environment.etc."synergy-server.conf" = { text = ''
@ -228,16 +173,18 @@
mac: mac:
end end
section: aliases section: links
mac: mac:
192.168.1.2 left = pc
pc:
right = mac
end end
section: links section: options
pc: keystroke(super+tilde) = switchInDirection(left)
left = mac keystroke(super+backspace) = switchInDirection(right)
mac: mousebutton(6) = keystroke(WWWBack)
right = pc mousebutton(7) = keystroke(WWWForward)
end end
''; }; ''; };

@ -132,7 +132,7 @@
enableAutosuggestions = true; enableAutosuggestions = true;
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
plugins = [ "git" "sudo" ]; plugins = [ "git" ];
theme = "refined"; theme = "refined";
}; };
shellAliases = { shellAliases = {

@ -1,39 +0,0 @@
module Main where
import XMonad
import XMonad.Hooks.EwmhDesktops (ewmh)
import XMonad.Hooks.ManageDocks
import XMonad.Layout.Spacing
import XMonad.Util.EZConfig
-- import System.Taffybar.Hooks.PagerHints (pagerHints)
lightBlue = "#66aaff"
main = xmonad $ docks $ ewmh $ defaultConfig
{ terminal = "alacritty"
, modMask = mod4Mask
, workspaces = [ "α", "β", "γ", "δ", "ε"]
, borderWidth = 2
, normalBorderColor = "#000000"
, focusedBorderColor = lightBlue
, layoutHook = avoidStruts $ spacingWithEdge 6 $ layoutHook defaultConfig
, startupHook = do
spawn "pkill polybar; polybar top &"
-- spawn "compton -cGb"
-- spawn "~/dotfiles/logitech_linux_mouse.sh"
-- spawn "xsetroot -solid black -cursor_name left_ptr"
-- spawn "feh --bg-fill ~/Sync/Pictures/Wallpaper/space2.jpg"
-- spawn "setxkbmap -option ctrl:nocaps -option compose:ralt"
-- spawn "xcape -e 'Control_L=Escape'"
-- spawn "qsyncthingtray"
-- spawn "xscreensaver"
}
`additionalKeysP`
[ ("M1-<Space>", spawn "rofi -show combi")
, ("M-p", spawn "rofi -show combi")
, ("<XF86AudioMute>", spawn "amixer set Master toggle")
, ("<XF86AudioLowerVolume>", spawn "amixer -q sset Master 5%-")
, ("<XF86AudioRaiseVolume>", spawn "amixer -q sset Master 5%+")
, ("C-M-M1-b", spawn "qutebrowser")
, ("C-M-M1-e", spawn "emacsclient -c")
]
Loading…
Cancel
Save