erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:e7b9844c4de836e890cec297f211ec4f5b7e0ecf
Branches Tags
erwin:main
...
compare: erwin:6fc294669e6e09a8a757468c04a8833e42860853
Branches Tags
erwin:main

3 commits
e7b9844c4d ... 6fc294669e

Author SHA1 Message Date
Erwin Boskma
6fc294669e
work: Add livebook 2023-12-08 16:40:33 +01:00
Erwin Boskma
fb2ccf201f
Add nix-ld-rs 2023-12-08 16:39:57 +01:00
Erwin Boskma
5a7c8c6ca8
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/f84c3684900d11cf19f530070d32d55f0ed51374' (2023-12-05)
  → 'github:nix-community/disko/1144887c6f4d2dcbb2316a24364ef53e25b0fcfe' (2023-12-06)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/5bc76d2e18a8592d49e1539e7eb79a95a3f2ce1c' (2023-12-05)
  → 'github:nix-community/emacs-overlay/ea9cd7c22194345e4db85e334b8ff40cc384c536' (2023-12-08)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/6386d8aafc28b3a7ed03880a57bdc6eb4465491d' (2023-12-02)
  → 'github:NixOS/nixpkgs/e9f06adb793d1cca5384907b3b8a4071d5d7cb19' (2023-12-03)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/91050ea1e57e50388fa87a3302ba12d188ef723a' (2023-12-01)
  → 'github:nixos/nixpkgs/2c7f3c0fb7c08a0814627611d9d7d45ab6d75335' (2023-12-04)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/1f48c08cae1b2c4d5f201a77abfe31fc3b95a4cf' (2023-12-05)
  → 'github:oxalica/rust-overlay/c2a1dd067a928624c1aab36f976758c0722c79bd' (2023-12-08)
 2023-12-08 10:54:40 +01:00
4 changed files with 169 additions and 25 deletions
Show stats Expand all files Collapse all files

104
flake.lock
View file

