Compare commits

..

No commits in common. "2a72f94565e4e1833e6ebe012cd873aaab0bb074" and "aef8d0d80d3a62542e8f8dbb80f2632575445e86" have entirely different histories.

6 changed files with 81 additions and 88 deletions

View file

@ -15,6 +15,7 @@
# }; # };
programs.qgroundcontrol.enable = true; programs.qgroundcontrol.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
chromium
claude-code claude-code
# keep-sorted start sticky_comments=no # keep-sorted start sticky_comments=no
# act # act

90
flake.lock generated
View file

@ -30,12 +30,12 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1779475417, "lastModified": 1778179392,
"narHash": "sha256-7/U/+X66C7XmLnt5JVJVtpx8wVDRU//Awaeqkq9+NNc=", "narHash": "sha256-W6zorvjBYbzMNvqKIqCdpDF4rq3gj50Xximl56YM9/I=",
"rev": "8a9c57ea6b458a40589df60f26200b7d305354d1", "rev": "efd54faa68be8cd777b5c28cab11e638998a0853",
"revCount": 417, "revCount": 416,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.417%2Brev-8a9c57ea6b458a40589df60f26200b7d305354d1/019e5102-f8d8-79f0-8541-a9816865d409/source.tar.gz?rev=8a9c57ea6b458a40589df60f26200b7d305354d1&revCount=417" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.416%2Brev-efd54faa68be8cd777b5c28cab11e638998a0853/019e03c3-8bbc-7443-bd6d-c787773c6154/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -45,37 +45,37 @@
"determinate-nixd-aarch64-darwin": { "determinate-nixd-aarch64-darwin": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-LNvx0qZsH8tbdgNfaig/x5Cf4r4UrXfU1m+0bO3D0E4=", "narHash": "sha256-z4mCqKI3Qd6weuHrlfzGccJG0giym/VJhKv20ijRSs0=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/macOS"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/macOS"
} }
}, },
"determinate-nixd-aarch64-linux": { "determinate-nixd-aarch64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-rKg7uVAEK8X3TTFGaWp8CVZuCAr3wHkMnuJOndhXJF0=", "narHash": "sha256-yW+VNepSRytzfanSssPMJPvwioCcmlZYaBX8++UFkAk=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/aarch64-linux"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/aarch64-linux"
} }
}, },
"determinate-nixd-x86_64-linux": { "determinate-nixd-x86_64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-vBCUEVPfY4+nxGDM62evpxJYEVqLTqdBGbCkmZ2sQhk=", "narHash": "sha256-+L102C3Hhkd1GlXmRm2eLTLsZKBxEvooiQZFqQRlBf0=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/x86_64-linux"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.20.0/x86_64-linux"
} }
}, },
"disko": { "disko": {
@ -85,11 +85,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779699611, "lastModified": 1779226674,
"narHash": "sha256-EcCaSTKnmg2o4wLKaN1aqQFomwyhO7ik0bX9COdyCas=", "narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5ba0c9555c28685e57fa54c7a25e42c7efdbfc8d", "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,11 +190,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1779750197, "lastModified": 1778551011,
"narHash": "sha256-Fcr61O7zcnFPPb0X1JvpKBX7SAnWrzoK6h/w/XJnlkg=", "narHash": "sha256-woJV7tJwwzjR0xWDNuGpwMENe/OEMAdSGg+nqWs9tUE=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "0343e2e41c105cb093ffdf52b56a6e45b0046da5", "rev": "8c41b11607924f7584b77c8a6e6b16439a2f559f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779726696, "lastModified": 1779213149,
"narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", "narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a95e2efb477959b70b4a14c51035975c0481df6", "rev": "bd868f769a69d3b6091a1da68a75cb83a181033c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,12 +295,12 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1779472733, "lastModified": 1778177425,
"narHash": "sha256-nV5OHwivEf392cB5MDwoVdDHSvy6Q+rRYZBHd9sePj4=", "narHash": "sha256-oyHvP5HDRe59opmjTrq2ED9lh+R9FrHyaCGPPNfBqWM=",
"rev": "11f3aff904f84ae612e36e8bc578ac421fca74fa", "rev": "f0ccb960d3ad5bff28acd9cabf8bdef885b5d52f",
"revCount": 25967, "revCount": 25858,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.0/019e50fb-8633-73d0-b673-b2e265950490/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.20.0/019e03bc-3f83-7833-aba3-b691ef4956c7/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -309,11 +309,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1779467186, "lastModified": 1779102034,
"narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,12 +434,12 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1778869304, "lastModified": 1777826146,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=",
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "rev": "73c703c22422b8951895a960959dbbaca7296492",
"revCount": 998534, "revCount": 991389,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.998534%2Brev-d233902339c02a9c334e7e593de68855ad26c4cb/019e3efc-e09a-7ff1-b05f-0c8f85ba7441/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.991389%2Brev-73c703c22422b8951895a960959dbbaca7296492/019df6c8-934b-7d40-b402-027bb5def30f/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -448,11 +448,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1779560665, "lastModified": 1778869304,
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779756131, "lastModified": 1779470870,
"narHash": "sha256-//XfHx8NJar3xenOBltnZ8UcxEca4d4CBSmeWXNj6iI=", "narHash": "sha256-h511LYfVIXNpTd8C/p1cMW2AVrFEjMy104XxPRIzrL0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "bd1f99d01a6d100134d4e048819329bb013a4be2", "rev": "5ea6f8868ce8f1ed17ce6da66abe084dfe3501e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -544,11 +544,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779649538, "lastModified": 1779263007,
"narHash": "sha256-k256zgHyqJ/0siFdq5y4GSwJyYKhQnW83N9K8S7OMKo=", "narHash": "sha256-JkwxVCt7EHCrisHkzhMPKhfdaNAhpyyKuIdLoNYGuPI=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "e8fbde26a92a8c078fb1355c9f7c8dba5f7eb9d6", "rev": "6891eb4b5fbac054b9406da94525daeec71646e3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,8 +6,6 @@
modulesPath, modulesPath,
... ...
}: { }: {
services.fwupd.enable = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
inherit inherit
@ -62,43 +60,6 @@
]; ];
programs.partition-manager.enable = lib.mkDefault true; programs.partition-manager.enable = lib.mkDefault true;
fonts.packages = with pkgs; [
# keep-sorted start
cooper-hewitt
ibm-plex
inconsolata
iosevka
libertine
linux-libertine-g
nerd-fonts.fira-code
nerd-fonts.iosevka-term
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-color-emoji
# keep-sorted end
];
system.userActivationScripts = {
copy-fonts-local-share = {
text = ''
rm -rf ~/.local/share/fonts
mkdir -p ~/.local/share/fonts
cp ${pkgs.cooper-hewitt}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.ibm-plex}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.inconsolata}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.iosevka}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.libertine}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.linux-libertine-g}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.nerd-fonts.fira-code}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.nerd-fonts.iosevka-term}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.noto-fonts-cjk-sans}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.noto-fonts-cjk-serif}/share/fonts/truetype/* ~/.local/share/fonts/
cp ${pkgs.noto-fonts-color-emoji}/share/fonts/truetype/* ~/.local/share/fonts/
chmod 544 ~/.local/share/fonts
chmod 444 ~/.local/share/fonts/*
'';
};
};
hardware.graphics.enable = true; hardware.graphics.enable = true;
# hardware.opengl = { # hardware.opengl = {
# enable = true; # enable = true;

View file

@ -25,6 +25,7 @@
services.lact.enable = true; services.lact.enable = true;
services.fwupd.enable = true;
services.tailscale.useRoutingFeatures = "client"; services.tailscale.useRoutingFeatures = "client";
systemd.services."backlight@backlight:amdgpu_bl2".enable = false; systemd.services."backlight@backlight:amdgpu_bl2".enable = false;

View file

@ -12,6 +12,9 @@ in {
# oculante # https://nixpk.gs/pr-tracker.html?pr=502921 # oculante # https://nixpk.gs/pr-tracker.html?pr=502921
]) ])
++ (with pkgs; [ ++ (with pkgs; [
feedr
sniffnet
oculante
# keep-sorted start sticky_comments=no # keep-sorted start sticky_comments=no
# android-tools # android-tools
# bottles # bottles
@ -39,7 +42,6 @@ in {
deluge deluge
discord discord
element-desktop element-desktop
feedr
forgejo-cli forgejo-cli
freecad-wayland freecad-wayland
gocryptfs gocryptfs
@ -54,7 +56,6 @@ in {
nushell nushell
nvd nvd
obs-studio obs-studio
oculante
onlyoffice-desktopeditors onlyoffice-desktopeditors
openscad openscad
pandoc pandoc
@ -69,12 +70,10 @@ in {
signal-desktop signal-desktop
slack slack
snapper snapper
sniffnet
starship starship
syncplay syncplay
tinymist tinymist
toastify toastify
transmission_4-gtk
typst typst
typstyle typstyle
usbutils usbutils
@ -95,6 +94,22 @@ in {
environment.shells = with pkgs; [nushell]; environment.shells = with pkgs; [nushell];
fonts.packages = with pkgs; [
nerd-fonts.iosevka-term
iosevka
libertine
inconsolata
linux-libertine-g
# keep-sorted start
cooper-hewitt
ibm-plex
nerd-fonts.fira-code
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-color-emoji
# keep-sorted end
];
documentation.enable = true; documentation.enable = true;
# virtualisation.libvirtd.enable = true; # virtualisation.libvirtd.enable = true;

View file

@ -28,6 +28,21 @@ in {
]); ]);
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
fonts.packages = with pkgs; [
libertine
inconsolata
linux-libertine-g
adwaita-fonts
# keep-sorted start
cooper-hewitt
ibm-plex
nerd-fonts.fira-code
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-color-emoji
# keep-sorted end
];
services.flatpak.enable = true; services.flatpak.enable = true;
services.snapper.configs = { services.snapper.configs = {