Compare commits

..

10 Commits

Author SHA1 Message Date
7400536189 flake.lock: Update
Flake lock file updates:

• Updated input 'clion-flake':
    'path:./common/flakes/clion-flake'
  → 'path:./common/flakes/clion-flake'
• Updated input 'clion-flake/nixpkgs':
    'github:NixOS/nixpkgs/46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9?narHash=sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc%3D' (2026-03-24)
  → 'github:NixOS/nixpkgs/8110df5ad7abf5d4c0f6fb0f8f978390e77f9685?narHash=sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg%3D' (2026-03-28)
• Updated input 'czkawka-master':
    'path:./common/flakes/czkawka-master'
  → 'path:./common/flakes/czkawka-master'
• Updated input 'czkawka-master/nixpkgs':
    'github:NixOS/nixpkgs/46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9?narHash=sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc%3D' (2026-03-24)
  → 'github:NixOS/nixpkgs/8110df5ad7abf5d4c0f6fb0f8f978390e77f9685?narHash=sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg%3D' (2026-03-28)
• Updated input 'fet':
    'path:./common/flakes/fet'
  → 'path:./common/flakes/fet'
• Updated input 'fet/nixpkgs':
    'github:NixOS/nixpkgs/46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9?narHash=sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc%3D' (2026-03-24)
  → 'github:NixOS/nixpkgs/8110df5ad7abf5d4c0f6fb0f8f978390e77f9685?narHash=sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg%3D' (2026-03-28)
• Updated input 'home-manager':
    'github:nix-community/home-manager/769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a?narHash=sha256-2jfBEZUC67IlnxO5KItFCAd7Oc%2B1TvyV/jQlR%2B2ykGQ%3D' (2026-03-28)
  → 'github:nix-community/home-manager/9340f51314713c83360bf72d75c8b404778ab5b1?narHash=sha256-PzqwM4njoB3aznqwPZUawD4uOcJeu7N6GBTJKg81EQ4%3D' (2026-03-30)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a24d4f88646994587e1859e70ba5936be1d1edda?narHash=sha256-cyiTzi1tQeXX0wVBmdK/3iAAQt5IRqTwLLLLk6Xezwk%3D' (2026-03-29)
  → 'github:NixOS/nixpkgs/b584523193e892d7261a7fe6520fb6021896cac1?narHash=sha256-w0CBrn0GMqc6DAskum9LoJN1ur9irneL3P6ZZeXXQug%3D' (2026-03-30)
2026-03-30 20:02:25 +02:00
dc832ad060 flake.lock: Update
Flake lock file updates:

• Updated input 'clion-flake':
    'path:./common/flakes/clion-flake'
  → 'path:./common/flakes/clion-flake'
• Updated input 'czkawka-master':
    'path:./common/flakes/czkawka-master'
  → 'path:./common/flakes/czkawka-master'
• Updated input 'fet':
    'path:./common/flakes/fet'
  → 'path:./common/flakes/fet'
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ae0d4899645937e7b845d9ca3f1607d27a3911e7?narHash=sha256-0dh1K2mxKZPvQ8Zxb72qvw5Qv72tRaxZbGJ%2BznZZfN0%3D' (2026-03-29)
  → 'github:NixOS/nixpkgs/a24d4f88646994587e1859e70ba5936be1d1edda?narHash=sha256-cyiTzi1tQeXX0wVBmdK/3iAAQt5IRqTwLLLLk6Xezwk%3D' (2026-03-29)
2026-03-29 21:16:23 +02:00
faa6683948 flake.lock: Update
Flake lock file updates:

• Updated input 'clion-flake':
    'path:./common/flakes/clion-flake'
  → 'path:./common/flakes/clion-flake'
• Updated input 'czkawka-master':
    'path:./common/flakes/czkawka-master'
  → 'path:./common/flakes/czkawka-master'
• Updated input 'fet':
    'path:./common/flakes/fet'
  → 'path:./common/flakes/fet'
• Updated input 'home-manager':
    'github:nix-community/home-manager/9df3a639007cfe0d074433f7fc225ea94f877d08?narHash=sha256-1WelwA45Xm4glTG8R9IX9jYeFKDG2HbR79jAauLezUE%3D' (2026-03-27)
  → 'github:nix-community/home-manager/769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a?narHash=sha256-2jfBEZUC67IlnxO5KItFCAd7Oc%2B1TvyV/jQlR%2B2ykGQ%3D' (2026-03-28)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b55b0e0c856ac73c7f507336780f97aa7a9746e2?narHash=sha256-%2BuVDNwxihd82I6aZTgNvIXqFyLcfUBkg/Y0A8UBgycg%3D' (2026-03-27)
  → 'github:NixOS/nixpkgs/ae0d4899645937e7b845d9ca3f1607d27a3911e7?narHash=sha256-0dh1K2mxKZPvQ8Zxb72qvw5Qv72tRaxZbGJ%2BznZZfN0%3D' (2026-03-29)