@ -81,11 +81,11 @@
]
},
"locked": {
"lastModified": 1701775991,
"narHash": "sha256-/51DaSTzoW+wQfj5P9EnTbSxixDFjjhfnGdMKcSp+is=",
"lastModified": 1701905325,
"narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=",
"owner": "nix-community",
"repo": "disko",
"rev": "f84c3684900d11cf19f530070d32d55f0ed51374",
"rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe",
"type": "github"
},
"original": {
@ -105,11 +105,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1701766395,
"narHash": "sha256-lC8XOwVPBrEPZB4ssqaiVNm4rWkrYgxHRyaLHnBUxNw=",
"lastModified": 1702028397,
"narHash": "sha256-FNlJm0IJ0mjMYVKL7qiTFIdmF0yEyBUJeeCxDjg72gE=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "5bc76d2e18a8592d49e1539e7eb79a95a3f2ce1c",
"rev": "ea9cd7c22194345e4db85e334b8ff40cc384c536",
"type": "github"
},
"original": {
@ -175,6 +175,22 @@
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -247,6 +263,24 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -388,6 +422,28 @@
"type": "github"
}
},
"nix-ld-rs": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1699781621,
"narHash": "sha256-l8OMloSbDyjIb9yVeD10M7aK7qDCVMt3huBztihrbwM=",
"owner": "nix-community",
"repo": "nix-ld-rs",
"rev": "5806f307048a9ae9e3e88cc48006d4d0b2df4410",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-ld-rs",
"type": "github"
}
},
"nixinate": {
"inputs": {
"nixpkgs": [
@ -425,11 +481,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1701436327,
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
"lastModified": 1701718080,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
"type": "github"
},
"original": {
@ -459,11 +515,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1701540982,
"narHash": "sha256-5ajSy6ODgGmAbmymRdHnjfVnuVrACjI8wXoGVvrtvww=",
"lastModified": 1701615100,
"narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6386d8aafc28b3a7ed03880a57bdc6eb4465491d",
"rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
"type": "github"
},
"original": {
@ -535,7 +591,7 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat_4",
"flake-utils": [
"flake-utils"
],
@ -573,6 +629,7 @@
"microvm": "microvm",
"naersk": "naersk",
"nil": "nil",
"nix-ld-rs": "nix-ld-rs",
"nixinate": "nixinate",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
@ -618,11 +675,11 @@
]
},
"locked": {
"lastModified": 1701742626,
"narHash": "sha256-ASuWURoeuV7xKZEVSCJsdHidrgprJexNkFWU/cfZ5LE=",
"lastModified": 1702001829,
"narHash": "sha256-6gEVidNVqzTb06zIy2Gxhz9m6/jXyAgViRxfgEpZkQ8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "1f48c08cae1b2c4d5f201a77abfe31fc3b95a4cf",
"rev": "c2a1dd067a928624c1aab36f976758c0722c79bd",
"type": "github"
},
"original": {
@ -690,6 +747,21 @@
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

5
flake.nix
View file

@ -91,6 +91,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nix-ld-rs = {
url = "github:nix-community/nix-ld-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
caddy-with-plugins = {
url = "github:eboskma/caddy-with-plugins";
inputs = {

74
machines/mimir/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ nixos-hardware, microvm, ... }:
{ nixos-hardware, microvm, nix-ld-rs, ... }:
{ pkgs, config, ... }:
{
imports =
@ -15,7 +15,7 @@
microvm.nixosModules.host
./outline.nix
# ./outline.nix
../../users/erwin
../../users/root
@ -68,9 +68,9 @@
};
input = {
"1241:662:USB-HID_Keyboard" = {
xkb_layout = "us,us";
xkb_variant = "colemak,";
xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps,grp:sclk_toggle,grp_led:scroll";
xkb_layout = "us";
xkb_variant = "";
xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps";
xkb_numlock = "enabled";
};
"1133:49257:Logitech_USB_Laser_Mouse" = {
@ -80,7 +80,7 @@
};
};
kanata = {
enable = false;
enable = true;
devices = [
"/dev/input/by-id/usb-04d9_USB-HID_Keyboard-event-kbd"
];
@ -284,6 +284,62 @@
# programs.ssh.startAgent = true;
programs = {
gnome-disks.enable = true;
nix-ld = {
enable = true;
package = nix-ld-rs.packages.${pkgs.hostPlatform.system}.nix-ld-rs;
libraries = with pkgs; [
alsa-lib
at-spi2-atk
at-spi2-core
atk
cairo
cups
curl
dbus
expat
fontconfig
freetype
fuse3
gdk-pixbuf
glib
gtk3
icu
libGL
libappindicator-gtk3
libdrm
libglvnd
libnotify
libpulseaudio
libunwind
libusb1
libuuid
libxkbcommon
mesa
nspr
nss
openssl
pango
pipewire
stdenv.cc.cc
systemd
vulkan-loader
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxcb
xorg.libxkbfile
xorg.libxshmfence
zlib
];
};
};
services = {
@ -350,9 +406,9 @@
defaultSopsFile = ./secrets.yaml;
secrets = {
outline-keycloak-secret = {
owner = "outline";
};
# outline-keycloak-secret = {
# owner = "outline";
# };
};
};

11
users/erwin/work.nix
View file

@ -250,6 +250,7 @@ in
nordzy-cursor-theme
pamedia
pass
podman-desktop
quintom-cursor-theme
procs
qgis
@ -365,6 +366,16 @@ in
};
services = {
livebook = {
enableUserService = true;
environmentFile = pkgs.writeText "livebook-env" ''
LIVEBOOK_TOKEN_ENABLED=false
LIVEBOOK_IDENTITY_PROVIDER=tailscale:/run/tailscale/tailscaled.sock
LIVEBOOK_AWS_CREDENTIALS=true
'';
address = "100.119.162.110";
};
teamviewer.enable = true;
udev.packages = with pkgs; [