axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'devos'

Browse source
This commit is contained in:
teutat3s 2022-01-31 12:16:36 +01:00
parent b0af7b109b 68d42ba93f
commit 34777780b6
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
6 changed files with 66 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -29,7 +29,9 @@ expected. There are unstable versions (0._x_._x_) to help users keep track
of changes and progress, and a [`develop`](https://github.com/divnix/devos/tree/develop) branch for the brave 😜 of changes and progress, and a [`develop`](https://github.com/divnix/devos/tree/develop) branch for the brave 😜
## In the Wild ## In the Wild
* The original [authors][please] * @Pacman99: [Personal](https://gitlab.com/coffeetables/lower), [Server](https://gitlab.com/coffeetables/myrdd)
* [@danielphan2003](https://github.com/danielphan2003/flk) and make sure to also check out [devos-ext-lib][devos-ext-lib]
* [PubSolarOS](https://git.sr.ht/~b12f/pub-solar-os)
## Shoulders ## Shoulders
This work does not reinvent the wheel. It stands on the [shoulders of the This work does not reinvent the wheel. It stands on the [shoulders of the
@ -89,3 +91,4 @@ DevOS is licensed under the [MIT License][mit].
[nvfetcher]: https://github.com/berberman/nvfetcher [nvfetcher]: https://github.com/berberman/nvfetcher
[please]: https://github.com/nrdxp/devos/tree/nrd [please]: https://github.com/nrdxp/devos/tree/nrd
[matrix]: https://matrix.to/#/#devos:nixos.org [matrix]: https://matrix.to/#/#devos:nixos.org
[devos-ext-lib]: https://github.com/divnix/devos-ext-lib

120
flake.lock
View file

@ -23,10 +23,7 @@
"beautysh": { "beautysh": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"bud",
"nixpkgs"
],
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
@ -148,7 +145,6 @@
"deploy" "deploy"
], ],
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils_3",
"flake-utils-plus": "flake-utils-plus", "flake-utils-plus": "flake-utils-plus",
"home-manager": [ "home-manager": [
"home" "home"
@ -163,11 +159,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1640031018, "lastModified": 1643510242,
"narHash": "sha256-ZzyS803XuCl99XE4581m0Suni+q1Hz+Mpw6A9bs7VKM=", "narHash": "sha256-9C9DyJhQ5bevk0CEEjGct+U9EqUgHg8T70nxz47zjMI=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "3157889810e51a1ae03f82bf6bf6657ba8cf93c6", "rev": "33bfb05b8a148d8ad6a842de74e22209bf9fe5d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,7 +174,7 @@
}, },
"fenix": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
@ -244,29 +240,29 @@
}, },
"flake-utils-plus": { "flake-utils-plus": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4" "flake-utils": "flake-utils_3"
}, },
"locked": { "locked": {
"lastModified": 1638994888, "lastModified": 1639385028,
"narHash": "sha256-iz/ynGNZlvqKCOnFrEKqGA+BVKGQMG+g2JT+e3OOLN8=", "narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=",
"owner": "divnix", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "b4f9f517574cb7bd6ee3f19c72c19634c9f536e1", "rev": "be1be083af014720c14f3b574f57b6173b4915d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "divnix", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1642700792,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,21 +287,6 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"locked": { "locked": {
"lastModified": 1631561581, "lastModified": 1631561581,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
@ -327,11 +308,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1637917557, "lastModified": 1642653493,
"narHash": "sha256-3u5bLyGn5NUG3RJA7/v1Bqa/QCFGqp/01Bh/4REf9m4=", "narHash": "sha256-22mGPjiHUo2Jmze4IjXCJLjeK2mbvvCztHmUyUMr4yw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4daff26495ca9ac67476cba8cf15c3e36d91ab18", "rev": "28b9ae40c45c5e7711c353fee1b7af734e293979",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,11 +340,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1638198142, "lastModified": 1643347846,
"narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a308775674e178495767df90c419425474582a1", "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -395,11 +376,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1640478849, "lastModified": 1641688481,
"narHash": "sha256-S4lNc3fb9UpYgVtTa/mZZXphq7+xGy74YGIlOWB1ceE=", "narHash": "sha256-6L+EU12xLDHby7y8elgFtRKVBxix+7qV8DhVgXqrKZo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "c85a293f7d094a799dcf1197c31925bc44e94d6b", "rev": "f697717b3d3a074ffc16c8c8227504f0db292886",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -429,11 +410,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1638231428, "lastModified": 1643463207,
"narHash": "sha256-Sm5loBKdeusSvIAC+LtzRT6I7tAcqZdIPnHcxZt7NaE=", "narHash": "sha256-W0azAxucUq84BvWqDPt3gX8kyc8wYvGUynZV9COfByQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "393c5357a0071d51668bcdc69dfc25ddacbd5840", "rev": "03098169624f487eef37186b3214c40e6b6e919d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,7 +427,10 @@
"nixos-generators": { "nixos-generators": {
"inputs": { "inputs": {
"nixlib": "nixlib", "nixlib": "nixlib",
"nixpkgs": "nixpkgs_3" "nixpkgs": [
"digga",
"blank"
]
}, },
"locked": { "locked": {
"lastModified": 1637655461, "lastModified": 1637655461,
@ -479,11 +463,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1640831728, "lastModified": 1643428210,
"narHash": "sha256-KK5SKqqfAt+ev3bHLrVXJ6i4zx9YQW6k19oUInY8T2M=", "narHash": "sha256-ympCeHuXeGitpnegE0raAtWLNg3vZbjj5QbbMvvBGCQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d90841dd0179430db010dfc2c58b2a7de4371be", "rev": "e1b353e890801a759efe9a4c42f6984e47721f0d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1643513770,
"narHash": "sha256-Q64SabfQLuhHQfhpIHS/fLCEO2NUFnI+EKsB5GnfWh8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "66ab3568d67b90275c0720aae8b911bad82c24fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -492,7 +492,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1636976544, "lastModified": 1636976544,
"narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=",
@ -508,22 +508,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1638231901, "lastModified": 1638231901,
@ -541,7 +525,7 @@
"nvfetcher": { "nvfetcher": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ]
@ -563,7 +547,7 @@
"poetry2nix": { "poetry2nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1625240517, "lastModified": 1625240517,

1
modules/terminal-life/zsh/default.nix
View file

@ -38,6 +38,7 @@ in
no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix"; no = "manix \"\" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview=\"manix '{}'\" | xargs manix";
# fix nixos-option # fix nixos-option
nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat"; nixos-option = "nixos-option -I nixpkgs=${self}/lib/compat";
myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
}; };
zplug = { zplug = {
enable = true; enable = true;

3
overlays/overrides.nix
View file

@ -25,9 +25,6 @@ channels: final: prev: {
looking-glass-client looking-glass-client
; ;
# nix is set to 2.3 in 21.11
nix-direnv = prev.nix-direnv.override { nix = prev.nixUnstable; };
haskellPackages = prev.haskellPackages.override haskellPackages = prev.haskellPackages.override
(old: { (old: {
overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev: overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev:

18
profiles/core/default.nix
View file

@ -2,6 +2,7 @@
let inherit (lib) fileContents; let inherit (lib) fileContents;
in in
{ {
# Sets nrdxp.cachix.org binary cache which just speeds up some builds
imports = [ ../cachix ]; imports = [ ../cachix ];
config = { config = {
@ -16,6 +17,7 @@ in
pub-solar.server.enable = true; pub-solar.server.enable = true;
pub-solar.printing.enable = true; pub-solar.printing.enable = true;
# This is just a representation of the nix default
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
environment = { environment = {
@ -90,20 +92,21 @@ in
}; };
nix = { nix = {
# use nix-dram, a patched nix command, see: https://github.com/dramforever/nix-dram
package = pkgs.nix-dram; package = pkgs.nix-dram;
# Improve nix store disk usage
autoOptimiseStore = true; autoOptimiseStore = true;
gc.automatic = true; gc.automatic = true;
optimise.automatic = true; optimise.automatic = true;
# Prevents impurities in builds
useSandbox = true; useSandbox = true;
allowedUsers = [ "@wheel" ]; # give root and @wheel special privileges with nix
trustedUsers = [ "root" "@wheel" ]; trustedUsers = [ "root" "@wheel" ];
# Generally useful nix option defaults
extraOptions = '' extraOptions = ''
min-free = 536870912 min-free = 536870912
keep-outputs = true keep-outputs = true
@ -116,12 +119,7 @@ in
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
# For rage encryption, all hosts need a ssh key pair # Service that makes Out of Memory Killer more effective
services.openssh = {
enable = true;
openFirewall = lib.mkDefault false;
};
services.earlyoom.enable = true; services.earlyoom.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;

2
shell/bud/get.bash
View file

@ -1 +1 @@
git clone https://github.com/divnix/devos.git "${2:-devos}" nix flake new -t "github:divnix/devos/main" "${2:-devos}"