diff options
| -rw-r--r-- | configuration.nix | 154 | ||||
| -rw-r--r-- | i3/config | 9 | ||||
| -rw-r--r-- | i3status.conf | 8 | ||||
| -rw-r--r-- | spacemacs | 2 | ||||
| -rwxr-xr-x | xsession | 5 |
5 files changed, 176 insertions, 2 deletions
diff --git a/configuration.nix b/configuration.nix new file mode 100644 index 0000000..7577afa --- /dev/null +++ b/configuration.nix @@ -0,0 +1,154 @@ +{ config, pkgs, hardware, hostname, ... }: + +{ + hardware.bluetooth.enable = true; + hardware.pulseaudio.enable = true; + hardware.pulseaudio.package = pkgs.pulseaudioFull; + hardware.enableAllFirmware = true; + + # Use the gummiboot efi boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.timeout = 0; + boot.loader.efi.canTouchEfiVariables = true; + boot.initrd.luks.devices = [ + { + device = "/dev/sda2"; + name = "crypt"; + preLVM = true; + allowDiscards = true; + } + ]; + boot.kernelModules = ["tp_smapi" "thinkpad_acpi" "fbcon" "i915"]; + boot.kernelParams = ["quiet" "acpi_osi=\"!Windows 2012\""]; + boot.extraModulePackages = [config.boot.kernelPackages.tp_smapi]; + boot.extraModprobeConfig = '' + options i915 enable_rc6=1 + ''; + boot.cleanTmpDir = true; + + networking.hostName = "aji"; + networking.wireless.enable = true; + networking.firewall.enable = true; + + programs.zsh.enable = true; + programs.fish.enable = true; + + # Select internationalisation properties. + # i18n = { + # consoleFont = "Lat2-Terminus16"; + # consoleKeyMap = "us"; + # defaultLocale = "en_US.UTF-8"; + # }; + + fileSystems."/" = { + mountPoint = "/"; + device = "/dev/mapper/cryptvg-root"; + fsType = "btrfs"; + options = ["subvol=aji-root" "discard" "compress=lzo"]; + }; + swapDevices = + [ { device = "/dev/mapper/cryptvg-swap"; } + ]; + + # Set your time zone. + time.timeZone = "America/New_York"; + + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search by name, run: + # $ nix-env -qaP | grep wget + environment.systemPackages = with pkgs; + let + myArduino = pkgs.stdenv.lib.overrideDerivation pkgs.arduino (o: { + withGUI = true; + }); + in [ + neovim + rustc + fish + git + dmenu2 i3blocks i3status + rsync + chromium firefox + xscreensaver xss-lock xorg.xev + which htop tree + myArduino + termite + nix-repl + nfs-utils + nox + pasystray + pavucontrol + powertop + kde4.digikam + emacs25pre + sshfsFuse + xorg.xbacklight + rtorrent + hdparm + bwm_ng + geeqie + inkscape + silver-searcher + termite + rofi + wireshark + + haskellPackages.xmonad + haskellPackages.xmobar + ]; + + # List services that you want to enable: + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + services.avahi.enable = true; + + services.redshift = { + enable = true; + latitude = "40"; + longitude = "-74"; + extraOptions = ["-r"]; + }; + + services.tlp.enable = true; + services.tlp.extraConfig = '' + SATA_LINKPWR_ON_BAT=max_performance + ''; + + # Enable the X11 windowing system. + services.xserver.enable = true; + services.xserver.windowManager.xmonad.enable = true; + services.xserver.windowManager.xmonad.extraPackages = + haskellPackages: [ + haskellPackages.xmonad-contrib]; + # services.xserver.windowManager.awesome.enable = true; + # services.xserver.windowManager.i3.enable = true; + # services.xserver.displayManager.slim = { + # enable = true; + # autoLogin = true; + # defaultUser = "orbekk"; + # }; + + services.xserver.layout = "us"; + services.xserver.xkbVariant = "dvorak"; + services.xserver.xkbModel = "thinkpad60"; + + users = { + defaultUserShell = "/run/current-system/sw/bin/fish"; + extraUsers.orbekk = { + isNormalUser = true; + home = "/home/orbekk"; + uid = 1000; + description = "KJ"; + extraGroups = ["wheel" "networkmanager" "dialout" "uucp"]; + shell = "/run/current-system/sw/bin/fish"; + }; + }; + + # The NixOS release to be compatible with for stateful data such as databases. + system.stateVersion = "16.03"; + + nix.maxJobs = 4; + nix.buildCores = 4; + nix.useSandbox = true; +} @@ -73,6 +73,11 @@ bindsym $mod+7 workspace 7 bindsym $mod+8 workspace 8 bindsym $mod+9 workspace 9 bindsym $mod+0 workspace 10 +bindsym $mod+apostrophe workspace 1 +bindsym $mod+comma workspace 2 +bindsym $mod+period workspace 3 +bindsym $mod+p workspace 4 +bindsym $mod+y workspace 5 # move focused container to workspace bindsym $mod+Shift+1 move workspace 1 @@ -144,7 +149,7 @@ mode "resize" { # finds out, if available) bar { status_command i3blocks || i3status - font xft:Droid Sans Mono 8 + font xft:Source Code Pro 10 } exec xrdb -merge $HOME/.Xresources @@ -153,5 +158,7 @@ exec $HOME/bin/keyboard_setup.sh exec $HOME/bin/local.sh exec xbindkeys exec xset -b +exec nm-applet & exec google-chrome & exec xautolock -time 10 -locker 'i3lock -c 2A3462' & +exec redshift -l 40:-70 -r -t 5500:3700 & diff --git a/i3status.conf b/i3status.conf index 0b3b483..8d4744d 100644 --- a/i3status.conf +++ b/i3status.conf @@ -11,6 +11,7 @@ order += "disk /" #order += "run_watch VPN" order += "wireless wlp4s0" order += "ethernet enp0s25" +order += "battery 1" order += "battery 0" order += "cpu_temperature 0" order += "load" @@ -37,6 +38,13 @@ ethernet enp0s25 { format_down = "" } +battery 1 { + last_full_capacity = true + low_threshold = 15 + threshold_type = time + format = "%status %percentage %remaining (%consumption)" +} + battery 0 { last_full_capacity = true low_threshold = 15 @@ -245,7 +245,7 @@ user code." '(("t" "Todo" entry (file+headline "~/org/in.org" "Tasks") "* TODO %?"))) (eval-after-load "org" '(require 'ox-md nil t)) - (global-git-commit-mode t) + ; (global-git-commit-mode t) ) (defun mu4e-config () @@ -13,4 +13,9 @@ xss-lock -- /usr/bin/env xscreensaver-command --lock & pasystray & xsetroot -solid "#2A3462" trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 100 --widthtype pixel --transparent true --alpha 0 --tint 0x000000 --height 18 & +[[ $(hostname) == kikashi ]] && \ + xinput set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.5 +[[ -f /etc/nixos/configuration.nix ]] || \ + redshift -l 40:-70 -r -t 5500:3700 & +>>>>>>> 6b008fdd447ba2ce12af6fe39d5697155aa5a8a2 exec xmonad |