2026-03-29 20:58:52 +02:00
841c3b2fbd Lower attic push jobs
server be fragile
2026-03-27 21:58:05 +01:00
a3cccd8751 Add flake for newer clion 2026-03-27 21:57:52 +01:00
d9478157fb Update cache key
- due to cache reset
- add job number to push
2026-03-27 20:45:33 +01:00
599be0b0e5 Actually add /etc/nix as well 2026-03-27 19:32:51 +01:00
0a07190179 Add a service to automatically fetch devshells 2026-03-27 19:26:56 +01:00
401490f581 Add kmscon 2026-03-26 19:29:57 +01:00
0c59ee08ef Update lockfile 2026-03-25 01:38:02 +01:00
10 changed files with 148 additions and 25 deletions

View File

@@ -12,8 +12,8 @@ build-laptop:
nix build .#nixosConfigurations.dalaptop.config.system.build.toplevel --log-format internal-json |& nom --json nix build .#nixosConfigurations.dalaptop.config.system.build.toplevel --log-format internal-json |& nom --json
upload: upload:
attic push my-config result attic push my-config result -j2
attic push my-config /run/current-system attic push my-config /run/current-system -j2
clean: clean:
rm -rf result rm -rf result
@@ -23,7 +23,7 @@ format:
treefmt . treefmt .
switch: switch:
nh os switch nh os switch --refresh
switch_update: switch_update:
nh os switch --refresh --update nh os switch --refresh --update

View File

@@ -16,6 +16,7 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot = { systemd-boot = {
enable = true; enable = true;
memtest86.enable = true;
}; };
}; };
@@ -52,7 +53,10 @@
}; };
}; };
console.keyMap = "cz-lat2"; console = {
keyMap = "cz-lat2";
font = "LatArCyrHeb-16";
};
xdg.portal.enable = true; xdg.portal.enable = true;
@@ -117,9 +121,9 @@
LIBVIRT_DEFAULT_URI = "qemu:///system"; LIBVIRT_DEFAULT_URI = "qemu:///system";
}; };
systemPackages = [ systemPackages = with pkgs; [
pkgs.libheif libheif
pkgs.libheif.out libheif.out
]; ];
pathsToLink = ["share/thumbnailers"]; pathsToLink = ["share/thumbnailers"];

View File

@@ -0,0 +1,30 @@
{
description = "Latest CLion from JetBrains";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
outputs = {
self,
nixpkgs,
}: let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [
"openssl-1.1.1w"
];
};
};
in {
packages.${system}.default = pkgs.jetbrains.clion.overrideAttrs (oldAttrs: rec {
version = "2026.1";
src = pkgs.fetchurl {
url = "https://download-cdn.jetbrains.com/cpp/CLion-${version}.tar.gz";
hash = "sha256-r5flY2u6aCkI8q7ZcGWYLLxxcWWp3gtTkdBdKoacIB0=";
};
buildInputs = oldAttrs.buildInputs ++ [pkgs.openssl_1_1];
});
};
}

View File

@@ -6,7 +6,7 @@
]; ];
trusted-public-keys = [ trusted-public-keys = [
"my-config:51aC90S8+3+gS/UzwdnL7a7lu1NnY896SZp5njMwFDk=" "my-config:hK+qaX2TdSrf/sp8LjKq9VF9XU0qGksoQCdgVXfgWoQ="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
]; ];

View File

@@ -3,6 +3,7 @@
./dconf ./dconf
./desktop-files.nix ./desktop-files.nix
./starship.nix ./starship.nix
./services.nix
./zsh.nix ./zsh.nix
]; ];

View File

@@ -0,0 +1,41 @@
{pkgs, ...}: let
devShellsDir = "$HOME/.config/nix-shells";
nixConfigDir = "/etc/nixos";
syncScript = pkgs.writeShellScript "sync-all-repos" ''
repos=("${devShellsDir}" "${nixConfigDir}")
for repo in "''${repos[@]}"; do
echo "Syncing $repo..."
if ! ${pkgs.git}/bin/git -C "$repo" pull --rebase --autostash; then
${pkgs.libnotify}/bin/notify-send -u critical "Sync Failed" "Conflict or network error in $repo"
else
${pkgs.git}/bin/git -C "$repo" add -N . 2>/dev/null || true
fi
done
'';
in {
systemd.user.services.sync-nix-repos = {
Unit = {
Description = "Background sync for Nix Config and Dev Shells";
After = ["network-online.target"];
Wants = ["network-online.target"];
};
Service = {
Type = "oneshot";
ExecStart = "${syncScript}";
PassEnvironment = ["DBUS_SESSION_BUS_ADDRESS" "DISPLAY"];
};
};
systemd.user.timers.sync-nix-repos = {
Unit.Description = "Hourly sync for all Nix repositories";
Timer = {
OnBootSec = "2m";
OnUnitActiveSec = "1h";
Persistent = true;
};
Install.WantedBy = ["timers.target"];
};
}

