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

Compare commits

base: pim:573a8cc407c10c50d9eac2301f9a32dfbfc4add8
Branches Tags
pim:master
pim:jellyseerr-test
pim:hyprland
pim:vuescan
..
compare: pim:08b0fbcd0c63af6c96302b0740e816432acc0014
Branches Tags
pim:master
pim:jellyseerr-test
pim:hyprland
pim:vuescan

No commits in common. "573a8cc407c10c50d9eac2301f9a32dfbfc4add8" and "08b0fbcd0c63af6c96302b0740e816432acc0014" have entirely different histories.
573a8cc407 ... 08b0fbcd0c

19 changed files with 350 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

37
flake.lock generated
View file

@ -549,22 +549,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1726871744,
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1729855863, "lastModified": 1729855863,
@ -624,8 +608,7 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix"
"treefmt-nix": "treefmt-nix"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -738,24 +721,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1729613947,
"narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "aac86347fb5063960eccb19493e0cadcdb4205ca",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

86
flake.nix
View file

@ -7,7 +7,6 @@
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
stylix.url = "github:pizzapim/stylix/release-24.05"; stylix.url = "github:pizzapim/stylix/release-24.05";
treefmt-nix.url = "github:numtide/treefmt-nix";
nix-index-database = { nix-index-database = {
url = "github:nix-community/nix-index-database"; url = "github:nix-community/nix-index-database";
@ -47,33 +46,13 @@
}; };
}; };
outputs = { outputs =
self, { self
nixpkgs, , nixpkgs
... , ...
} @ inputs: let }@inputs:
supportedSystems = [ let
"x86_64-linux" mkNixosSystem = {extraModule, nixpkgs' ? nixpkgs, useDefaultConfiguration ? true}: nixpkgs'.lib.nixosSystem rec {
"i686-linux"
"aarch64-linux"
];
forAllSystems' = nixpkgs.lib.genAttrs;
forAllSystems = forAllSystems' supportedSystems;
pkgsForSystem = system:
import nixpkgs {
inherit system;
};
treefmtEval = forAllSystems (
system: inputs.treefmt-nix.lib.evalModule (pkgsForSystem system) ./treefmt.nix
);
mkNixosSystem = {
extraModule,
nixpkgs' ? nixpkgs,
useDefaultConfiguration ? true,
}:
nixpkgs'.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
@ -81,22 +60,14 @@
flake = self; flake = self;
}; };
modules = modules = [
[
extraModule extraModule
] ] ++ nixpkgs'.lib.optional useDefaultConfiguration ./nixos;
++ nixpkgs'.lib.optional useDefaultConfiguration ./nixos;
}; };
in { in
formatter = forAllSystems (system: (treefmtEval.${system}.config.build.wrapper)); {
nixosConfigurations = { nixosConfigurations = {
x260 = mkNixosSystem { x260 = mkNixosSystem { extraModule = ({ pkgs, lib, ... }: {
extraModule = {
pkgs,
lib,
...
}: {
imports = [ inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260 ]; imports = [ inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260 ];
config = { config = {
@ -116,21 +87,17 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "rtsx_pci_sdmmc" ];
}; };
}; });
}; };
x201 = mkNixosSystem { x201 = mkNixosSystem {extraModule = ({ pkgs, lib, ... }: {
extraModule = {
pkgs,
lib,
...
}: {
imports = [ inputs.disko.nixosModules.disko ]; imports = [ inputs.disko.nixosModules.disko ];
config = { config = {
networking.hostName = "x201"; networking.hostName = "x201";
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" ]; boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" ];
disko.devices = { disko.devices = {
disk = { disk = {
sda = { sda = {
@ -181,12 +148,12 @@
}; };
}; };
}; };
}; });
}; };
sue-cosmic = mkNixosSystem { sue-cosmic = mkNixosSystem {
useDefaultConfiguration = false; useDefaultConfiguration = false;
extraModule = {...}: { extraModule = ({ ... }: {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.dell-xps-13-9310 inputs.nixos-hardware.nixosModules.dell-xps-13-9310
inputs.nixos-cosmic.nixosModules.default inputs.nixos-cosmic.nixosModules.default
@ -215,12 +182,14 @@
swapDevices = [{ device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b"; }]; swapDevices = [{ device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b"; }];
fileSystems = { fileSystems = {
"/" = { "/" =
{
device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a"; device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a";
fsType = "ext4"; fsType = "ext4";
}; };
"/boot" = { "/boot" =
{
device = "/dev/disk/by-uuid/560E-F8A2"; device = "/dev/disk/by-uuid/560E-F8A2";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
@ -230,11 +199,10 @@
boot.initrd.luks.devices."luks-8ffd3129-4908-4209-98c4-4eb68a35c494".device = "/dev/disk/by-uuid/8ffd3129-4908-4209-98c4-4eb68a35c494"; 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" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" ];
}; };
}; });
}; };
sue = mkNixosSystem { sue = mkNixosSystem {extraModule = ({ ... }: {
extraModule = {...}: {
imports = [ inputs.nixos-hardware.nixosModules.dell-xps-13-9310 ]; imports = [ inputs.nixos-hardware.nixosModules.dell-xps-13-9310 ];
config = { config = {
@ -242,12 +210,14 @@
networking.hostName = "xps-9315"; networking.hostName = "xps-9315";
swapDevices = [{ device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b"; }]; swapDevices = [{ device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b"; }];
fileSystems = { fileSystems = {
"/" = { "/" =
{
device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a"; device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a";
fsType = "ext4"; fsType = "ext4";
}; };
"/boot" = { "/boot" =
{
device = "/dev/disk/by-uuid/560E-F8A2"; device = "/dev/disk/by-uuid/560E-F8A2";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
@ -267,7 +237,7 @@
# platform = "ipu6ep"; # platform = "ipu6ep";
# }; # };
}; };
}; });
}; };
}; };
}; };

24
home-manager/default.nix
View file

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

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

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

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

@ -1,15 +1,8 @@
pkgs: lib: let pkgs: lib:
let
# Stolen from: https://github.com/nix-community/nur-combined/blob/master/repos/rycee/pkgs/firefox-addons/default.nix # Stolen from: https://github.com/nix-community/nur-combined/blob/master/repos/rycee/pkgs/firefox-addons/default.nix
buildFirefoxXpiAddon = lib.makeOverridable ({ buildFirefoxXpiAddon = lib.makeOverridable ({ stdenv ? pkgs.stdenv
stdenv ? pkgs.stdenv, , fetchurl ? pkgs.fetchurl, pname, version, addonId, url, sha256, meta, ...
fetchurl ? pkgs.fetchurl,
pname,
version,
addonId,
url,
sha256,
meta,
...
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -32,11 +25,13 @@ in {
pname = "http-version-indicator"; pname = "http-version-indicator";
version = "3.2.1"; version = "3.2.1";
addonId = "spdyindicator@chengsun.github.com"; 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"; sha256 = "be9518017334ce502a1da514542c2ca4f974217d0c8e6c7c31d518aba57c09a8";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/bsiegel/http-version-indicator"; 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" ]; mozPermissions = [ "<all_urls>" "tabs" "webNavigation" "webRequest" ];
platforms = platforms.all; platforms = platforms.all;
}; };
@ -45,11 +40,13 @@ in {
pname = "indicatetls"; pname = "indicatetls";
version = "0.3.0"; version = "0.3.0";
addonId = "{252ee273-8c8d-4609-b54d-62ae345be0a1}"; 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"; sha256 = "7a3b7edb1085f7b15d279c1013fac1d68f5247cfd6312d5275cb053e24a79465";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/jannispinter/indicatetls"; 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; license = licenses.mpl20;
mozPermissions = [ mozPermissions = [
"tabs" "tabs"
@ -66,11 +63,13 @@ in {
pname = "sixindicator"; pname = "sixindicator";
version = "1.3.0"; version = "1.3.0";
addonId = "{8c9cad02-c069-4e93-909d-d874da819c49}"; 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"; sha256 = "415ab83ed4ac94d1efe114752a09df29536d1bd54cc9b7e5ce5d9ee55a84226d";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/HostedDinner/SixIndicator"; 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; license = licenses.mit;
mozPermissions = [ "tabs" "webRequest" "<all_urls>" ]; mozPermissions = [ "tabs" "webRequest" "<all_urls>" ];
platforms = platforms.all; platforms = platforms.all;
@ -80,7 +79,8 @@ in {
pname = "simple-style-fox-2"; pname = "simple-style-fox-2";
version = "10.0"; version = "10.0";
addonId = "{317526c6-ff2b-49c9-822e-d77b4a3da1d1}"; 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"; sha256 = "1aaac3ba08d21086d7087015f92a27661940df45a97bf5680588c883f799a97d";
meta = with lib; { meta = with lib; {
description = "Simple style fox 2"; description = "Simple style fox 2";

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

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

8
home-manager/gnome.nix
View file

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

6
home-manager/vscode.nix
View file

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

13
nixos/default.nix
View file

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

12
nixos/gnome.nix
View file

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

7
nixos/lanzaboote.nix
View file

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

7
nixos/sops.nix
View file

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

6
nixos/stylix.nix
View file

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

18
nixos/wireguard.nix
View file

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

4
treefmt.nix
View file

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