sercanto/mio-ops
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Merge branch 'nixos-2205' into consensus

Browse source
This commit is contained in:
Serĉanto de Scio 2022-06-10 11:31:11 +10:00
parent 5cdc9beaa6 329f549091
commit a836a3afaa
Signed by: sercanto
GPG key ID: 7DBA9F5689EFB6AA
10 changed files with 38 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hosts/dionach.nix
View file

@ -35,7 +35,7 @@
nixpkgs.config = {
allowUnfree = true;
permittedInsecurePackages = ["openssl-1.0.2u" "minecraft"];
permittedInsecurePackages = ["openssl-1.0.2u"];
};
# Use the GRUB 2 boot loader.
@ -88,7 +88,6 @@
gnused
google-authenticator # 2FA
google-chrome # A freeware web browser developed by Google
googleearth # A world sphere viewer
graphviz # Graph visualization tools
gvfs
imagemagick
@ -99,12 +98,10 @@
libgphoto2
libreoffice-fresh # Libreoffice - fresh version
lxmenu-data
minecraft
mkpasswd
mp3info # MP3 tag editor / query tool
mpd
mtpfs
multimc
ncmpcpp
nextcloud-client
nvme-cli # NVM-Express user space tooling for Linux
@ -122,7 +119,6 @@
python39Packages.sphinx # A tool that makes it easy to create intelligent and beautifulul documentation for Python projects
radiotray-ng # Internet radio player
rdiff-backup # External backups
shared_mime_info
shotwell
signal-desktop
smartmontools # Tools for monitoring the health of hard drives
@ -150,10 +146,6 @@
zlib.dev
];
environment.variables = {
GIO_EXTRA_MODULES = ["${pkgs.gvfs}/lib/gio/modules"];
};
services.acpid.enable = true;
services.blueman.enable = true;
services.kbfs.enable = true;
@ -191,7 +183,6 @@
pulseaudio = {
enable = true;
systemWide = false;
extraModules = [pkgs.pulseaudio-modules-bt];
package = pkgs.pulseaudioFull;
};
bluetooth = {

8
nix/sources.json
View file

@ -56,16 +56,16 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "nixos-21.11",
"branch": "nixos-22.05",
"builtin": false,
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9bc0e974545d5bc4c24e1ed047be0dc4e30e494b",
"sha256": "09srdp53k3jc6qj66g85618xg4x2y705ljfn486g437icdp7mln5",
"rev": "d9794b04bffb468b886c553557489977ae5f4c65",
"sha256": "1l41dhs1cmwx7q7s38d9dr9zyijfm6bhmv41zr7rsg94yplbr0f1",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/9bc0e974545d5bc4c24e1ed047be0dc4e30e494b.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/d9794b04bffb468b886c553557489977ae5f4c65.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgsUnstable": {

7
profiles/desktopCraige.nix
View file

@ -7,12 +7,19 @@
# Craige's Desktop Packages
imports = [
../profiles/ebooks.nix
../profiles/minecraftClient.nix
../profiles/spotify.nix # Spotify settings
];
nixpkgs.config.permittedInsecurePackages = [
"googleearth-pro-7.3.4.8248"
];
environment.systemPackages = with pkgs; [
byobu # text-based window manager and terminal multiplexer.
googleearth-pro # A world sphere viewer
gopass # password file manager
shared-mime-info # A database of common MIME types
yt-dlp # Command-line tool to download videos
];
}

3
profiles/desktop_common.nix
View file

@ -24,7 +24,7 @@
brave # Privacy-oriented browser
chromium
element-desktop # A feature-rich client for Matrix.org
firefoxWrapper # install Firefox with support for plugins
firefox # install Firefox with support for plugins
gnome.gnome-tweaks # A tool to customize advanced GNOME 3 options
google-chrome # A freeware web browser developed by Google
libreoffice-fresh
@ -70,7 +70,6 @@
hardware = {
pulseaudio = {
enable = true;
extraModules = [pkgs.pulseaudio-modules-bt];
package = pkgs.pulseaudioFull;
};
bluetooth = {

11
profiles/games-kids.nix
View file

@ -7,12 +7,11 @@
sources = import ../nix/sources.nix;
unstable = import sources.nixpkgsUnstable {};
in {
nixpkgs.config = {
allowUnfree = true;
permittedInsecurePackages = ["minecraft"];
};
imports = [
../profiles/minecraftClient.nix # Play Minecraft :-)
];
# Retro Gaming Packages
# Kid's Gaming Packages
environment.systemPackages = with pkgs; [
angband # A single-player roguelike dungeon exploration game
discord # cross-platform voice and text chat for gamers
@ -22,10 +21,8 @@ in {
freedroidrpg # Isometric 3D RPG similar to game Diablo
gcompris # Educational software suite, kids aged 2 to 10
unstable.grapejuice # Simple Wine+Roblox management tool
jre # Required by Minecraft (via multimc)
#lincity_ng # City building game
meritous # Action-adventure dungeon crawl game
minecraft # Official launcher for Minecraft
minetest # Infinite-world block sandbox game
nethack-x11 # Rogue-like game
#opendungeons # real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius

16
profiles/minecraftClient.nix Normal file
View file

@ -0,0 +1,16 @@
# Minecraft client configuration for NixOS
{
pkgs,
config,
...
}: {
nixpkgs.config = {
allowUnfree = true;
permittedInsecurePackages = ["minecraft"];
};
environment.systemPackages = with pkgs; [
jre # Required by Minecraft (via polymc)
minecraft # Official launcher for Minecraft
polymc # A free, open source launcher for Minecraft
];
}

2
profiles/openssh.nix
View file

@ -8,7 +8,7 @@
services.openssh = {
enable = true; # Enable the OpenSSH daemon.
permitRootLogin = "prohibit-password";
challengeResponseAuthentication = false;
kbdInteractiveAuthentication = false;
passwordAuthentication = false;
openFirewall = true;
hostKeys = [

4
profiles/server_common.nix
View file

@ -16,6 +16,6 @@
withUtempter = true;
};
# avoid CVE-2021-4034 (PwnKit)
security.polkit.enable = false;
security.polkit.enable = false; # avoid CVE-2021-4034 (PwnKit)
services.udisks2.enable = false; # disable udisks2 which enables polkit
}

1
profiles/weechat.nix
View file

@ -27,7 +27,6 @@
wee-slack # A WeeChat plugin for Slack.com
weechat-autosort # Automatically or manually keep your buffers sorted
weechat-matrix # Weechat communication over the Matrix protocol
weechat-otr # WeeChat script for Off-the-Record messaging
];
};
})

4
profiles/xmonad.nix
View file

@ -34,7 +34,7 @@
haskellPackages.dbus
haskellPackages.xmonad-contrib # Install xmonad-contrib.
haskellPackages.xmonad-extras # Install xmonad-extras.
haskellPackages.xmonad_0_17_0
haskellPackages.xmonad
];
};
};
@ -49,7 +49,7 @@
# Install any additional fonts that I require to be used with xmonad
fonts.fonts = with pkgs; [
opensans-ttf # Used in in my xmobar configuration
open-sans # Used in in my xmobar configuration
];
# Install other packages that I require to be used with xmonad.