mx42/nixos
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: several updates

Browse Source
This commit is contained in:
Xavier Morel
2025-12-02 11:20:09 +01:00
parent 199edbc827
commit 1ffa0aecc5
11 changed files with 180 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
flake.lock generated
View File

@@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1761656077,
"narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=",
"lastModified": 1762618334,
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
"owner": "ryantm",
"repo": "agenix",
"rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5",
"rev": "fcdea223397448d35d9b31f798479227e80183f6",
"type": "github"
},
"original": {
@@ -28,11 +28,11 @@
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1746562888,
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
"lastModified": 1755819240,
"narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
"rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
"type": "github"
},
"original": {
@@ -44,16 +44,17 @@
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1622559957,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"lastModified": 1754405784,
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"type": "github"
}
},
@@ -94,21 +95,17 @@
"inputs": {
"determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
"determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux",
"determinate-nixd-x86_64-darwin": [
"determinate",
"determinate-nixd-aarch64-darwin"
],
"determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux",
"nix": "nix",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1753068796,
"narHash": "sha256-jq04XAgT5Rci907wxd69trNwZixpnBLz5tH02h6JcoA=",
"rev": "9919bed0779086df2ce22a77f9406b7a347e340d",
"revCount": 261,
"lastModified": 1763536872,
"narHash": "sha256-QCYGGghBya+qsY59f1zzgYzxEzz+N9S7YRkVWDIDbgo=",
"rev": "f4e598cbb10021c93f73dd4c0cf01ec791ea53f9",
"revCount": 315,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.8.4/01982b0e-46ed-709c-973b-7096ceb2a596/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.13.2/019a9b01-c0c6-7e1c-959e-98ac5b7675de/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -118,37 +115,37 @@
"determinate-nixd-aarch64-darwin": {
"flake": false,
"locked": {
"narHash": "sha256-tEhYb3OWFIPFvWa/orkyBMvS2joRRrqKHpK2cSd20hU=",
"narHash": "sha256-g1r0dPwlUi1h96c4BuHzv9M2lWDqRy9bPDW9tRSq35I=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/macOS"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/macOS"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/macOS"
}
},
"determinate-nixd-aarch64-linux": {
"flake": false,
"locked": {
"narHash": "sha256-BGDnwwbo30fdSAv26G2MFYKx2+qIQ8G40+muwKH9SPM=",
"narHash": "sha256-xn324irXG/EpUdUfUGFrlJNg23JN2cVArd5LsFPjGKc=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/aarch64-linux"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/aarch64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/aarch64-linux"
}
},
"determinate-nixd-x86_64-linux": {
"flake": false,
"locked": {
"narHash": "sha256-P4EJCgSsapE5tggKXiLUeS56PNciGLgonWAm7F1xf6E=",
"narHash": "sha256-VPM5FOGwEjl56b7Edvg3sduvauPHCyXZ11fN9hcUdTU=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/x86_64-linux"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.8.4/x86_64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.13.2/x86_64-linux"
}
},
"disko": {
@@ -158,11 +155,11 @@
]
},
"locked": {
"lastModified": 1753140376,
"narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
"lastModified": 1763651264,
"narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=",
"owner": "nix-community",
"repo": "disko",
"rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
"rev": "e86a89079587497174ccab6d0d142a65811a4fd9",
"type": "github"
},
"original": {
@@ -174,11 +171,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1748383148,
"narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
"lastModified": 1758112371,
"narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
"rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
"type": "github"
},
"original": {
@@ -232,11 +229,11 @@
]
},
"locked": {
"lastModified": 1751413152,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"lastModified": 1756770412,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github"
},
"original": {
@@ -308,18 +305,20 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1748186689,
"narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
"host": "gitlab.gnome.org",
"lastModified": 1762869044,
"narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
"type": "github"
"rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
"type": "gitlab"
},
"original": {
"host": "gitlab.gnome.org",
"owner": "GNOME",
"ref": "48.2",
"ref": "gnome-49",
"repo": "gnome-shell",
"type": "github"
"type": "gitlab"
}
},
"home-manager": {
@@ -350,11 +349,11 @@
]
},
"locked": {
"lastModified": 1753387274,
"narHash": "sha256-Y1hAI9h+9DLBbgKvZBsHaeptFIcRw4iC6ySPmzyqmlM=",
"lastModified": 1763992752,
"narHash": "sha256-iinKiBTAx7F9EkMqKFSqaWTCaay463toAPtQiA8RRyc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a35f6b60430ff0c7803bd2a727df84c87569c167",
"rev": "55af952c5612190c3e7862f4e2504048c50841aa",
"type": "github"
},
"original": {
@@ -372,12 +371,12 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1753066555,
"narHash": "sha256-/WmweOcc4DfQPfGkNxllsuEVgTwX3RVROOy3e/mAvr0=",
"rev": "47281531ec83e22a1bb0249db5a6e4d0d854f0a5",
"revCount": 21541,
"lastModified": 1763534330,
"narHash": "sha256-gTuB2qBdSKCKnZwENTqScs/pPBaZQOv6zZ1KJvV/ohk=",
"rev": "be871f9baf5366a220b5f25634eebab6f452a017",
"revCount": 23278,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.8.4/01982aff-6f3f-7bcc-85c8-b0d4e0cb35d8/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.13.2/019a9af6-3d7b-71bc-bccd-8b18e147ad77/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -386,16 +385,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1747179050,
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"revCount": 799423,
"lastModified": 1761597516,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
"revCount": 811874,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.799423%2Brev-adaa24fbf46737f3f1b5497bf64bae750f82942e/0196d1c3-1974-7bf1-bcf6-06620ac40c8c/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/%3D0.1.799423"
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505"
}
},
"nixpkgs-23-11": {
@@ -432,12 +431,12 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1752077645,
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
"rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
"revCount": 827262,
"lastModified": 1763375004,
"narHash": "sha256-e81Xfa7xhRZfqGB4s3xEvrg4p1v+fToM6CIQlXUyaX0=",
"rev": "8b6600824693a9c706ef09bd86711ca393703466",
"revCount": 897465,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.827262%2Brev-be9e214982e20b8310878ac2baa063a961c1bdf6/01980c9a-3044-72c0-b718-a99e9076d3d6/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.897465%2Brev-8b6600824693a9c706ef09bd86711ca393703466/019a9577-b407-75dd-b18b-3308def1c215/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -446,11 +445,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1753250450,
"narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
"lastModified": 1763835633,
"narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf",
"rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
"type": "github"
},
"original": {
@@ -460,6 +459,26 @@
"type": "github"
}
},
"noctalia": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1764014382,
"narHash": "sha256-yR8z0fgCxru7JWBNq8j3jC+LPxz6IqZuYqboSyaH2Lg=",
"owner": "noctalia-dev",
"repo": "noctalia-shell",
"rev": "3cf4e1f95b6628d2985e3b890bd7cc1f9f1baa5b",
"type": "github"
},
"original": {
"owner": "noctalia-dev",
"repo": "noctalia-shell",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": [
@@ -472,11 +491,11 @@
]
},
"locked": {
"lastModified": 1751906969,
"narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
"lastModified": 1758998580,
"narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
"owner": "nix-community",
"repo": "NUR",
"rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
"rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
"type": "github"
},
"original": {
@@ -493,6 +512,7 @@
"flake-utils": "flake-utils",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_3",
"noctalia": "noctalia",
"stylix": "stylix"
}
},
@@ -517,11 +537,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1753372006,
"narHash": "sha256-eyIYqerHPYHl2Eq802wJSOwMwZ3tdvJ4D+vckDe2mD8=",
"lastModified": 1763845141,
"narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=",
"owner": "danth",
"repo": "stylix",
"rev": "ceda12a6da2181e424d8ed7e68ed291745f06f49",
"rev": "adc650610085adbe130b9860d5bdb869f96050af",
"type": "github"
},
"original": {
@@ -611,11 +631,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1750770351,
"narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
"lastModified": 1757716333,
"narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
"rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
"type": "github"
},
"original": {
@@ -627,11 +647,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1751159871,
"narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
"lastModified": 1757811970,
"narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
"rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
"type": "github"
},
"original": {
@@ -643,11 +663,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1751158968,
"narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
"lastModified": 1757811247,
"narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
"rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
"type": "github"
},
"original": {

4
flake.nix
View File

@@ -22,6 +22,10 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.darwin.follows = "";
};
noctalia = {
url = "github:noctalia-dev/noctalia-shell";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =

28
hosts/work/configuration.nix
View File

@@ -28,6 +28,7 @@
efiSupport = true;
efiInstallAsRemovable = true;
};
kernelPackages = pkgs.linuxPackages_latest;
kernelModules = [
"coretemp"
"cpuid"
@@ -44,11 +45,13 @@
enable = true;
plugins = [ pkgs.obs-studio-plugins.wlrobs ];
};
programs.niri.enable = true; # test...
programs = {
niri.enable = true; # test...
# xwayland.enable = true;
};
hardware = {
sane.enable = true;
amdgpu.amdvlk.enable = true;
amdgpu.amdvlk.support32Bit.enable = true;
graphics.enable = true;
};
networking.hostName = "work-laptop";
nix.settings.trusted-users = [
@@ -59,12 +62,21 @@
enable = true;
cpuFreqGovernor = "schedutil";
};
services.auto-cpufreq.enable = true;
security.sudo.wheelNeedsPassword = false;
services.xserver.videoDrivers = [ "amdgpu" ];
services.tailscale.enable = true;
services.tailscale.useRoutingFeatures = "client";
services = {
# auto-cpufreq.enable = true;
xserver.videoDrivers = [ "amdgpu" ];
upower.enable = true;
power-profiles-daemon.enable = true;
tailscale.enable = true;
tailscale.useRoutingFeatures = "client";
};
environment.systemPackages = [
pkgs.pavucontrol
pkgs.swaylock
pkgs.xwayland-satellite
];
programs.wireshark.enable = true;
system.stateVersion = "24.05";
}