View File

@@ -2,6 +2,7 @@
config, config,
pkgs, pkgs,
lib, lib,
clion-flake,
czkawka-master, czkawka-master,
solaar-master, solaar-master,
fet, fet,
@@ -15,6 +16,7 @@
"cisco-packet-tracer_9" "cisco-packet-tracer_9"
]; ];
}; };
overlays = [ overlays = [
(final: prev: { (final: prev: {
nautilus = prev.nautilus.overrideAttrs (nprev: { nautilus = prev.nautilus.overrideAttrs (nprev: {
@@ -91,7 +93,8 @@
iftop iftop
inkscape inkscape
iotop iotop
jetbrains.clion #jetbrains.clion
clion-flake.packages.${pkgs.stdenv.hostPlatform.system}.default
jq jq
just just
killall killall

View File

@@ -79,6 +79,18 @@
interval = "weekly"; interval = "weekly";
}; };
kmscon = {
enable = true;
fonts = [
{
name = "FiraCode Nerd Font Mono";
package = pkgs.nerd-fonts.fira-code;
}
];
useXkbConfig = true;
hwRender = true;
};
fwupd.enable = true; fwupd.enable = true;
udev.packages = with pkgs; [ udev.packages = with pkgs; [

61
flake.lock generated
View File

@@ -1,10 +1,24 @@
{ {
"nodes": { "nodes": {
"clion-flake": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"path": "./common/flakes/clion-flake",
"type": "path"
},
"original": {
"path": "./common/flakes/clion-flake",
"type": "path"
},
"parent": []
},
"czkawka-master": { "czkawka-master": {
"inputs": { "inputs": {
"czkawka-src": "czkawka-src", "czkawka-src": "czkawka-src",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"path": "./common/flakes/czkawka-master", "path": "./common/flakes/czkawka-master",
@@ -58,7 +72,7 @@
"fet": { "fet": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"path": "./common/flakes/fet", "path": "./common/flakes/fet",
@@ -95,11 +109,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774371786, "lastModified": 1774875815,
"narHash": "sha256-ag1HUJv0SDBqKAYxwWlvAE2gBsEk3XYFvWtmdAHFz7E=", "narHash": "sha256-PzqwM4njoB3aznqwPZUawD4uOcJeu7N6GBTJKg81EQ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b8cb89f2c4f7006b17b4aa5d8b39b95b93b559d8", "rev": "9340f51314713c83360bf72d75c8b404778ab5b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -147,11 +161,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1774106199, "lastModified": 1774709303,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -163,11 +177,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1774106199, "lastModified": 1774709303,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -179,11 +193,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1774321912, "lastModified": 1774709303,
"narHash": "sha256-Nna0UkHU2xmhyx0VAel4DDdwpAlA70ZgzAtOD4m3Pc8=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b0d3faa43b2bd4cc22fdf98ee00cac4f2f47ac8a", "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1774847206,
"narHash": "sha256-w0CBrn0GMqc6DAskum9LoJN1ur9irneL3P6ZZeXXQug=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b584523193e892d7261a7fe6520fb6021896cac1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -195,11 +225,12 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"clion-flake": "clion-flake",
"czkawka-master": "czkawka-master", "czkawka-master": "czkawka-master",
"fet": "fet", "fet": "fet",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {

View File

@@ -9,6 +9,7 @@
czkawka-master.url = "path:./common/flakes/czkawka-master"; czkawka-master.url = "path:./common/flakes/czkawka-master";
fet.url = "path:./common/flakes/fet"; fet.url = "path:./common/flakes/fet";
clion-flake.url = "path:./common/flakes/clion-flake";
}; };
outputs = { outputs = {
@@ -18,7 +19,7 @@
home-manager, home-manager,
... ...
} @ inputs: let } @ inputs: let
specialArgs = {inherit (inputs) czkawka-master fet;}; specialArgs = {inherit (inputs) czkawka-master fet clion-flake;};
in { in {
nixosConfigurations = { nixosConfigurations = {
epiquev2 = nixpkgs.lib.nixosSystem { epiquev2 = nixpkgs.lib.nixosSystem {