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"; }; } diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 662f6e8..bd4313a 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,13 +87,13 @@ in { kdenlive frei0r - geogebra + #geogebra ]; 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 = { @@ -105,7 +105,9 @@ in { enable = true; userEmail = "daniel.olsen99@gmail.com"; userName = "Daniel Olsen"; - + extraConfig = { + pull.rebase = true; + }; # delta.enable = true; }; 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/default.nix b/profiles/xsession/default.nix index 165ad77..64513ad 100644 --- a/profiles/xsession/default.nix +++ b/profiles/xsession/default.nix @@ -24,6 +24,8 @@ in interval = "30m"; }; + services.dunst.enable = false; + xsession = { enable = true; 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 }; }; } +