From 1bfa3c21e1763a04a1c323da8a9268364268d342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Thu, 2 May 2019 00:00:29 +0200 Subject: [PATCH 1/2] Maintaince --- config/xsession/terminal.nix | 1 + config/xsession/xsession.nix | 1 + config/xsession/zsh/zsh.nix | 1 + home.nix | 7 ++++--- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/xsession/terminal.nix b/config/xsession/terminal.nix index ed32256..1da7355 100644 --- a/config/xsession/terminal.nix +++ b/config/xsession/terminal.nix @@ -7,6 +7,7 @@ home.file.kitty = { target = ".config/kitty/kitty.conf"; text = '' +term xterm-256color font_family monospace font_size 12.0 background_opacity 0.7 diff --git a/config/xsession/xsession.nix b/config/xsession/xsession.nix index c5dcdff..78358d7 100644 --- a/config/xsession/xsession.nix +++ b/config/xsession/xsession.nix @@ -85,6 +85,7 @@ export QT_STYLE_OVERRIDE="breeze" pkgs.xorg.xbacklight pkgs.pavucontrol pkgs.xorg.xkill + pkgs.arandr pkgs.dunst pkgs.libnotify diff --git a/config/xsession/zsh/zsh.nix b/config/xsession/zsh/zsh.nix index 0f7875a..5b42e86 100644 --- a/config/xsession/zsh/zsh.nix +++ b/config/xsession/zsh/zsh.nix @@ -45,6 +45,7 @@ export MATRIXDEV_HOMESERVER="https://matrix.dodsorf.as" export ***REMOVED*** export FV_KUBECONFIG="$HOME/.kube/config-fv" +export FV_KUBECONFIG="$HOME/.kube/config-fv-prod" export FV_ARM_SUBSCRIPTION_ID="***REMOVED***" export FV_ARM_CLIENT_ID="***REMOVED***" diff --git a/home.nix b/home.nix index 00d3ac1..3f31720 100644 --- a/home.nix +++ b/home.nix @@ -16,7 +16,6 @@ pkgs.ansible pkgs.nixops pkgs.ldns - pkgs.jq pkgs.steam pkgs.dolphinEmuMaster @@ -43,8 +42,10 @@ pkgs.kdeApplications.kio-extras pkgs.unzip + pkgs.p7zip pkgs.parallel pkgs.sshfs + pkgs.jq pkgs.gnome3.gedit pkgs.vscode @@ -64,7 +65,7 @@ pkgs.frei0r pkgs.mkvtoolnix - pkgs.youtubeDL + #pkgs.unstable.youtubeDL pkgs.ffmpeg-full pkgs.geogebra @@ -99,6 +100,6 @@ programs.home-manager = { enable = true; - path = "https://github.com/rycee/home-manager/archive/master.tar.gz"; + path = "https://github.com/rycee/home-manager/archive/release-18.09.tar.gz"; }; } From df5fcab36550aaca171f0ba5777df5757e99201f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Mon, 6 May 2019 00:44:45 +0200 Subject: [PATCH 2/2] unstable packages --- config/xsession/xsession.nix | 2 +- home.nix | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/xsession/xsession.nix b/config/xsession/xsession.nix index 987dc1e..61a253b 100644 --- a/config/xsession/xsession.nix +++ b/config/xsession/xsession.nix @@ -83,7 +83,7 @@ export QT_STYLE_OVERRIDE="breeze" }; home.packages = [ - pkgs.xorg.xbacklight + pkgs.acpilight pkgs.pavucontrol pkgs.xorg.xkill pkgs.arandr diff --git a/home.nix b/home.nix index f0a693e..7a24289 100644 --- a/home.nix +++ b/home.nix @@ -1,7 +1,9 @@ { pkgs, config, lib, ...}: +let + unstable = import {}; +in { - #home.file.nixoverlays = { # source = ./overlays; # target = ".config/nixpkgs/overlays"; @@ -48,7 +50,7 @@ pkgs.jq pkgs.gnome3.gedit - pkgs.vscode + unstable.vscode pkgs.texlive.combined.scheme-full pkgs.kile pkgs.libreoffice-unwrapped @@ -65,7 +67,7 @@ pkgs.frei0r pkgs.mkvtoolnix - #pkgs.unstable.youtubeDL + unstable.youtubeDL pkgs.ffmpeg-full pkgs.geogebra