Merge branch 'master' of https://git.dodsorf.as/Dandellion/nix-dotfiles into master
This commit is contained in:
commit
b7996a84fa
|
@ -14,6 +14,6 @@
|
||||||
|
|
||||||
programs.home-manager = {
|
programs.home-manager = {
|
||||||
enable = true;
|
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";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,7 @@ in {
|
||||||
kdeFrameworks.kio
|
kdeFrameworks.kio
|
||||||
kdeApplications.kio-extras
|
kdeApplications.kio-extras
|
||||||
|
|
||||||
dan.rank_photos
|
#dan.rank_photos
|
||||||
|
|
||||||
# ***REMOVED***
|
# ***REMOVED***
|
||||||
|
|
||||||
|
@ -87,13 +87,13 @@ in {
|
||||||
kdenlive
|
kdenlive
|
||||||
frei0r
|
frei0r
|
||||||
|
|
||||||
geogebra
|
#geogebra
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = config.profiles.gui.enable;
|
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 = {
|
programs.obs-studio = {
|
||||||
|
@ -105,7 +105,9 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
userEmail = "daniel.olsen99@gmail.com";
|
userEmail = "daniel.olsen99@gmail.com";
|
||||||
userName = "Daniel Olsen";
|
userName = "Daniel Olsen";
|
||||||
|
extraConfig = {
|
||||||
|
pull.rebase = true;
|
||||||
|
};
|
||||||
# delta.enable = true;
|
# delta.enable = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
pkgs.qjackctl
|
pkgs.qjackctl
|
||||||
];
|
];
|
||||||
|
|
||||||
home.file.pulse = {
|
# home.file.pulse = {
|
||||||
target = ".config/pulse/client.conf";
|
# target = ".config/pulse/client.conf";
|
||||||
text = ''
|
# text = ''
|
||||||
daemon-binary=/var/run/current-system/sw/bin/pulseaudio
|
# daemon-binary=/var/run/current-system/sw/bin/pulseaudio
|
||||||
'';
|
# '';
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,8 @@ in
|
||||||
interval = "30m";
|
interval = "30m";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.dunst.enable = false;
|
||||||
|
|
||||||
xsession = {
|
xsession = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ in
|
||||||
height = 27;
|
height = 27;
|
||||||
|
|
||||||
font-0 = "MesloLGS NF:fontformat=truetype:pixelsize=11;1";
|
font-0 = "MesloLGS NF:fontformat=truetype:pixelsize=11;1";
|
||||||
|
font-1 = "Kozuka Mincho Pro:pixelsize=11;1";
|
||||||
|
|
||||||
background = "\${colors.background}";
|
background = "\${colors.background}";
|
||||||
foreground = "\${colors.foreground}";
|
foreground = "\${colors.foreground}";
|
||||||
|
@ -117,6 +118,7 @@ in
|
||||||
interval = 25;
|
interval = 25;
|
||||||
|
|
||||||
mount-0 = "/";
|
mount-0 = "/";
|
||||||
|
mount-1 = "/mnt/henning";
|
||||||
|
|
||||||
label-mounted = "%{F#0a81f5}%mountpoint%%{F-}: %free%";
|
label-mounted = "%{F#0a81f5}%mountpoint%%{F-}: %free%";
|
||||||
label-unmounted = "%mountpoint% not mounted";
|
label-unmounted = "%mountpoint% not mounted";
|
||||||
|
@ -183,3 +185,4 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue