pim/nixos-laptop
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Format repo

Browse source
This commit is contained in:
Pim Kunis 2024-10-26 20:33:47 +02:00
parent db14de3471
commit 573a8cc407
18 changed files with 447 additions and 380 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
flake.nix
View file

@ -47,12 +47,11 @@
};
};
outputs =
{ self
, nixpkgs
, ...
}@inputs:
let
outputs = {
self,
nixpkgs,
...
} @ inputs: let
supportedSystems = [
"x86_64-linux"
"i686-linux"
@ -60,8 +59,7 @@
];
forAllSystems' = nixpkgs.lib.genAttrs;
forAllSystems = forAllSystems' supportedSystems;
pkgsForSystem =
system:
pkgsForSystem = system:
import nixpkgs {
inherit system;
};
@ -70,7 +68,12 @@
system: inputs.treefmt-nix.lib.evalModule (pkgsForSystem system) ./treefmt.nix
);
mkNixosSystem = {extraModule, nixpkgs' ? nixpkgs, useDefaultConfiguration ? true}: nixpkgs'.lib.nixosSystem rec {
mkNixosSystem = {
extraModule,
nixpkgs' ? nixpkgs,
useDefaultConfiguration ? true,
}:
nixpkgs'.lib.nixosSystem rec {
system = "x86_64-linux";
specialArgs = {
@ -78,16 +81,22 @@
flake = self;
};
modules = [
modules =
[
extraModule
] ++ nixpkgs'.lib.optional useDefaultConfiguration ./nixos;
]
++ nixpkgs'.lib.optional useDefaultConfiguration ./nixos;
};
in
{
in {
formatter = forAllSystems (system: (treefmtEval.${system}.config.build.wrapper));
nixosConfigurations = {
x260 = mkNixosSystem { extraModule = ({ pkgs, lib, ... }: {
x260 = mkNixosSystem {
extraModule = {
pkgs,
lib,
...
}: {
imports = [inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260];
config = {
@ -107,17 +116,21 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "rtsx_pci_sdmmc"];
};
});
};
};
x201 = mkNixosSystem {extraModule = ({ pkgs, lib, ... }: {
x201 = mkNixosSystem {
extraModule = {
pkgs,
lib,
...
}: {
imports = [inputs.disko.nixosModules.disko];
config = {
networking.hostName = "x201";
boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage"];
disko.devices = {
disk = {
sda = {
@ -168,12 +181,12 @@
};
};
};
});
};
};
sue-cosmic = mkNixosSystem {
useDefaultConfiguration = false;
extraModule = ({ ... }: {
extraModule = {...}: {
imports = [
inputs.nixos-hardware.nixosModules.dell-xps-13-9310
inputs.nixos-cosmic.nixosModules.default
@ -202,14 +215,12 @@
swapDevices = [{device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b";}];
fileSystems = {
"/" =
{
"/" = {
device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a";
fsType = "ext4";
};
"/boot" =
{
"/boot" = {
device = "/dev/disk/by-uuid/560E-F8A2";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
@ -219,10 +230,11 @@
boot.initrd.luks.devices."luks-8ffd3129-4908-4209-98c4-4eb68a35c494".device = "/dev/disk/by-uuid/8ffd3129-4908-4209-98c4-4eb68a35c494";
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage"];
};
});
};
};
sue = mkNixosSystem {extraModule = ({ ... }: {
sue = mkNixosSystem {
extraModule = {...}: {
imports = [inputs.nixos-hardware.nixosModules.dell-xps-13-9310];
config = {
@ -230,14 +242,12 @@
networking.hostName = "xps-9315";
swapDevices = [{device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b";}];
fileSystems = {
"/" =
{
"/" = {
device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a";
fsType = "ext4";
};
"/boot" =
{
"/boot" = {
device = "/dev/disk/by-uuid/560E-F8A2";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
@ -257,7 +267,7 @@
# platform = "ipu6ep";
# };
};
});
};
};
};
};

24
home-manager/default.nix
View file

@ -1,4 +1,11 @@
{ pkgs, lib, config, inputs, flake, ... }: {
{
pkgs,
lib,
config,
inputs,
flake,
...
}: {
imports = [
./neovim
./firefox
@ -17,8 +24,7 @@
mimeApps = {
enable = true;
defaultApplications =
let
defaultApplications = let
applications = {
telegram = {
mimeApp = "org.telegram.desktop.desktop";
@ -71,7 +77,11 @@
};
};
mimeTypesForApp = { mimeApp, mimeTypes }: map
mimeTypesForApp = {
mimeApp,
mimeTypes,
}:
map
(
mimeType: {"${mimeType}" = mimeApp;}
)
@ -86,10 +96,12 @@
homeDirectory = "/home/pim";
stateVersion = "23.05";
packages = (with pkgs; [
packages =
(with pkgs; [
jellyfin-media-player
virt-manager
]) ++ (with pkgs.unstable; [
])
++ (with pkgs.unstable; [
attic-client
dbeaver-bin
devenv

3
home-manager/firefox/addons.nix
View file

@ -1,5 +1,4 @@
pkgs: lib:
let
pkgs: lib: let
rycee-addons = pkgs.nur.repos.rycee.firefox-addons;
custom-addons = import ./custom-addons.nix pkgs lib;
in

36
home-manager/firefox/custom-addons.nix
View file

@ -1,8 +1,15 @@
pkgs: lib:
let
pkgs: lib: let
# Stolen from: https://github.com/nix-community/nur-combined/blob/master/repos/rycee/pkgs/firefox-addons/default.nix
buildFirefoxXpiAddon = lib.makeOverridable ({ stdenv ? pkgs.stdenv
, fetchurl ? pkgs.fetchurl, pname, version, addonId, url, sha256, meta, ...
buildFirefoxXpiAddon = lib.makeOverridable ({
stdenv ? pkgs.stdenv,
fetchurl ? pkgs.fetchurl,
pname,
version,
addonId,
url,
sha256,
meta,
...
}:
stdenv.mkDerivation {
name = "${pname}-${version}";
@ -25,13 +32,11 @@ in {
pname = "http-version-indicator";
version = "3.2.1";
addonId = "spdyindicator@chengsun.github.com";
url =
"https://addons.mozilla.org/firefox/downloads/file/3767224/http2_indicator-3.2.1.xpi";
url = "https://addons.mozilla.org/firefox/downloads/file/3767224/http2_indicator-3.2.1.xpi";
sha256 = "be9518017334ce502a1da514542c2ca4f974217d0c8e6c7c31d518aba57c09a8";
meta = with lib; {
homepage = "https://github.com/bsiegel/http-version-indicator";
description =
"An indicator showing the HTTP version used to load the page in the address bar.";
description = "An indicator showing the HTTP version used to load the page in the address bar.";
mozPermissions = ["<all_urls>" "tabs" "webNavigation" "webRequest"];
platforms = platforms.all;
};
@ -40,13 +45,11 @@ in {
pname = "indicatetls";
version = "0.3.0";
addonId = "{252ee273-8c8d-4609-b54d-62ae345be0a1}";
url =
"https://addons.mozilla.org/firefox/downloads/file/3608595/indicatetls-0.3.0.xpi";
url = "https://addons.mozilla.org/firefox/downloads/file/3608595/indicatetls-0.3.0.xpi";
sha256 = "7a3b7edb1085f7b15d279c1013fac1d68f5247cfd6312d5275cb053e24a79465";
meta = with lib; {
homepage = "https://github.com/jannispinter/indicatetls";
description =
"Displays negotiated SSL/TLS protocol version and additional security information in the address bar";
description = "Displays negotiated SSL/TLS protocol version and additional security information in the address bar";
license = licenses.mpl20;
mozPermissions = [
"tabs"
@ -63,13 +66,11 @@ in {
pname = "sixindicator";
version = "1.3.0";
addonId = "{8c9cad02-c069-4e93-909d-d874da819c49}";
url =
"https://addons.mozilla.org/firefox/downloads/file/3493442/sixindicator-1.3.0.xpi";
url = "https://addons.mozilla.org/firefox/downloads/file/3493442/sixindicator-1.3.0.xpi";
sha256 = "415ab83ed4ac94d1efe114752a09df29536d1bd54cc9b7e5ce5d9ee55a84226d";
meta = with lib; {
homepage = "https://github.com/HostedDinner/SixIndicator";
description =
"Shows a simple icon, if IPv6 or IPv4 was used for the request of the site. When clicking on the icon, more information is shown, like the number of requests per domain and if these requests were made via IPv6 or IPv4.";
description = "Shows a simple icon, if IPv6 or IPv4 was used for the request of the site. When clicking on the icon, more information is shown, like the number of requests per domain and if these requests were made via IPv6 or IPv4.";
license = licenses.mit;
mozPermissions = ["tabs" "webRequest" "<all_urls>"];
platforms = platforms.all;
@ -79,8 +80,7 @@ in {
pname = "simple-style-fox-2";
version = "10.0";
addonId = "{317526c6-ff2b-49c9-822e-d77b4a3da1d1}";
url =
"https://addons.mozilla.org/firefox/downloads/file/3934220/simple_style_fox_2-10.0.xpi";
url = "https://addons.mozilla.org/firefox/downloads/file/3934220/simple_style_fox_2-10.0.xpi";
sha256 = "1aaac3ba08d21086d7087015f92a27661940df45a97bf5680588c883f799a97d";
meta = with lib; {
description = "Simple style fox 2";

10
home-manager/firefox/default.nix
View file

@ -1,5 +1,8 @@
{ pkgs, lib, ... }:
let
{
pkgs,
lib,
...
}: let
firefoxAddons = import ./addons.nix pkgs lib;
firefoxSettings = {
"browser.aboutConfig.showWarning" = false;
@ -14,8 +17,7 @@ let
"browser.newtabpage.activity-stream.showSponsored" = false;
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
};
in
{
in {
config = {
programs.firefox = {
enable = true;

8
home-manager/gnome.nix
View file

@ -1,4 +1,10 @@
{ pkgs, lib, flake, config, ... }: {
{
pkgs,
lib,
flake,
config,
...
}: {
home.packages = with pkgs; [gnome.gnome-tweaks];
dconf.settings = with lib.hm.gvariant; {

6
home-manager/vscode.nix
View file

@ -1,4 +1,8 @@
{ pkgs, lib, ... }: {
{
pkgs,
lib,
...
}: {
programs.vscode = {
enable = true;
package = pkgs.vscodium;

13
nixos/default.nix
View file

@ -1,4 +1,12 @@
{ pkgs, config, lib, inputs, flake, system, ... }: {
{
pkgs,
config,
lib,
inputs,
flake,
system,
...
}: {
imports = [
inputs.home-manager.nixosModules.home-manager
./lanzaboote.nix
@ -122,7 +130,8 @@
hostPlatform = lib.mkDefault "x86_64-linux";
config = {
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"libfprint-2-tod1-goodix"
];
};

12
nixos/gnome.nix
View file

@ -2,21 +2,25 @@
services.xserver.desktopManager.gnome.enable = true;
environment = {
systemPackages = [
systemPackages =
[
pkgs.gnome.gnome-shell-extensions
] ++ (with pkgs.gnomeExtensions; [
]
++ (with pkgs.gnomeExtensions; [
pop-shell
window-is-ready-remover
random-wallpaper
workspaces-indicator-by-open-apps
]);
gnome.excludePackages = (with pkgs; [
gnome.excludePackages =
(with pkgs; [
epiphany
gnome-connections
gnome-console
gnome-tour
]) ++ (with pkgs.gnome; [
])
++ (with pkgs.gnome; [
geary
gnome-calendar
gnome-clocks

7
nixos/lanzaboote.nix
View file

@ -1,4 +1,9 @@
{ config, lib, inputs, ... }: {
{
config,
lib,
inputs,
...
}: {
imports = [
inputs.lanzaboote.nixosModules.lanzaboote
];

7
nixos/sops.nix
View file

@ -1,4 +1,9 @@
{ inputs, pkgs, flake, ... }: {
{
inputs,
pkgs,
flake,
...
}: {
imports = [inputs.sops-nix.nixosModules.sops];
environment.systemPackages = with pkgs; [sops];

6
nixos/stylix.nix
View file

@ -1,4 +1,8 @@
{ pkgs, inputs, ... }: {
{
pkgs,
inputs,
...
}: {
imports = [inputs.stylix.nixosModules.stylix];
stylix = {

18
nixos/wireguard.nix
View file

@ -1,4 +1,8 @@
{ lib, config, ... }: {
{
lib,
config,
...
}: {
networking = {
useDHCP = lib.mkDefault true;
networkmanager.unmanaged = ["tailscale0"];
@ -10,12 +14,14 @@
dns = ["192.168.30.131"];
autostart = false;
mtu = 1412;
peers = [{
peers = [
{
presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;
endpoint = "wg.kun.is:51820";
publicKey = "fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg=";
allowedIPs = ["0.0.0.0/0"];
}];
}
];
};
home-no-pihole = {
@ -24,12 +30,14 @@
dns = ["192.168.10.1"];
autostart = false;
mtu = 1412;
peers = [{
peers = [
{
presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;
endpoint = "wg.kun.is:51820";
publicKey = "fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg=";
allowedIPs = ["0.0.0.0/0"];
}];
}
];
};
};
};

3
treefmt.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
projectRootFile = "flake.nix";
programs.alejandra.enable = true;
}