6 Commits
9 changed files with 127 additions and 158 deletions
+3 -1
View File
@@ -2,11 +2,13 @@
pkgs, pkgs,
inputs, inputs,
... ...
}: { }:
{
imports = [ inputs.stylix.nixosModules.stylix ]; imports = [ inputs.stylix.nixosModules.stylix ];
stylix.enable = true; stylix.enable = true;
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
stylix.targets.gtksourceview.enable = false; # otherwise inkspace is recompiled every time
stylix.fonts = { stylix.fonts = {
serif = { serif = {
Generated
+43 -43
View File
@@ -105,11 +105,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1789404474, "lastModified": 1790635598,
"narHash": "sha256-UXFQ7tFiwn8sPz0EV4CBB2PCf/ZiGIHWn/6MXk81Lxs=", "narHash": "sha256-MHycJ+rm2wMrhiO6emgqJUaUbhJU/AvdH8DyUVrU1dw=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "e760371d631165e7d8de5b0dcf148e21ec4c16f0", "rev": "cf64c8cbadd9b13ea79ba7720aa2930500f2ece7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -340,11 +340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789267039, "lastModified": 1790996401,
"narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=", "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ec172013fa62135f58fb58dd17ae9651e8f39727", "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -463,11 +463,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789286446, "lastModified": 1791105314,
"narHash": "sha256-xVstyCdg0DpzjyrEacm72VJAIP9DMhfWJdPDzhWxHuo=", "narHash": "sha256-oTM7QFgRQ+vxBpMBMc7hEYpqBtpXAzXu2xuB/tru84U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "a74e173407559083a412ea89a1cc58ea389c3b65", "rev": "e740bc4e9d8918d7819a51486d5099930c65c72e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -538,11 +538,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1789752250, "lastModified": 1791128201,
"narHash": "sha256-q0J27mJDfd4BM9a7KcMVbcRmqyU+goQwudbMIu66qsg=", "narHash": "sha256-rlsYY/Dg/LhbIj51Aa6TLvRpZeb3KZgUTd7llQ5XcJE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b2d7d02644f0002535a3bb51a73780945cdc7ba4", "rev": "31cc5f4d9b9ba601071e8b8504601b9b176e2756",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -569,11 +569,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1789684949, "lastModified": 1791260994,
"narHash": "sha256-ZKhUe/2IJUq1JhKxKMu8rbkgSGmPP2ZCqlIPn40aGCM=", "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e554fab72f81915600f3f449b786fd9af40439a5", "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -626,11 +626,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1789749394, "lastModified": 1791254437,
"narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=", "narHash": "sha256-qMSsgG+9tIdx282dMqGuJAUK3t6F36clM6efd0rXfes=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49", "rev": "b25309931cfda5f0b8805f462a29897eeae50168",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -642,11 +642,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1789114715, "lastModified": 1789749394,
"narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=", "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "21a67dc470149f337cecafbe965d8d252a390518", "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -658,11 +658,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1789149629, "lastModified": 1790822859,
"narHash": "sha256-eQUZVehWLDBbpBR2rq6DnuRee1ULT6Y675RhsYDSjYI=", "narHash": "sha256-VBA0QerzzmL+4wxgtwiCdiLwLpJg2/9xOxhgO3BRJQA=",
"rev": "eaad089433ca2bb662274377d33df3d0e51ef28b", "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1072397.eaad089433ca/nixexprs.tar.zst" "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1083223.c59305bab206/nixexprs.tar.zst"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -676,11 +676,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1789311332, "lastModified": 1789959143,
"narHash": "sha256-JNsVNLux4emA7/BeZYzzAKnBaPnkatpaf/Fwf7PQT4E=", "narHash": "sha256-9oBHyJtUyunZL+6v0Ub8Y759cXcejQiTHpXtGcx5RLs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "0043fc97e267fee06ac0d858399ff6fac4242a92", "rev": "4836e77b1798cd42e2de28593bec4c1788da08f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -695,11 +695,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1789735339, "lastModified": 1791249451,
"narHash": "sha256-KjnprW4lpS4ISCBnoNxlI9++LACjxlsQV7WWNT4cju8=", "narHash": "sha256-ucUgpRWCvXd17/29C1rPYliLTz8mdNeOvsSGdtBGMAY=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia", "repo": "noctalia",
"rev": "960d4d46bd3149a556504e7c40ecd87abb251a36", "rev": "4237bc286bb9db7fec8ba663bfc42779af9b1372",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -787,11 +787,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789691124, "lastModified": 1791103873,
"narHash": "sha256-k+I+R6uwHX3VcJ7326qLV6vCahZUgsVl+i8sSU/Stxk=", "narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1e73e8f7176d65e1b55e324de099bbfff4b2c574", "rev": "dcd241ba97088c22569d1573286e1b9daad340c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -820,11 +820,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1786383226, "lastModified": 1790453683,
"narHash": "sha256-SM00z+A0/ruFPGCRdoxDnApVGa3A1iLlhRmMvnGH7tU=", "narHash": "sha256-ODfnSwAhOl727PhoZu5N3CwTAK8ykDX1Sm5+VD8d3Fk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "a01dcef2f28b4106d6b3817ab89280194bf716d3", "rev": "078d8f7f514bbe4987a754eb4a2d9e7088e9867a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1045,11 +1045,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789740036, "lastModified": 1791035864,
"narHash": "sha256-SmSOfYfi/aUKdmYgQWNUqkrDnvuPDBY0WkLSNZnR4Jg=", "narHash": "sha256-BFE4GIfyRpZX7BzKU8++r4dY6Y4wt3UJFXgbDuwboIs=",
"owner": "Harry-kp", "owner": "Harry-kp",
"repo": "vortix", "repo": "vortix",
"rev": "bdb704eb02d1e9b8b0c2eb871081632f20e5f2c3", "rev": "6861059dffe7457a18f601b8d1839a5b2cd79b40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1061,11 +1061,11 @@
"yazi-flavors": { "yazi-flavors": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1787401728, "lastModified": 1790697555,
"narHash": "sha256-NGnfrQdsnQITKCZ0oh6DCxeCR2ozJoPAZetsi3ghHAI=", "narHash": "sha256-E1OUF1+mT0V3crVxkewG2Y7hRu8fO+0oRl6NlINmw+o=",
"owner": "yazi-rs", "owner": "yazi-rs",
"repo": "flavors", "repo": "flavors",
"rev": "20b47bfd78880c2674899597fd26bc01b21ff48c", "rev": "1183892c904f7f0efdf4473e856ed308b7bea98d",
"type": "github" "type": "github"
}, },
"original": { "original": {
+1 -1
View File
@@ -67,7 +67,7 @@ in {
# neocmakelsp # cmake # neocmakelsp # cmake
emacs-all-the-icons-fonts emacs-all-the-icons-fonts
frajul.typst-languagetool # frajul.typst-languagetool
ltex-ls-plus ltex-ls-plus
(texlive.combine { (texlive.combine {
+1 -1
View File
@@ -115,7 +115,7 @@
+ "-- Monitor config\n" + "-- Monitor config\n"
+ lib.concatStringsSep "\n" ( + lib.concatStringsSep "\n" (
map ( map (
monitor: "hl.monitor({ output = \"${monitor.name}\", mode = \"preferred\", position = \"auto\", scale = \"auto\", mirror = \"\"})" monitor: "hl.monitor({ output = \"${monitor.name}\", mode = \"${toString monitor.width}x${toString monitor.height}@${toString monitor.refreshRate}\", position = \"${monitor.position}\", scale = \"auto\", mirror = \"\"})"
) )
config.monitors config.monitors
) )
@@ -53,7 +53,7 @@
qpdfview qpdfview
# qutebrowser # qutebrowser
# realvnc-vnc-viewer # realvnc-vnc-viewer
# rpi-imager # make isos rpi-imager # make isos
# rustdesk # rustdesk
tor-browser tor-browser
rusty-path-of-building # Path of Building for poe1 and poe2 rusty-path-of-building # Path of Building for poe1 and poe2
+31 -21
View File
@@ -26,34 +26,44 @@
is-nixos = true; is-nixos = true;
terminal = "alacritty"; terminal = "alacritty";
# --------- --------- # ---------- -------- ---------
# | DVI-D-1 | | DVI-D-2 | # | HDMI-A-1 | | DP-1 | | DVI-D-1 |
# --------- --------- # ---------- -------- ---------
monitors = [ monitors = [
{ {
name = "DVI-D-1"; name = "HDMI-A-1";
width = 1680; width = 1920;
height = 1050; height = 1080;
position = "0x0";
workspaces = [ workspaces = [
"1"
"2"
"3"
"4"
"5"
];
primary = true;
}
{
name = "DVI-D-2";
width = 1680;
height = 1050;
workspaces = [
"6"
"7"
"8" "8"
"9" "9"
"10" "10"
]; ];
} }
{
name = "DP-1";
width = 1680;
height = 1050;
position = "1920x0";
workspaces = [
"1"
"2"
"3"
"4"
];
primary = true;
}
{
name = "DVI-D-1";
width = 1680;
height = 1050;
position = "3600x0";
workspaces = [
"5"
"6"
"7"
];
}
]; ];
} }
-4
View File
@@ -1,13 +1,9 @@
{ {
pwd, pwd,
pkgs, pkgs,
inputs,
... ...
}: { }: {
imports = [ imports = [
inputs.disko.nixosModules.disko
./disko.nix
./hardware-configuration.nix ./hardware-configuration.nix
"${pwd}/features-nixos/global" "${pwd}/features-nixos/global"
-73
View File
@@ -1,73 +0,0 @@
# https://github.com/nix-community/disko/blob/master/example/btrfs-subvolumes.nix
{
disko.devices = {
disk = {
main = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
ESP = {
priority = 1;
name = "ESP";
start = "1M";
end = "128M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = ["umask=0077"];
};
};
root = {
size = "100%";
content = {
type = "btrfs";
extraArgs = ["-f"]; # Override existing partition
# Subvolumes must set a mountpoint in order to be mounted,
# unless their parent is mounted
subvolumes = {
"/rootfs" = {
mountpoint = "/";
};
"/home" = {
mountOptions = ["compress=zstd"];
mountpoint = "/home";
};
"/nix" = {
mountOptions = [
"compress=zstd"
"noatime"
];
mountpoint = "/nix";
};
# Subvolume for the swapfile
"/swap" = {
mountpoint = "/.swapvol";
swap = {
swapfile.size = "20M";
swapfile2.size = "20M";
swapfile2.path = "rel-path";
};
};
};
mountpoint = "/partition-root";
swap = {
swapfile = {
size = "20M";
};
swapfile1 = {
size = "20M";
};
};
};
};
};
};
};
};
};
}
+43 -9
View File
@@ -3,23 +3,57 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "sd_mod"];
"xhci_pci"
"ahci"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
boot.loader.efi.efiSysMountPoint = "/boot/efi";
fileSystems."/" = {
device = "/dev/disk/by-uuid/97a9342e-0be0-4193-9a25-03400fc7da94";
fsType = "btrfs";
options = ["subvol=root"];
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/97a9342e-0be0-4193-9a25-03400fc7da94";
fsType = "btrfs";
options = ["subvol=nix"];
};
fileSystems."/swap" = {
device = "/dev/disk/by-uuid/97a9342e-0be0-4193-9a25-03400fc7da94";
fsType = "btrfs";
options = ["subvol=swap"];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/97a9342e-0be0-4193-9a25-03400fc7da94";
fsType = "btrfs";
options = ["subvol=home"];
};
fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/7D48-A59C";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
swapDevices = [];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = {
modesetting.enable = true;
open = false;
};
} }