From 4f997d813e1293e23a044cc517b84438790a67fa Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sun, 9 Oct 2016 11:34:48 -0400 Subject: Enable synaptics and network manager. --- nixos/aji.nix | 4 ---- nixos/configuration.nix | 9 ++++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/aji.nix b/nixos/aji.nix index e953204..abda9f8 100644 --- a/nixos/aji.nix +++ b/nixos/aji.nix @@ -43,10 +43,6 @@ ''; services.xserver.xkbModel = "thinkpad60"; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; # The NixOS release to be compatible with for stateful data such as databases. system.stateVersion = "16.03"; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 775ee7a..9ff1f14 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -8,7 +8,8 @@ boot.cleanTmpDir = true; - networking.wireless.enable = true; + networking.networkmanager.enable = true; + # networking.wireless.enable = true; networking.firewall.enable = true; programs.zsh.enable = true; @@ -99,10 +100,16 @@ services.xserver.windowManager.xmonad.enableContribAndExtras = true; services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [ haskellPackages.xmobar ]; + services.xserver.desktopManager.gnome3.enable = true; services.xserver.layout = "us"; services.xserver.xkbVariant = "dvorak"; + services.xserver.synaptics = { + enable = true; + twoFingerScroll = true; + }; + users = { defaultUserShell = "/run/current-system/sw/bin/fish"; extraUsers.orbekk = { -- cgit v1.2.3 From c7dac4c7ddb106e13d98a28f311e2ff9561ff9f8 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 15 Oct 2016 23:59:46 -0400 Subject: Add urxvt config on pincer. --- Xresources-pincer | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Xresources-pincer b/Xresources-pincer index c71dfdc..93f706c 100644 --- a/Xresources-pincer +++ b/Xresources-pincer @@ -2,6 +2,7 @@ urxvt*font: xft:dejavu sans mono:size=13:antialias=true !urxvt*font: xft:inconsolata:size=14:antialias=true urxvt*scrollBar: false URxvt*termName: xterm-256color +Xterm*termName: xterm-256color urxvt*foreground: white urxvt*background: black @@ -22,3 +23,16 @@ urxvt*background: black *color13: #AD7FA8 *color14: #fcaf3e *color15: #EEEEEC + +URxvt.keysym.M-c: perl:clipboard:copy +URxvt.keysym.M-v: perl:clipboard:paste +URxvt.saveLines: 40000 + +URxvt.perl-ext-common: default,matcher,resize-font,clipboard +URxvt.clipboard.autocopy: true +URxvt.resize-font.smaller: C-Down +URxvt.resize-font.bigger: C-Up +URxvt.iso14755: false +URxvt.iso14755_52: false +URxvt.url-launcher: /usr/bin/xdg-open +URxvt.matcher.button: 1 -- cgit v1.2.3 From 27ee6b1aaf71715da579633f2f8e1a7baa0224c8 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sun, 16 Oct 2016 00:00:17 -0400 Subject: Update nixos config for laptops. --- nixos/configuration.nix | 12 ++++++++++-- nixos/pincer.nix | 8 ++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 9ff1f14..72c4fb0 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -54,7 +54,7 @@ pavucontrol powertop kde4.digikam - emacs25pre + emacs25 sshfsFuse xorg.xbacklight rtorrent @@ -72,6 +72,7 @@ pass rxvt_unicode-with-plugins xsel + gnupg # fonts source-code-pro @@ -100,7 +101,7 @@ services.xserver.windowManager.xmonad.enableContribAndExtras = true; services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [ haskellPackages.xmobar ]; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.xfce.enable = true; services.xserver.layout = "us"; services.xserver.xkbVariant = "dvorak"; @@ -120,6 +121,13 @@ extraGroups = ["wheel" "networkmanager" "dialout" "uucp"]; shell = "/run/current-system/sw/bin/fish"; }; + extraUsers.guest = { + isNormalUser = true; + home = "/home/guest"; + uid = 10001; + description = "Guest"; + extraGroups = ["networkmanager"]; + }; }; nix.maxJobs = 4; diff --git a/nixos/pincer.nix b/nixos/pincer.nix index cab2b15..ee5f7ee 100644 --- a/nixos/pincer.nix +++ b/nixos/pincer.nix @@ -5,6 +5,8 @@ ./configuration.nix ]; networking.hostName = "pincer"; + networking.firewall.allowedTCPPorts = [5201]; + networking.firewall.allowedUDPPorts = [5201]; hardware.opengl.driSupport32Bit = true; boot.loader.systemd-boot.enable = true; @@ -17,8 +19,10 @@ allowDiscards = true; } ]; - boot.kernelModules = ["tp_smapi" "thinkpad_acpi" "fbcon" "i915"]; - boot.extraModulePackages = [config.boot.kernelPackages.tp_smapi]; + # boot.kernelPackages = pkgs.linuxPackages_4_7; + boot.kernelModules = ["tp_smapi" "thinkpad_acpi" "fbcon" "i915" "acpi_call"]; + boot.extraModulePackages = with config.boot.kernelPackages; + [tp_smapi acpi_call]; boot.extraModprobeConfig = '' options iwlwifi swcrypto=1 ''; -- cgit v1.2.3 From 0037e0c22e17039cbe1856e4fbf7b53434cb6fb8 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Fri, 21 Oct 2016 22:17:32 -0400 Subject: Add software. --- nixos/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 12a21d4..c5eaca8 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -66,6 +66,7 @@ trayer rxvt_unicode-with-plugins xsel + geeqie # fonts source-code-pro @@ -98,6 +99,8 @@ services.xserver.layout = "us"; services.xserver.xkbVariant = "dvorak"; + services.cron.enable = true; + users = { defaultUserShell = "/run/current-system/sw/bin/fish"; extraUsers.orbekk = { -- cgit v1.2.3