mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
moms-laptop -> media-laptop
This commit is contained in:
parent
681ea15292
commit
5a6d712c2e
10 changed files with 12 additions and 55 deletions
|
|
@ -1,16 +1,16 @@
|
|||
keys:
|
||||
- &gerg-desktop age180y8kdtdlqelayyz9mq2c7xv248rh4gdfr3amjzvdcjrz6wdaqmsj762pp
|
||||
- &moms-laptop age1vxx3qdsucv2v2slag67c4f0kwd8jtta4tue6m8d9xfl4ryrqvyusxgwl68
|
||||
- &media-laptop age1vxx3qdsucv2v2slag67c4f0kwd8jtta4tue6m8d9xfl4ryrqvyusxgwl68
|
||||
- &game-desktop age1egxes320renph0uevtmnsz4d5aw0z794c5nwrk2z6249wv2yevgqx9cf90
|
||||
creation_rules:
|
||||
- path_regex: hosts/gerg-desktop/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *gerg-desktop
|
||||
- path_regex: hosts/moms-laptop/secrets.yaml$
|
||||
- path_regex: hosts/media-laptop/secrets.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *moms-laptop
|
||||
- *media-laptop
|
||||
- *gerg-desktop
|
||||
- path_regex: hosts/game-desktop/secrets.yaml$
|
||||
key_groups:
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ which I run a windows KVM VFIO virtual machine on
|
|||
"game-desktop" a HP Pavilion Laptop [15-ec2121nr](https://support.hp.com/us-en/document/c07918617#AbT0)
|
||||
which I've been testing linux game compatability on
|
||||
|
||||
"moms-laptop" a TOSHIBA Satellite [L855-S5309](https://fo-stage-03.icecat.biz/us/p/toshiba/pskfuu-008049/satellite-notebooks-l855-s5309-18316794.html)
|
||||
"media-laptop" a TOSHIBA Satellite [L855-S5309](https://fo-stage-03.icecat.biz/us/p/toshiba/pskfuu-008049/satellite-notebooks-l855-s5309-18316794.html)
|
||||
very old and very slow -basically a bootloader for firefox
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
nixosConfigurations = lib.mkHosts "x86_64-linux" [
|
||||
"gerg-desktop"
|
||||
"game-desktop"
|
||||
"moms-laptop"
|
||||
"media-laptop"
|
||||
"iso"
|
||||
];
|
||||
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
diskoConfigurations = lib.mkDisko [
|
||||
"gerg-desktop"
|
||||
"game-desktop"
|
||||
"moms-laptop"
|
||||
"media-laptop"
|
||||
];
|
||||
formatter.${system} = pkgs.writeShellApplication {
|
||||
name = "lint";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ _:
|
|||
datadir = "/persist/services/nextcloud";
|
||||
hostName = "next.gerg-l.com";
|
||||
autoUpdateApps.enable = false;
|
||||
enableBrokenCiphersForSSE = false;
|
||||
database.createLocally = true;
|
||||
config = {
|
||||
overwriteProtocol = "https";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ _:
|
|||
DM = {
|
||||
lightdm.enable = true;
|
||||
autoLogin = true;
|
||||
loginUser = "jo";
|
||||
loginUser = "media";
|
||||
};
|
||||
DE.xfce.enable = true;
|
||||
theming = {
|
||||
|
|
@ -24,10 +24,7 @@ _:
|
|||
inherit (pkgs)
|
||||
neovim
|
||||
vlc
|
||||
nomacs
|
||||
rsync
|
||||
pavucontrol # gui volume control
|
||||
librewolf # best browser
|
||||
chromium
|
||||
;
|
||||
};
|
||||
|
|
@ -42,7 +39,7 @@ _:
|
|||
users = {
|
||||
mutableUsers = false;
|
||||
users = {
|
||||
jo = {
|
||||
media = {
|
||||
useDefaultShell = true;
|
||||
uid = 1000;
|
||||
isNormalUser = true;
|
||||
|
|
@ -77,16 +74,9 @@ _:
|
|||
];
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
};
|
||||
systemd.user.tmpfiles.users.jo.rules = [
|
||||
"L+ %h/Desktop/gimp.desktop - - - - ${pkgs.gimp}/share/applications/gimp.desktop"
|
||||
"L+ %h/Desktop/org.gnome.Calculator.desktop - - - - ${pkgs.gnome.gnome-calculator}/share/applications/org.gnome.Calculator.desktop"
|
||||
"L+ %h/Desktop/org.nomacs.ImageLounge.desktop - - - - ${pkgs.nomacs}/share/applications/org.nomacs.ImageLounge.desktop"
|
||||
"L+ %h/Desktop/thunar.desktop - - - - ${pkgs.xfce.thunar}/share/applications/thunar.desktop"
|
||||
"L+ %h/Desktop/librewolf.desktop - - - - ${pkgs.librewolf}/share/applications/librewolf.desktop"
|
||||
systemd.user.tmpfiles.users.media.rules = [
|
||||
"L+ %h/Desktop/chromium.desktop - - - - ${pkgs.chromium}/share/applications/chromium.desktop"
|
||||
"L+ %h/Desktop/vlc.desktop - - - - ${pkgs.vlc}/share/applications/vlc.desktop"
|
||||
"L %h/Desktop/Downloads - - - - %h/Downloads"
|
||||
"L %h/Desktop/Documents - - - - %h/Documents"
|
||||
"L %h/Desktop/Pictures - - - - %h/Pictures"
|
||||
];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
_:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
xsane = pkgs.xsane.override { gimpSupport = true; };
|
||||
in
|
||||
{
|
||||
local.allowedUnfree = [ "hplip" ];
|
||||
environment.systemPackages = [
|
||||
xsane
|
||||
pkgs.gimp
|
||||
pkgs.libreoffice
|
||||
];
|
||||
users.users.jo.extraGroups = [
|
||||
"scanner"
|
||||
"lp"
|
||||
"cups"
|
||||
];
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = [ pkgs.hplipWithPlugin ];
|
||||
};
|
||||
systemd.user.tmpfiles.users.jo.rules = [
|
||||
"L %h/.config/GIMP/2.10/plug-ins/xsane - - - - ${xsane}"
|
||||
];
|
||||
services = {
|
||||
printing = {
|
||||
enable = true;
|
||||
drivers = [ pkgs.hplipWithPlugin ];
|
||||
};
|
||||
};
|
||||
_file = ./printing.nix;
|
||||
}
|
||||
|
|
@ -51,7 +51,7 @@ _:
|
|||
(
|
||||
let
|
||||
keys = [
|
||||
config.local.keys.root_moms-laptop
|
||||
config.local.keys.root_media-laptop
|
||||
config.local.keys.root_game-desktop
|
||||
];
|
||||
in
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ _:
|
|||
config.local.keys = {
|
||||
gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77";
|
||||
gerg_gerg-windows = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc";
|
||||
root_moms-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIq9YTf4jlVCKBKn44m4yJvj94C7pTOyaa4VjZFohNqD";
|
||||
root_media-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIq9YTf4jlVCKBKn44m4yJvj94C7pTOyaa4VjZFohNqD";
|
||||
root_game-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUKHZasYQUAmRBiqtx1drDxfq18/N4rKydCtPHx461I";
|
||||
root_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIeHsGcmOdIMzV+SNe4WFcA3CPHCNb1aqxThkXtm7G/1";
|
||||
gerg-desktop_fingerprint = "BQxvBOWsTw1gdNDR0KzrSRmbVhDrJdG05vYXkVmw8yA";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue