From fc29abdcfd60702a7ad6e120a9b35f48468db146 Mon Sep 17 00:00:00 2001 From: Martin Klimes Date: Sun, 15 Dec 2019 21:51:28 +0100 Subject: [PATCH] Who knows --- nix/desktop-hardware-configuration.nix | 32 ++++++++++++++++++++++++ nix/desktop.nix | 2 +- nix/user.nix | 34 +++++++++++++++++++++----- scripts/download_ogg_quick.sh | 2 +- 4 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 nix/desktop-hardware-configuration.nix diff --git a/nix/desktop-hardware-configuration.nix b/nix/desktop-hardware-configuration.nix new file mode 100644 index 0000000..1264221 --- /dev/null +++ b/nix/desktop-hardware-configuration.nix @@ -0,0 +1,32 @@ +# 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 = + [ + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/f0cc2b2c-8370-4319-81cd-dd66a2f15e42"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/DAD9-70D3"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/c4e402ad-8efb-4b49-bc1d-9201a1b485aa"; } + ]; + + nix.maxJobs = lib.mkDefault 12; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; +} diff --git a/nix/desktop.nix b/nix/desktop.nix index c531ebf..efdbdeb 100644 --- a/nix/desktop.nix +++ b/nix/desktop.nix @@ -20,7 +20,7 @@ let in { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./desktop-hardware-configuration.nix #"${home-manager}/nixos" # diff --git a/nix/user.nix b/nix/user.nix index 5445c6c..cb40ec4 100644 --- a/nix/user.nix +++ b/nix/user.nix @@ -45,14 +45,21 @@ in programs.bash.shellAliases = { nrs = - "sudo nixos-rebuild switch -I nixos-config=/home/klimi/dotfiles/nix/configuration.nix"; + "sudo nixos-rebuild switch -I nixos-config=/home/klimi/dotfiles/nix/desktop.nix"; nrb = - "sudo nixos-rebuild boot -I nixos-config=/home/klimi/dotfiles/nix/configuration.nix"; + "sudo nixos-rebuild boot -I nixos-config=/home/klimi/dotfiles/nix/desktop.nix"; un = "NIXPKGS_ALLOW_UNFREE=1 "; }; - + hardware.opengl.driSupport32Bit = true; + hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; + hardware.pulseaudio.support32Bit = true; + services.weechat.enable = true; + programs.screen.screenrc = '' + multiuser on + acladd normal_user + ''; home-manager.users.klimi = { pkgs, ... }: let @@ -84,13 +91,28 @@ in #services.polybar.config = "${dots}/polybar.config"; #services.polybar.script = "polybar top &"; - + nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowBroken = true; programs.firefox.enable = true; home = { - packages = [ + + packages = [ + + (pkgs.steam.override { extraPkgs = pkgs: [ pkgs.mono pkgs.gtk3 pkgs.gtk3-x11 pkgs.libgdiplus pkgs.zlib ];}) + pkgs.youtube-dl + pkgs.ffmpeg + pkgs.mpv + pkgs.paper-gtk-theme + pkgs.paper-icon-theme + pkgs.adapta-gtk-theme + pkgs.moka-icon-theme + pkgs.tango-icon-theme + pkgs.lxappearance + (pkgs.dunst.override {dunstify = true; }) + pkgs.transmission-gtk + pkgs.unzip pkgs.ncat pkgs.lm_sensors - pkgs.dunst pkgs.libnotify pkgs.bc pkgs.ranger diff --git a/scripts/download_ogg_quick.sh b/scripts/download_ogg_quick.sh index 918338b..db85ccd 100755 --- a/scripts/download_ogg_quick.sh +++ b/scripts/download_ogg_quick.sh @@ -4,7 +4,7 @@ msgId="9910048" linkk="$(xclip -o -selection primary)" download(){ dunstify "Started downloading $linkk" -a "Youtube Downloader" -u low -r "$msgId" - youtube-dl --extract-audio --audio-format vorbis -o '$HOME/Music/arch/\%(title)s.%(ext)s' $linkk + youtube-dl --extract-audio --audio-format vorbis -o '$HOME/Music/nixos/\%(title)s.%(ext)s' $linkk dunstify "FINISHED downloading $linkk" -a "Youtube Downloader" -u low -r "$msgId" } echo "$linkk"