31
hosts/work/home.nix
View File

@@ -1,11 +1,16 @@
{
inputs,
pkgs,
...
}:
{
imports = [
inputs.noctalia.homeModules.default
];
myHome = {
services.nix.enable = true;
bundle.work-apps.enable = true;
bundle.myhypr.enable = true;
bundle.myhypr.enable = false;
bundle.desktop-apps.enable = true;
bundle.shell.enable = true;
programs.creativity = {
@@ -23,8 +28,28 @@
stateVersion = "23.11";
};
programs.git = {
userName = "Xavier Morel";
userEmail = "morelx42@gmail.com";
settings.user = {
name = "Xavier Morel";
email = "morelx42@gmail.com";
};
};
programs.home-manager.enable = true;
programs = {
rofi.enable = true;
noctalia-shell.enable = true;
quickshell.enable = true;
alacritty.enable = true;
};
xdg.portal = {
enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal
];
configPackages = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal
];
};
}

2
modules/home-manager/bundles/shell.nix
View File

@@ -29,7 +29,7 @@
yt-dlp
];
programs = {
awscli.enable = true;
# awscli.enable = true;
bat = {
enable = true;
extraPackages = [ pkgs.bat-extras.batman ];

16
modules/home-manager/programs/creativity.nix
View File

@@ -7,23 +7,23 @@
let
drawing-apps = with pkgs; [
gimp
tiled
aseprite
inkscape
# tiled
# aseprite
# inkscape
sweethome3d.application
];
printing-apps = with pkgs; [
blender
prusa-slicer
openscad
# prusa-slicer
# openscad
];
gamedev-apps = with pkgs; [
godot_4
gdtoolkit_4
# godot_4
# gdtoolkit_4
];
sound-apps = with pkgs; [
audacity
sfxr
# sfxr
];
in
{

2
modules/home-manager/programs/kitty.nix
View File

@@ -20,7 +20,7 @@
enable_audio_bell = false;
mouse_hide_wait = "-1.0";
background_opacity = "0.6";
background_blur = 5;
background_blur = 3;
font_family = "Fira Code";
};
# extraConfig = ''

10
modules/nixos/archetypes/general.nix
View File

@@ -12,6 +12,7 @@
environment.systemPackages = [
pkgs.openssl
pkgs.coreutils
pkgs.vulkan-tools
];
hardware = {
graphics.enable = true;
@@ -57,7 +58,14 @@
udev.packages = with pkgs; [
vial
];
xserver.enable = true;
xserver = {
enable = true;
videoDrivers = [
"modesetting"
"fbdev"
"amdgpu"
];
};
};
time.timeZone = "Europe/Paris";

2
modules/nixos/features/fonts.nix
View File

@@ -11,7 +11,7 @@
fonts.packages = with pkgs; [
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-color-emoji
fira-code
roboto

2
modules/nixos/home-manager.nix
View File

@@ -59,6 +59,8 @@ in
"wheel"
"docker"
"lp"
"wireshark"
"dialout" # serial port access
];
}
// user.userNixosSettings

7
myLib/default.nix
View File

@@ -15,6 +15,12 @@ rec {
config
outputs.nixosModules.default
inputs.agenix.nixosModules.default
inputs.noctalia.nixosModules.default
{
environment.systemPackages = [
inputs.noctalia.packages.x86_64-linux.default
];
}
{
environment.systemPackages = [
inputs.agenix.packages.x86_64-linux.default # hmm arch?
@@ -29,6 +35,7 @@ rec {
pkgs = pkgsFor sys;
extraSpecialArgs = { inherit inputs outputs myLib; };
modules = [
inputs.noctalia.homeModules.default
inputs.stylix.homeManagerModules.stylix
config
outputs.homeManagerModules.default