Skip to content
Permalink
Browse files

bump nixos, have colemak reset sxhkd

  • Loading branch information
neeasade committed Nov 30, 2019
1 parent eb76a4c commit d5689485f3982efde7847542827c32bf1bcdd8e7
@@ -15,3 +15,6 @@ cd "$gitdest"

echo "$gitdest/install-dreymar-xmod.sh" -i "$xkbdir" -x 4c us us
"$gitdest/install-dreymar-xmod.sh" -i "$xkbdir" -n -x 4c us us

pgrep sxhkd && pkill sxhkd
setsid nohup sxhkd &
@@ -2,28 +2,20 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).

{ config, pkgs, lib, ... }:
{ config, pkgs, ... }:

{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
./packages.nix
./services.nix
# (import ./packages.nix {inherit config pkgs lib; })
# (import ./services.nix {inherit config pkgs; })
];

# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

boot.extraModulePackages = [ config.boot.kernelPackages.rtlwifi_new ];
# boot.initrd.kernelModules = [ "wl" ];
# boot.kernelModules = [ "kvm-intel" "wl" ];
# boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];

networking.hostName = "erasmus";
networking.hostName = "bridge";
# networking.wireless.enable = true; # wpa_supplicant.
networking.networkmanager.enable = true; # wpa_supplicant.

@@ -44,6 +36,7 @@
opengl.driSupport = true;
pulseaudio.enable = true;
opengl.driSupport32Bit = true;
opengl.extraPackages = with pkgs; [ libva ];
pulseaudio.support32Bit = true;

#bumblebee.enable = true;
@@ -80,9 +73,30 @@
nix.gc.options = "--delete-older-than 30d";
# nix.useSandbox = true;

# This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
system.stateVersion = "18.09"; # Did you read the comment?

# Use the GRUB 2 boot loader.
# boot.loader.grub.enable = true;
# boot.loader.grub.version = 2;

boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

# boot.loader.grub.efiSupport = true;
# boot.loader.grub.efiInstallAsRemovable = true;
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
# Define on which hard drive you want to install Grub.
# boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only

# networking.hostName = "nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.

# The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour.
networking.useDHCP = false;
networking.interfaces.wlp3s0.useDHCP = true;

system.stateVersion = "19.09"; # Did you read the comment?

}

@@ -8,43 +8,25 @@
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];

boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];

fileSystems."/" =
{ device = "/dev/disk/by-uuid/af237de7-fdd4-4cc2-8db3-f8fc33b9a5c6";
{ device = "/dev/disk/by-uuid/aaae0f98-fb1e-43e2-9c53-9906bf7238b4";
fsType = "ext4";
};

fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/8CC6-209C";
{ device = "/dev/disk/by-uuid/01E1-1D46";
fsType = "vfat";
};

fileSystems."/media/LIVEWIRE" =
{ device = "/dev/disk/by-uuid/2cf891b0-4adf-4fa0-bd80-e335303a1b13";
fsType = "btrfs";
};

fileSystems."/media/CODERED" =
{ device = "/dev/disk/by-uuid/8c484b3d-b026-41f9-9cbe-dd551d1aead3";
fsType = "ext4";
};

# fileSystems."/media/VOLTAGE" =
# { device = "/dev/disk/by-uuid/00ebaffa-6c52-4422-8168-4a84622bad0c";
# fsType = "btrfs";
# };

fileSystems."/media/KICKSTART" =
{ device = "/dev/disk/by-uuid/84894ed7-8e80-49a5-8951-ac61c23a6564";
fsType = "btrfs";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/8d5ee437-0eed-4723-8692-8c85305058f0"; }
[ { device = "/dev/disk/by-uuid/5135ef96-258f-403e-a2b6-163c1473530b"; }
];

nix.maxJobs = lib.mkDefault 6;
nix.maxJobs = lib.mkDefault 4;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
}
@@ -6,40 +6,46 @@ let
oraclejdk.accept_license = true;

permittedInsecurePackages = [
"samba-3.6.25"
"samba-3.6.25"
];
};

stable = import (fetchTarball https://github.com/nixos/nixpkgs-channels/archive/nixos-19.03.tar.gz) { config = nixcfg; };
# todo: use channels for this roll
stable = import (fetchTarball https://github.com/nixos/nixpkgs-channels/archive/nixos-19.09.tar.gz) { config = nixcfg; };
rolling = import (fetchTarball https://github.com/nixos/nixpkgs-channels/archive/nixos-unstable.tar.gz) { config = nixcfg; };
edge = import (fetchTarball https://github.com/NixOS/nixpkgs/archive/master.tar.gz) { config = nixcfg; };

#stable = pkgs;
#rolling = pkgs;
#edge = pkgs;

expr = import ./expr { inherit pkgs lib; };

pkgs = stable;
# edge = rolling;
# rolling = stable;

core = (with stable; [
# networkmanager
haskellPackages.xmobar
kdeFrameworks.networkmanager-qt
networkmanager_dmenu
xorg.xkbcomp
tldr
toilet
cowsay
fortune
cmatrix
cava
irssi
glxinfo
xorg.xdpyinfo
core = (with stable; [
# networkmanager
haskellPackages.xmobar
kdeFrameworks.networkmanager-qt
networkmanager_dmenu
xorg.xkbcomp
tldr
toilet
cowsay
fortune
cmatrix
cava
irssi
glxinfo
xorg.xdpyinfo
gnupg
arandr
aspell
stalonetray
# network-manager
networkmanagerapplet
networkmanagerapplet
aspellDicts.en
bash-completion
bc
@@ -122,6 +128,15 @@ networkmanagerapplet


# mesa_glu

(python36.withPackages(ps: with ps; [
virtualenv
django
selenium
# pyqt5
praw
]))

]) ++ (with rolling; [
colort
# dmenu2
@@ -164,15 +179,20 @@ networkmanagerapplet
# (emacs.override { imagemagick = pkgs.imagemagickBig; } )
]);

inherit (pkgs) eggDerivation fetchegg;
inherit (pkgs) eggDerivation fetchegg;
extra = (with stable; [
# oomox


gdk_pixbuf
glib.dev
gtk-engine-murrine
gtk3
sassc

# circe
gnutls

ripgrep
pandoc
imagemagick
@@ -198,16 +218,16 @@ networkmanagerapplet
]);

games = (with stable; [
minecraft
wesnoth
dolphinEmu
#minecraft
#wesnoth
#dolphinEmu
# ioquake3
# minecraft
# wineUnstable
mesa_drivers
mesa_glu
# samba
wine
#wine
# winetricks
# wineStaging
# (wineStaging.override { wineBuild = "wineWow"; })
@@ -218,11 +238,11 @@ networkmanagerapplet
# configureFlags = "--enable-win64 --with-alsa --with-pulse";
# crispy-doom
]) ++ (with rolling; [
openmw
#openmw
steam
# openmw-tes3mp
]) ++ (with rolling; [
drawpile
#drawpile
]);

development = (with stable; [
@@ -306,13 +326,13 @@ networkmanagerapplet
# pyqt5
praw
]))
]) ++ (with expr; [
]) ++ (with expr; [
# boot-new
]) ++ (with edge; [
# boot
# chickenPackages_5.chicken
# chickenPackages_5.egg2nix
]);
]) ++ (with edge; [
# boot
# chickenPackages_5.chicken
# chickenPackages_5.egg2nix
]);

basefonts = (with pkgs; [
roboto-mono
@@ -321,8 +341,8 @@ networkmanagerapplet
]);

extrafonts = (with pkgs; [
gohufont
corefonts
gohufont
corefonts
dejavu_fonts
fantasque-sans-mono
fira
@@ -340,9 +360,12 @@ in
environment.systemPackages =
core ++
extra ++
development ++
# development ++
games ++
[];

fonts.fonts = basefonts ++ extrafonts ++ [];
fonts.fonts =
basefonts ++
extrafonts ++
[];
}

0 comments on commit d568948

Please sign in to comment.
You can’t perform that action at this time.