Small changes

This commit is contained in:
FredzyW 2024-09-29 21:14:34 +02:00
parent caa5d90b82
commit 80eaaf1831
5 changed files with 24 additions and 33 deletions

View file

@ -11,7 +11,7 @@
imports = [ imports = [
../shared/dwm.nix ../shared/dwm.nix
../shared/dmenu.nix ../shared/dmenu.nix
# ../shared/kitty.nix ../shared/kitty.nix
../shared/alacritty.nix ../shared/alacritty.nix
../shared/tmux.nix ../shared/tmux.nix
../shared/vim.nix ../shared/vim.nix
@ -32,10 +32,10 @@
nixpkgs = { nixpkgs = {
overlays = []; overlays = [];
config = { config = {
# allowUnfree = false; allowUnfree = false;
# allowUnfreePredicate = _: false; allowUnfreePredicate = _: false;
allowUnfree = true; # allowUnfree = true;
allowUnfreePredicate = _: true; # allowUnfreePredicate = _: true;
permittedInsecurePackages = [ permittedInsecurePackages = [
"electron-25.9.0" "electron-25.9.0"
"electron-19.1.9" "electron-19.1.9"
@ -86,14 +86,17 @@
ghorg ghorg
libsixel libsixel
valgrind valgrind
soulseekqt nicotine-plus
resonance
#Terminal #Terminal
meli
tuifeed
jq jq
gnuplot gnuplot
qrencode qrencode
texliveFull texliveFull
filezilla
python311Packages.urwid python311Packages.urwid
python311Packages.numpy python311Packages.numpy
@ -120,6 +123,7 @@
openssl openssl
pkg-config pkg-config
lazydocker lazydocker
termusic
#Unfree #Unfree
# obsidian # obsidian
@ -128,9 +132,6 @@
#Alternatives #Alternatives
slack-cli slack-cli
spotify
unstable.spotifyd
librespot
discordo discordo
#Desktop #Desktop
@ -140,7 +141,6 @@
firefox firefox
vial vial
thunderbird thunderbird
signal-desktop-beta
kitty kitty
alacritty alacritty
unstable.neovim unstable.neovim
@ -154,6 +154,8 @@
remmina remmina
#Dev #Dev
air
templ
python3 python3
python311Packages.pip python311Packages.pip
ranger ranger

View file

@ -36,12 +36,6 @@
config.allowUnfree = false; config.allowUnfree = false;
}; };
}; };
overlay-knock = final: prev: {
knock = import knock {
inherit system;
config.allowUnfree = false;
};
};
in { in {
# NixOS configuration entrypoint # NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname' # Available through 'nixos-rebuild --flake .#your-hostname'
@ -52,7 +46,8 @@
myhostname = "laptop"; myhostname = "laptop";
}; };
modules = [ modules = [
./maskiner/laptop/configuration.nix ({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./maskiner/laptop/configuration.nix
]; ];
}; };
desktop = nixpkgs.lib.nixosSystem { desktop = nixpkgs.lib.nixosSystem {
@ -86,7 +81,8 @@
}; };
modules = [ modules = [
./config/home.nix ./config/home.nix
({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-knock overlay-fw-pkgs ]; }) ({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-fw-pkgs ]; })
]; ];
}; };
"fw@desktop" = home-manager.lib.homeManagerConfiguration { "fw@desktop" = home-manager.lib.homeManagerConfiguration {

View file

@ -31,7 +31,7 @@
family = "FiraCode Nerd Font"; family = "FiraCode Nerd Font";
style = "Regular"; style = "Regular";
}; };
size = 9; size = 14;
}; };
colors = { colors = {
primary = { primary = {

View file

@ -4,7 +4,7 @@
enable = true; enable = true;
font = if myhostname == "laptop" then { font = if myhostname == "laptop" then {
name = "FiraCode Nerd Font Bold"; name = "FiraCode Nerd Font Bold";
size = 17; size = 24;
} else { } else {
name = "FiraCode Nerd Font Bold"; name = "FiraCode Nerd Font Bold";
size = 13; size = 13;

View file

@ -3,22 +3,15 @@
programs.mpv = { programs.mpv = {
enable = true; enable = true;
package = ( scripts = with pkgs.mpvScripts; [
pkgs.mpv-unwrapped.wrapper { autoload
scripts = with pkgs.mpvScripts; [ uosc
uosc ];
sponsorblock
];
mpv = pkgs.mpv-unwrapped.override {
};
}
);
config = { config = {
profile = "high-quality"; profile = "high-quality";
ytdl-format = "bestvideo+bestaudio"; ytdl-format = "bestvideo+bestaudio";
cache-default = 4000000; volume = "70";
}; };
}; };
} }