Compare commits

...

7 Commits

Author SHA1 Message Date
b95801a563 Pin kernel to 6.10 until nvidia-open is fixed
Some checks failed
pre-commit / pre-commit (push) Has been cancelled
2024-09-21 02:40:14 +02:00
8c794088eb flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/d2493de5cd1da06b6a4c3e97f4e7d5dd791df457' (2024-09-17)
  → 'github:nix-community/home-manager/dfe4d334b172071e7189d971ddecd3a7f811b48d' (2024-09-20)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172' (2024-09-16)
  → 'github:nixos/nixpkgs/c04d5652cfa9742b1d519688f65d1bbccea9eb7e' (2024-09-19)
• Updated input 'nixpkgs-master':
    'github:nixos/nixpkgs/50f316a5839917fecf287fb042d4437f5c107997' (2024-09-18)
  → 'github:nixos/nixpkgs/415a29abac3b341a51277f72de7a04a6f9493c4d' (2024-09-20)
2024-09-20 23:48:35 +02:00
83e91c7fd9 Add torjus to podman group 2024-09-18 21:00:00 +02:00
1ec09ff801 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff' (2024-09-15)
  → 'github:nix-community/home-manager/d2493de5cd1da06b6a4c3e97f4e7d5dd791df457' (2024-09-17)
• Updated input 'nixpkgs-master':
    'github:nixos/nixpkgs/d46fb640fa59fdcaabfb07ed33e91f78ee3562bb' (2024-09-17)
  → 'github:nixos/nixpkgs/50f316a5839917fecf287fb042d4437f5c107997' (2024-09-18)
2024-09-18 20:58:51 +02:00
1171ce89af Change ssh config 2024-09-17 09:58:38 +02:00
26a49133e3 Use python vscode ext from unstable 2024-09-17 09:46:49 +02:00
27cb8551b6 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
  → 'github:nixos/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172' (2024-09-16)
• Updated input 'nixpkgs-master':
    'github:nixos/nixpkgs/da56df9400568dabba6d61ea876714bf2ac3b1fb' (2024-09-16)
  → 'github:nixos/nixpkgs/d46fb640fa59fdcaabfb07ed33e91f78ee3562bb' (2024-09-17)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/f30b1bac192e2dc252107ac8a59a03ad25e1b96e' (2024-09-13)
  → 'github:Mic92/sops-nix/e2d404a7ea599a013189aa42947f66cede0645c8' (2024-09-16)
2024-09-17 09:34:23 +02:00
5 changed files with 32 additions and 33 deletions

View File

@ -64,11 +64,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726440980, "lastModified": 1726863345,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "narHash": "sha256-fjbKe1/UJpLT6tQLAKJ/djJFdnmAh2kkdsgmylyFrQA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "rev": "dfe4d334b172071e7189d971ddecd3a7f811b48d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +145,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1726755586,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,11 +161,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1726506601, "lastModified": 1726868369,
"narHash": "sha256-LBoR/KKjvBaogzaB+PI+D2RAAC56S1JolKOfvExHk0c=", "narHash": "sha256-0twbCLjLTQLaodKUnMyUbLVZpzOd9Mq7jxafMx3xq+A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da56df9400568dabba6d61ea876714bf2ac3b1fb", "rev": "415a29abac3b341a51277f72de7a04a6f9493c4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,11 +266,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1726218807, "lastModified": 1726524647,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -4,19 +4,14 @@
enable = true; enable = true;
enableUpdateCheck = true; enableUpdateCheck = true;
enableExtensionUpdateCheck = true; enableExtensionUpdateCheck = true;
extensions = extensions = with pkgs.vscode-extensions; [
with pkgs.vscode-extensions;
[
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc-icons
golang.go golang.go
vscodevim.vim vscodevim.vim
# ms-python.python ms-python.python
ms-vscode-remote.remote-ssh ms-vscode-remote.remote-ssh
bbenoist.nix bbenoist.nix
]
++ [
(lib.warn "Using vscode-extensions.ms-python.python from nixpkgs master!" pkgs.master.vscode-extensions.ms-python.python)
]; ];
userSettings = { userSettings = {
"window.titleBarStyle" = "custom"; "window.titleBarStyle" = "custom";

View File

@ -1,4 +1,9 @@
{ pkgs, lib, ... }: {
pkgs,
lib,
osConfig,
...
}:
let let
eduroam-active = pkgs.writeShellApplication { eduroam-active = pkgs.writeShellApplication {
name = "eduroam-active"; name = "eduroam-active";
@ -15,7 +20,7 @@ in
enable = true; enable = true;
controlMaster = "auto"; controlMaster = "auto";
matchBlocks = { matchBlocks = lib.mkIf (osConfig.system.name == "magicman") {
"bmo.uio.no-on-eduroam" = lib.hm.dag.entryBefore [ "bmo.uio.no" ] { "bmo.uio.no-on-eduroam" = lib.hm.dag.entryBefore [ "bmo.uio.no" ] {
match = "host bmo.uio.no exec \"nmcli -g GENERAL.STATE c s eduroam|grep -q -E '\\bactiv'\""; match = "host bmo.uio.no exec \"nmcli -g GENERAL.STATE c s eduroam|grep -q -E '\\bactiv'\"";
hostname = "bmo.uio.no"; hostname = "bmo.uio.no";

View File

@ -25,17 +25,15 @@
boot = { boot = {
# Kernel stuff # Kernel stuff
# kernelPackages = pkgs.linuxPackages_xanmod_latest; # kernelPackages = pkgs.linuxPackages_xanmod_latest;
kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = lib.warn "Pinned to kernel 6.10 due to nvidia fbdev trouble!" pkgs.linuxPackages_6_10;
kernelParams = [ kernelParams = [
"quiet" "quiet"
"splash" "splash"
"rd.systemd.show_status=false" "rd.systemd.show_status=false"
"nvidia-drm.modeset=1"
"nvidia-drm.fbdev=1"
]; ];
extraModprobeConfig = '' extraModprobeConfig = ''
options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
''; '';
@ -78,7 +76,7 @@
open = true; open = true;
nvidiaSettings = false; nvidiaSettings = false;
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.latest;
# package = config.boot.kernelPackages.nvidiaPackages.mkDriver { # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
# version = "560.28.03"; # version = "560.28.03";
# sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y="; # sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";

View File

@ -19,6 +19,7 @@
"video" "video"
"gamemode" "gamemode"
"libvirtd" "libvirtd"
"podman"
]; ];
# Install some user packages # Install some user packages
packages = with pkgs; [ ]; packages = with pkgs; [ ];