From 245ec7a31076896795e5313d76c4a23a0cb2377e Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 12 Dec 2020 15:26:49 +0100 Subject: [PATCH 1/5] ree --- overlays/av1client.nix | 24 ------------------------ profiles/base/default.nix | 8 +++++--- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 overlays/av1client.nix diff --git a/overlays/av1client.nix b/overlays/av1client.nix deleted file mode 100644 index 423b043..0000000 --- a/overlays/av1client.nix +++ /dev/null @@ -1,24 +0,0 @@ -self: super: -{ - av1client = super.stdenv.mkDerivation rec { - name = "av1client-${version}"; - version = "0.5.0"; - - src = ~/Documents/av1master/src/static; - - installPhase = '' - mkdir -p $out/bin - cp client.sh $out/bin/av1client - - sed -i 's,sleep,${super.coreutils}/bin/sleep,' $out/bin/av1client - sed -i 's,rm,${super.coreutils}/bin/rm,' $out/bin/av1client - sed -i 's,curl,${super.curl}/bin/curl --cacert ${super.cacert}/etc/ssl/certs/ca-bundle.crt,' $out/bin/av1client - sed -i 's,jq,${super.jq}/bin/jq,' $out/bin/av1client - sed -i 's,ffmpeg ,${self.myffmpeg}/bin/ffmpeg ,' $out/bin/av1client - sed -i 's,aomenc ,${self.mylibaom}/bin/aomenc ,' $out/bin/av1client - - chmod +x $out/bin/av1client - ''; - - }; -} diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 662f6e8..1190ee1 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -65,7 +65,7 @@ in { kdeFrameworks.kio kdeApplications.kio-extras - dan.rank_photos + #dan.rank_photos # ***REMOVED*** @@ -87,7 +87,7 @@ in { kdenlive frei0r - geogebra + #geogebra ]; programs.firefox = { @@ -105,7 +105,9 @@ in { enable = true; userEmail = "daniel.olsen99@gmail.com"; userName = "Daniel Olsen"; - + extraConfig = { + pull.rebase = true; + }; # delta.enable = true; }; From c8783824b7784279cf5a5c07334116c9ba42786d Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 20 Dec 2020 23:06:34 +0100 Subject: [PATCH 2/5] upgrade desktop --- machines/desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/desktop.nix b/machines/desktop.nix index fb1d6e3..5052f43 100644 --- a/machines/desktop.nix +++ b/machines/desktop.nix @@ -14,6 +14,6 @@ programs.home-manager = { enable = true; - path = "https://github.com/rycee/home-manager/archive/release-20.03.tar.gz"; + path = "https://github.com/rycee/home-manager/archive/release-20.09.tar.gz"; }; } From 9f76df43518983b3a716bb8a65a4d254500a745c Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 20 Dec 2020 23:08:45 +0100 Subject: [PATCH 3/5] lol --- profiles/base/default.nix | 2 +- profiles/xsession/default.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 1190ee1..bd4313a 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -93,7 +93,7 @@ in { programs.firefox = { enable = config.profiles.gui.enable; - package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.dan.radical-native ]; }; +# package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.dan.radical-native ]; }; }; programs.obs-studio = { diff --git a/profiles/xsession/default.nix b/profiles/xsession/default.nix index 165ad77..0efd6c9 100644 --- a/profiles/xsession/default.nix +++ b/profiles/xsession/default.nix @@ -24,6 +24,8 @@ in interval = "30m"; }; + services.dunst.enable = true; + xsession = { enable = true; From 995221c6f9bd297189da082e88b0b788218f2f42 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 21 Dec 2020 19:17:54 +0100 Subject: [PATCH 4/5] disable dunst --- profiles/xsession/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/xsession/default.nix b/profiles/xsession/default.nix index 0efd6c9..64513ad 100644 --- a/profiles/xsession/default.nix +++ b/profiles/xsession/default.nix @@ -24,7 +24,7 @@ in interval = "30m"; }; - services.dunst.enable = true; + services.dunst.enable = false; xsession = { enable = true; From 32f4b4878801e47fc516c0ef5401065b027cc2ec Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 2 Apr 2021 21:51:46 +0200 Subject: [PATCH 5/5] audio and fix JP font in polybar --- profiles/xsession/audio.nix | 12 ++++++------ profiles/xsession/polybar.nix | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/profiles/xsession/audio.nix b/profiles/xsession/audio.nix index 86d4b09..a1c1f79 100644 --- a/profiles/xsession/audio.nix +++ b/profiles/xsession/audio.nix @@ -9,11 +9,11 @@ pkgs.qjackctl ]; - home.file.pulse = { - target = ".config/pulse/client.conf"; - text = '' - daemon-binary=/var/run/current-system/sw/bin/pulseaudio - ''; - }; +# home.file.pulse = { +# target = ".config/pulse/client.conf"; +# text = '' +# daemon-binary=/var/run/current-system/sw/bin/pulseaudio +# ''; +# }; }; } diff --git a/profiles/xsession/polybar.nix b/profiles/xsession/polybar.nix index 95ea30d..f8db8a7 100644 --- a/profiles/xsession/polybar.nix +++ b/profiles/xsession/polybar.nix @@ -33,6 +33,7 @@ in height = 27; font-0 = "MesloLGS NF:fontformat=truetype:pixelsize=11;1"; + font-1 = "Kozuka Mincho Pro:pixelsize=11;1"; background = "\${colors.background}"; foreground = "\${colors.foreground}"; @@ -117,6 +118,7 @@ in interval = 25; mount-0 = "/"; + mount-1 = "/mnt/henning"; label-mounted = "%{F#0a81f5}%mountpoint%%{F-}: %free%"; label-unmounted = "%mountpoint% not mounted"; @@ -183,3 +185,4 @@ in }; }; } +