torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Compare commits

base: torjus:b95801a563f88c7a3d182caa2451ca48eff530b1
Branches Tags
torjus:master
torjus:temp-small
..
compare: torjus:f5fe230dfec0d7b74235af1a3bf7ce3f4fa58fae
Branches Tags
torjus:master
torjus:temp-small

No commits in common. "b95801a563f88c7a3d182caa2451ca48eff530b1" and "f5fe230dfec0d7b74235af1a3bf7ce3f4fa58fae" have entirely different histories.
b95801a563 ... f5fe230dfe

5 changed files with 33 additions and 32 deletions
Show Stats Expand all files Collapse all files

24
flake.lock
View File

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

9
home/programs/vscode/default.nix
View File

@ -4,14 +4,19 @@
enable = true; enable = true;
enableUpdateCheck = true; enableUpdateCheck = true;
enableExtensionUpdateCheck = true; enableExtensionUpdateCheck = true;
extensions = with pkgs.vscode-extensions; [ 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";

9
home/ssh/config.nix
View File

@ -1,9 +1,4 @@
{ { pkgs, lib, ... }:
pkgs,
lib,
osConfig,
...
}:
let let
eduroam-active = pkgs.writeShellApplication { eduroam-active = pkgs.writeShellApplication {
name = "eduroam-active"; name = "eduroam-active";
@ -20,7 +15,7 @@ in
enable = true; enable = true;
controlMaster = "auto"; controlMaster = "auto";
matchBlocks = lib.mkIf (osConfig.system.name == "magicman") { matchBlocks = {
"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";

8
hosts/gunter/configuration.nix
View File

@ -25,15 +25,17 @@
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"
''; '';
@ -76,7 +78,7 @@
open = true; open = true;
nvidiaSettings = false; nvidiaSettings = false;
package = config.boot.kernelPackages.nvidiaPackages.latest; package = config.boot.kernelPackages.nvidiaPackages.beta;
# 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=";

1
system/users.nix
View File

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