diff --git a/config/home.nix b/config/home.nix index c780db0..3acee31 100644 --- a/config/home.nix +++ b/config/home.nix @@ -11,7 +11,7 @@ imports = [ ../shared/dwm.nix ../shared/dmenu.nix - # ../shared/kitty.nix + ../shared/kitty.nix ../shared/alacritty.nix ../shared/tmux.nix ../shared/vim.nix @@ -32,10 +32,10 @@ nixpkgs = { overlays = []; config = { - # allowUnfree = false; - # allowUnfreePredicate = _: false; - allowUnfree = true; - allowUnfreePredicate = _: true; + allowUnfree = false; + allowUnfreePredicate = _: false; + # allowUnfree = true; + # allowUnfreePredicate = _: true; permittedInsecurePackages = [ "electron-25.9.0" "electron-19.1.9" @@ -86,14 +86,17 @@ ghorg libsixel valgrind - soulseekqt + nicotine-plus + resonance #Terminal + meli + tuifeed jq - gnuplot qrencode texliveFull + filezilla python311Packages.urwid python311Packages.numpy @@ -120,6 +123,7 @@ openssl pkg-config lazydocker + termusic #Unfree # obsidian @@ -128,9 +132,6 @@ #Alternatives slack-cli - spotify - unstable.spotifyd - librespot discordo #Desktop @@ -140,7 +141,6 @@ firefox vial thunderbird - signal-desktop-beta kitty alacritty unstable.neovim @@ -154,6 +154,8 @@ remmina #Dev + air + templ python3 python311Packages.pip ranger diff --git a/flake.nix b/flake.nix index 7d81f70..98e0cf4 100644 --- a/flake.nix +++ b/flake.nix @@ -36,12 +36,6 @@ config.allowUnfree = false; }; }; - overlay-knock = final: prev: { - knock = import knock { - inherit system; - config.allowUnfree = false; - }; - }; in { # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' @@ -52,7 +46,8 @@ myhostname = "laptop"; }; modules = [ - ./maskiner/laptop/configuration.nix + ({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + ./maskiner/laptop/configuration.nix ]; }; desktop = nixpkgs.lib.nixosSystem { @@ -86,7 +81,8 @@ }; modules = [ ./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 { diff --git a/shared/alacritty.nix b/shared/alacritty.nix index 7211e2c..a023bbf 100644 --- a/shared/alacritty.nix +++ b/shared/alacritty.nix @@ -31,7 +31,7 @@ family = "FiraCode Nerd Font"; style = "Regular"; }; - size = 9; + size = 14; }; colors = { primary = { diff --git a/shared/kitty.nix b/shared/kitty.nix index dc6a322..b6e0d61 100644 --- a/shared/kitty.nix +++ b/shared/kitty.nix @@ -4,7 +4,7 @@ enable = true; font = if myhostname == "laptop" then { name = "FiraCode Nerd Font Bold"; - size = 17; + size = 24; } else { name = "FiraCode Nerd Font Bold"; size = 13; diff --git a/shared/mpv.nix b/shared/mpv.nix index b4dbd37..0cf3a29 100644 --- a/shared/mpv.nix +++ b/shared/mpv.nix @@ -3,22 +3,15 @@ programs.mpv = { enable = true; - package = ( - pkgs.mpv-unwrapped.wrapper { - scripts = with pkgs.mpvScripts; [ - uosc - sponsorblock - ]; - - mpv = pkgs.mpv-unwrapped.override { - }; - } - ); + scripts = with pkgs.mpvScripts; [ + autoload + uosc + ]; config = { profile = "high-quality"; ytdl-format = "bestvideo+bestaudio"; - cache-default = 4000000; + volume = "70"; }; }; }