pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

nixos: follow release-22.05

Browse source 
home: follow release-22.05 branch

Fixes for upstream changes:

ag renamed to silver-searcher, extfat-utils is now exfat, lot's of
overrides no longer needed, as they're now in the release branch,
services.caddy.config split up into globalConfig and extraConfig
This commit is contained in:
teutat3s 2022-06-02 10:09:42 +02:00
parent 036de0adc2
commit aabfc4a0dd
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
5 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -8,7 +8,7 @@
inputs = inputs =
{ {
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixos.url = "github:nixos/nixpkgs/nixos-21.11"; nixos.url = "github:nixos/nixpkgs/nixos-22.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
master.url = "github:nixos/nixpkgs/master"; master.url = "github:nixos/nixpkgs/master";
@ -22,7 +22,7 @@
bud.inputs.nixpkgs.follows = "nixos"; bud.inputs.nixpkgs.follows = "nixos";
bud.inputs.devshell.follows = "digga/devshell"; bud.inputs.devshell.follows = "digga/devshell";
home.url = "github:nix-community/home-manager/master"; home.url = "github:nix-community/home-manager/release-22.05";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";

2
modules/terminal-life/default.nix
View file

@ -26,7 +26,6 @@ in
home.packages = [ home.packages = [
ack ack
asciinema asciinema
ag
asciinema asciinema
bat bat
exa exa
@ -37,6 +36,7 @@ in
nnn nnn
powerline powerline
python-wiki-fetch python-wiki-fetch
silver-searcher
vifm vifm
watson watson
]; ];

8
modules/x-os/networking.nix
View file

@ -40,10 +40,10 @@ in
# Caddy reverse proxy for local services like cups # Caddy reverse proxy for local services like cups
services.caddy = { services.caddy = {
enable = true; enable = true;
config = '' globalConfig = ''
{ auto_https off
auto_https off '';
} extraConfig = ''
cups.local:80 cups.local:80
bind 127.0.0.1 bind 127.0.0.1
request_header Host localhost:631 request_header Host localhost:631

14
overlays/overrides.nix
View file

@ -14,21 +14,7 @@ channels: final: prev: {
starship starship
deploy-rs deploy-rs
docker
docker-compose_2
flameshot
metal-cli
nomad
qMasterPassword
vagrant
nixUnstable
neovim-unwrapped
tdesktop tdesktop
obs-studio
obs-studio-plugins
looking-glass-client
nix-direnv
vimPlugins
; ;
inherit (channels.master) inherit (channels.master)

2
profiles/core/default.nix
View file

@ -48,7 +48,7 @@ in
dateutils dateutils
diffutils diffutils
findutils findutils
exfat-utils exfat
file file
# zippit # zippit