Compare commits

..

No commits in common. "7b4e396685927335b23836756514677a0674942c" and "ddf23300b402cec3cc509310030b44ba524f4de8" have entirely different histories.

6 changed files with 35 additions and 141 deletions

View File

@ -51,11 +51,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766784396, "lastModified": 1764161084,
"narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=", "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55", "rev": "e95de00a471d07435e0527ff4db092c84998698e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1766887609, "lastModified": 1763863245,
"narHash": "sha256-tt47yr4LrqGTALQ1EdnyEOHTEitEKkAxxDKGc/qaO4E=", "narHash": "sha256-IkC0fWViM6JOpi0StwEUmOZ2M9BL2UhlGYBBD05kJo0=",
"owner": "larstvei", "owner": "larstvei",
"repo": "emacs-flake", "repo": "emacs-flake",
"rev": "7cb38675032ce0b2b4a29dee7c3882f9827001ad", "rev": "ec4bd967713f9358448584ce5e4f0ccd827ad694",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +108,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1766886699, "lastModified": 1763862392,
"narHash": "sha256-1EdnhtrnQxJ3o6mcC/Un5/vIQrt+SVb9kHqBwXDtRnw=", "narHash": "sha256-VbvSOxR+Z0humuRdgl18+TinK/ROaGfdigxqjCoWMHA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "f612ae2d33ade31b42d54cb6b68b29da81b1bc2d", "rev": "a68dfb0337d94e794addd3be77a16a2d4b54e370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +124,11 @@
"emacs-plus": { "emacs-plus": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1766759643, "lastModified": 1762005821,
"narHash": "sha256-r6fpcq+4LimIMfS+A/7oVJXBZmbi7gRxlplZQ77lHwE=", "narHash": "sha256-M24JpkYH7xdrm7Uine17wrmnpszfhCn9dBhw13Yt69Q=",
"owner": "d12frosted", "owner": "d12frosted",
"repo": "homebrew-emacs-plus", "repo": "homebrew-emacs-plus",
"rev": "cabd75f0effbaccb47d3250ee981d4c55e8e0fae", "rev": "89952793a1226de8b47dd6269806693713178b84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766881808, "lastModified": 1764361670,
"narHash": "sha256-JR7A2xS3EBPWFeONzhqez5vp7nKEsp7eLj2Ks210Srk=", "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d2e0458d6531885600b346e161c38790dc356fa8", "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,11 +201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765682243, "lastModified": 1762964643,
"narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "rev": "827f2a23373a774a8805f84ca5344654c31f354b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +294,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1766651565, "lastModified": 1763678758,
"narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,11 +310,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1766687554, "lastModified": 1763622513,
"narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=", "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136", "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,11 +326,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1766840161, "lastModified": 1763618868,
"narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,11 +358,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1766840161, "lastModified": 1764352606,
"narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", "narHash": "sha256-ZwPqcETKhoQ+TS40+hFr5CY4wzcNGKhi6l8w2HmmxKc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", "rev": "24e915b36ca87d32777d766da3a3f4e3ce22cc98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766897152, "lastModified": 1764390306,
"narHash": "sha256-mD1GDg1eIHYUwk536j4uJX1IfQArsLQm2SL7rTQwAPI=", "narHash": "sha256-UPkmgG/0lvo98UGDAqRBIVp6fDltjtkqmPSeVLTB8nA=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "fe8d1a61a904b336f453d7ab5ae7d691a21c5cbf", "rev": "22ade9265abd347d39b845af952be1e049cafe66",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -57,14 +57,5 @@
./machines/thinkpad ./machines/thinkpad
]; ];
}; };
nixosConfigurations.vm-aarch64 = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
specialArgs = { inherit inputs; };
modules = [
home-manager.nixosModules.default
./machines/vm-aarch64
];
};
}; };
} }

View File

@ -18,29 +18,6 @@
hyprlock.fprintAuth = true; hyprlock.fprintAuth = true;
}; };
systemd.services.disable-thinkpad-leds = {
description = "Disable ThinkPad lid logo LED and power button led";
wantedBy = [
"basic.target"
"suspend.target"
];
after = [
"hibernate.target"
"hybrid-sleep.target"
"suspend-then-hibernate.target"
"suspend.target"
"sysinit.target"
];
serviceConfig = {
Type = "oneshot";
ExecStart = [
"/bin/sh -c 'echo 0 > /sys/class/leds/tpacpi::power/brightness'"
"/bin/sh -c 'echo 0 > /sys/class/leds/tpacpi::lid_logo_dot/brightness'"
];
};
};
networking.hostName = "larstvei-think"; networking.hostName = "larstvei-think";
# Bootloader. # Bootloader.

View File

@ -1,20 +0,0 @@
{
imports = [
./hardware
../../modules/base
../../modules/nixos
];
home-manager.users.larstvei.imports = [
../../modules/home/minimal
../../modules/desktop
];
networking.hostName = "larstvei-vm";
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
system.stateVersion = "25.11";
}

View File

@ -1,47 +0,0 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"virtio_pci"
"usbhid"
"usb_storage"
"sr_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/43e64adc-66d8-4e08-ae34-3305b0c48899";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/CFA9-A100";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
};
swapDevices = [
{ device = "/dev/disk/by-uuid/0c07a011-252e-4c69-b6d0-0e1878debbbb"; }
];
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
}

View File

@ -1,21 +1,14 @@
{ { pkgs, inputs, ... }:
pkgs,
lib,
inputs,
...
}:
{ {
home.packages = [ home.packages = [
pkgs.adwaita-icon-theme pkgs.adwaita-icon-theme
pkgs.brightnessctl pkgs.brightnessctl
pkgs.grimblast pkgs.grimblast
pkgs.google-chrome
pkgs.pamixer pkgs.pamixer
pkgs.wl-clipboard pkgs.wl-clipboard
pkgs.wtype pkgs.wtype
]
++ lib.optionals (pkgs.stdenv.hostPlatform.isx86_64) [
pkgs.google-chrome
]; ];
imports = [ imports = [