Compare commits
	
		
			7 Commits
		
	
	
		
			f5fe230dfe
			...
			b95801a563
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| b95801a563 | |||
| 8c794088eb | |||
| 83e91c7fd9 | |||
| 1ec09ff801 | |||
| 1171ce89af | |||
| 26a49133e3 | |||
| 27cb8551b6 | 
							
								
								
									
										24
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										24
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -64,11 +64,11 @@
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1726440980,
 | 
			
		||||
        "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
 | 
			
		||||
        "lastModified": 1726863345,
 | 
			
		||||
        "narHash": "sha256-fjbKe1/UJpLT6tQLAKJ/djJFdnmAh2kkdsgmylyFrQA=",
 | 
			
		||||
        "owner": "nix-community",
 | 
			
		||||
        "repo": "home-manager",
 | 
			
		||||
        "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
 | 
			
		||||
        "rev": "dfe4d334b172071e7189d971ddecd3a7f811b48d",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -145,11 +145,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1726243404,
 | 
			
		||||
        "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
 | 
			
		||||
        "lastModified": 1726755586,
 | 
			
		||||
        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
 | 
			
		||||
        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -161,11 +161,11 @@
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs-master": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1726506601,
 | 
			
		||||
        "narHash": "sha256-LBoR/KKjvBaogzaB+PI+D2RAAC56S1JolKOfvExHk0c=",
 | 
			
		||||
        "lastModified": 1726868369,
 | 
			
		||||
        "narHash": "sha256-0twbCLjLTQLaodKUnMyUbLVZpzOd9Mq7jxafMx3xq+A=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "da56df9400568dabba6d61ea876714bf2ac3b1fb",
 | 
			
		||||
        "rev": "415a29abac3b341a51277f72de7a04a6f9493c4d",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
@@ -266,11 +266,11 @@
 | 
			
		||||
        "nixpkgs-stable": "nixpkgs-stable_2"
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1726218807,
 | 
			
		||||
        "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
 | 
			
		||||
        "lastModified": 1726524647,
 | 
			
		||||
        "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
 | 
			
		||||
        "owner": "Mic92",
 | 
			
		||||
        "repo": "sops-nix",
 | 
			
		||||
        "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
 | 
			
		||||
        "rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
 
 | 
			
		||||
@@ -4,20 +4,15 @@
 | 
			
		||||
    enable = true;
 | 
			
		||||
    enableUpdateCheck = true;
 | 
			
		||||
    enableExtensionUpdateCheck = true;
 | 
			
		||||
    extensions =
 | 
			
		||||
      with pkgs.vscode-extensions;
 | 
			
		||||
      [
 | 
			
		||||
        catppuccin.catppuccin-vsc
 | 
			
		||||
        catppuccin.catppuccin-vsc-icons
 | 
			
		||||
        golang.go
 | 
			
		||||
        vscodevim.vim
 | 
			
		||||
        # ms-python.python
 | 
			
		||||
        ms-vscode-remote.remote-ssh
 | 
			
		||||
        bbenoist.nix
 | 
			
		||||
      ]
 | 
			
		||||
      ++ [
 | 
			
		||||
        (lib.warn "Using vscode-extensions.ms-python.python from nixpkgs master!" pkgs.master.vscode-extensions.ms-python.python)
 | 
			
		||||
      ];
 | 
			
		||||
    extensions = with pkgs.vscode-extensions; [
 | 
			
		||||
      catppuccin.catppuccin-vsc
 | 
			
		||||
      catppuccin.catppuccin-vsc-icons
 | 
			
		||||
      golang.go
 | 
			
		||||
      vscodevim.vim
 | 
			
		||||
      ms-python.python
 | 
			
		||||
      ms-vscode-remote.remote-ssh
 | 
			
		||||
      bbenoist.nix
 | 
			
		||||
    ];
 | 
			
		||||
    userSettings = {
 | 
			
		||||
      "window.titleBarStyle" = "custom";
 | 
			
		||||
    };
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,9 @@
 | 
			
		||||
{ pkgs, lib, ... }:
 | 
			
		||||
{
 | 
			
		||||
  pkgs,
 | 
			
		||||
  lib,
 | 
			
		||||
  osConfig,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
let
 | 
			
		||||
  eduroam-active = pkgs.writeShellApplication {
 | 
			
		||||
    name = "eduroam-active";
 | 
			
		||||
@@ -15,7 +20,7 @@ in
 | 
			
		||||
    enable = true;
 | 
			
		||||
    controlMaster = "auto";
 | 
			
		||||
 | 
			
		||||
    matchBlocks = {
 | 
			
		||||
    matchBlocks = lib.mkIf (osConfig.system.name == "magicman") {
 | 
			
		||||
      "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'\"";
 | 
			
		||||
        hostname = "bmo.uio.no";
 | 
			
		||||
 
 | 
			
		||||
@@ -25,17 +25,15 @@
 | 
			
		||||
  boot = {
 | 
			
		||||
    # Kernel stuff
 | 
			
		||||
    # 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 = [
 | 
			
		||||
      "quiet"
 | 
			
		||||
      "splash"
 | 
			
		||||
      "rd.systemd.show_status=false"
 | 
			
		||||
      "nvidia-drm.modeset=1"
 | 
			
		||||
      "nvidia-drm.fbdev=1"
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
    extraModprobeConfig = ''
 | 
			
		||||
      options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
 | 
			
		||||
      options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
 | 
			
		||||
    '';
 | 
			
		||||
 | 
			
		||||
@@ -78,7 +76,7 @@
 | 
			
		||||
    open = true;
 | 
			
		||||
    nvidiaSettings = false;
 | 
			
		||||
 | 
			
		||||
    package = config.boot.kernelPackages.nvidiaPackages.beta;
 | 
			
		||||
    package = config.boot.kernelPackages.nvidiaPackages.latest;
 | 
			
		||||
    # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
 | 
			
		||||
    #   version = "560.28.03";
 | 
			
		||||
    #   sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";
 | 
			
		||||
 
 | 
			
		||||
@@ -19,6 +19,7 @@
 | 
			
		||||
      "video"
 | 
			
		||||
      "gamemode"
 | 
			
		||||
      "libvirtd"
 | 
			
		||||
      "podman"
 | 
			
		||||
    ];
 | 
			
		||||
    # Install some user packages
 | 
			
		||||
    packages = with pkgs; [ ];
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user