Compare commits

...

14 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
5b71825d70 packages.nix: add Blueman 2026-03-24 18:08:11 +01:00
4959baf11c Update FET to 7.8.1 2026-03-23 21:27:56 +01:00
b1eb8d16fc extensions: dash-to-dock:
- enable autohide-in-fullscreen
2026-03-23 21:24:49 +01:00
a4c34f9857 Reformat with alejandra 2026-03-23 21:24:20 +01:00
52 changed files with 348 additions and 276 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

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
imports = [ imports = [
./modules ./modules
./hardware-configuration.nix ./hardware-configuration.nix
@@ -17,6 +16,7 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot = { systemd-boot = {
enable = true; enable = true;
memtest86.enable = true;
}; };
}; };
@@ -53,7 +53,10 @@
}; };
}; };
console.keyMap = "cz-lat2"; console = {
keyMap = "cz-lat2";
font = "LatArCyrHeb-16";
};
xdg.portal.enable = true; xdg.portal.enable = true;
@@ -118,19 +121,21 @@
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"];
}; };
hardware = { hardware = {
bluetooth = { bluetooth = {
enable = true; enable = true;
package = pkgs.bluez.overrideAttrs (old: { package = pkgs.bluez.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [ configureFlags =
old.configureFlags
++ [
"--enable-sixaxis" "--enable-sixaxis"
]; ];
}); });

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

@@ -14,17 +14,15 @@
}; };
}; };
outputs = outputs = {
{
self, self,
nixpkgs, nixpkgs,
czkawka-src, czkawka-src,
naersk, naersk,
}: }: let
let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs {inherit system;};
naersk-lib = pkgs.callPackage naersk { }; naersk-lib = pkgs.callPackage naersk {};
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
cargo cargo
@@ -44,8 +42,7 @@
libXrandr libXrandr
wayland wayland
]; ];
in in {
{
packages.${system}.default = naersk-lib.buildPackage { packages.${system}.default = naersk-lib.buildPackage {
pname = "krokiet"; pname = "krokiet";
version = "master"; version = "master";
@@ -54,8 +51,7 @@
nativeBuildInputs = nativeBuildInputs; nativeBuildInputs = nativeBuildInputs;
buildInputs = runtimeLibs; buildInputs = runtimeLibs;
cargoBuildOptions = cargoBuildOptions = x:
x:
x x
++ [ ++ [
"-p" "-p"

View File

@@ -6,25 +6,22 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = outputs = {
{
self, self,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
}: }:
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: system: let
let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in in {
{
packages.default = pkgs.stdenv.mkDerivation rec { packages.default = pkgs.stdenv.mkDerivation rec {
pname = "fet"; pname = "fet";
version = "7.8.0"; version = "7.8.1";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://lalescu.ro/liviu/fet/download/fet-${version}.tar.xz"; url = "https://lalescu.ro/liviu/fet/download/fet-${version}.tar.xz";
sha256 = "01hr3digrg2qs5wh10qzpgwi4clqmzd46d099r0yrx3278qvz9wj"; sha256 = "0b0g20mgawpv6pp6b1vh0vhz6rr0193g2irqiclnxxlnf174bcfr";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
boot = { boot = {
kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest; kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest;

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
nix.settings = { nix.settings = {
substituters = [ substituters = [
"https://attic.awroo.fun/my-config" "https://attic.awroo.fun/my-config"
@@ -7,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

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./attic.nix ./attic.nix
./flatpak.nix ./flatpak.nix

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
services.flatpak = { services.flatpak = {
enable = true; enable = true;
update.auto.enable = true; update.auto.enable = true;

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment = { environment = {
gnome.excludePackages = with pkgs; [ gnome.excludePackages = with pkgs; [
decibels decibels

View File

@@ -1,9 +1,8 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/virt-manager/virt-manager/connections" = { "org/virt-manager/virt-manager/connections" = {
autoconnect = [ "qemu:///system" ]; autoconnect = ["qemu:///system"];
uris = [ "qemu:///system" ]; uris = ["qemu:///system"];
}; };
"org/gnome/Console" = { "org/gnome/Console" = {

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./apps.nix ./apps.nix
./extensions.nix ./extensions.nix

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/shell/extensions/user-theme" = { "org/gnome/shell/extensions/user-theme" = {
name = "Flat-Remix-Darkest-fullPanel"; name = "Flat-Remix-Darkest-fullPanel";
@@ -29,7 +28,7 @@
"org/gnome/shell/extensions/dash-to-dock" = { "org/gnome/shell/extensions/dash-to-dock" = {
apply-custom-theme = false; apply-custom-theme = false;
autohide-in-fullscreen = false; autohide-in-fullscreen = true;
background-color = "rgb(0,0,0)"; background-color = "rgb(0,0,0)";
background-opacity = 0.8; background-opacity = 0.8;
click-action = "skip"; click-action = "skip";
@@ -109,7 +108,7 @@
blur = false; blur = false;
brightness = 1.0; brightness = 1.0;
opacity = 217; opacity = 217;
whitelist = [ "org.gnome.Console" ]; whitelist = ["org.gnome.Console"];
}; };
"org/gnome/shell/extensions/blur-my-shell/coverflow-alt-tab" = { "org/gnome/shell/extensions/blur-my-shell/coverflow-alt-tab" = {

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
accent-color = "red"; accent-color = "red";
@@ -33,13 +32,13 @@
}; };
"org/gnome/desktop/wm/keybindings" = { "org/gnome/desktop/wm/keybindings" = {
move-to-workspace-left = [ "<Shift><Control><Super>Left" ]; move-to-workspace-left = ["<Shift><Control><Super>Left"];
move-to-workspace-right = [ "<Shift><Control><Super>Right" ]; move-to-workspace-right = ["<Shift><Control><Super>Right"];
switch-to-workspace-left = [ "<Control><Super>Left" ]; switch-to-workspace-left = ["<Control><Super>Left"];
switch-to-workspace-right = [ "<Control><Super>Right" ]; switch-to-workspace-right = ["<Control><Super>Right"];
switch-windows = [ "<Alt>Tab" ]; switch-windows = ["<Alt>Tab"];
switch-windows-backward = [ "<Shift><Alt>Tab" ]; switch-windows-backward = ["<Shift><Alt>Tab"];
toggle-fullscreen = [ "<Super>F11" ]; toggle-fullscreen = ["<Super>F11"];
}; };
"org/gnome/desktop/wm/preferences" = { "org/gnome/desktop/wm/preferences" = {
@@ -89,7 +88,7 @@
}; };
"org/gnome/desktop/app-folders" = { "org/gnome/desktop/app-folders" = {
folder-children = [ ]; folder-children = [];
}; };
"org/gnome/desktop/datetime" = { "org/gnome/desktop/datetime" = {

View File

@@ -1,9 +1,9 @@
{ ... }: {...}: {
{
imports = [ imports = [
./dconf ./dconf
./desktop-files.nix ./desktop-files.nix
./starship.nix ./starship.nix
./services.nix
./zsh.nix ./zsh.nix
]; ];

View File

@@ -2,8 +2,7 @@
config, config,
pkgs, pkgs,
... ...
}: }: {
{
xdg.dataFile."applications/clion.desktop".text = '' xdg.dataFile."applications/clion.desktop".text = ''
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application

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

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
programs.starship = { programs.starship = {
enable = true; enable = true;
settings = { settings = {

View File

@@ -1,5 +1,4 @@
{ config, ... }: {config, ...}: {
{
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;

View File

@@ -2,12 +2,12 @@
config, config,
pkgs, pkgs,
lib, lib,
clion-flake,
czkawka-master, czkawka-master,
solaar-master, solaar-master,
fet, fet,
... ...
}: }: {
{
nixpkgs = { nixpkgs = {
config = { config = {
allowUnfree = true; allowUnfree = true;
@@ -16,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: {
@@ -92,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
@@ -153,7 +155,8 @@
vkbasalt vkbasalt
vlc vlc
(vscode.fhsWithPackages ( (vscode.fhsWithPackages (
ps: with ps; [ ps:
with ps; [
python3 python3
zlib zlib
gcc gcc

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
programs = { programs = {
dconf.profiles.gdm.databases = [ dconf.profiles.gdm.databases = [
{ {
@@ -79,7 +78,7 @@
nix-ld = { nix-ld = {
enable = true; enable = true;
libraries = with pkgs; [ ]; libraries = with pkgs; [];
}; };
steam = { steam = {

View File

@@ -3,13 +3,14 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
services = { services = {
sshd.enable = true; sshd.enable = true;
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
blueman.enable = true;
geoclue2.enable = true; geoclue2.enable = true;
xserver = { xserver = {
@@ -78,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; [

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./modules ./modules

View File

@@ -7,15 +7,14 @@
pkgs, pkgs,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot = { boot = {
initrd = { initrd = {
kernelModules = [ ]; kernelModules = [];
verbose = false; verbose = false;
availableKernelModules = [ availableKernelModules = [
"nvme" "nvme"
@@ -36,7 +35,7 @@
pkgs.linuxKernel.packages.linux_xanmod_latest.zenpower pkgs.linuxKernel.packages.linux_xanmod_latest.zenpower
]; ];
blacklistedKernelModules = [ "k10temp" ]; blacklistedKernelModules = ["k10temp"];
kernelParams = [ kernelParams = [
"amdgpu.seamless=1" "amdgpu.seamless=1"
@@ -180,7 +179,7 @@
]; ];
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./flatpak.nix ./flatpak.nix
./gdm-monitors.nix ./gdm-monitors.nix

View File

@@ -3,6 +3,5 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
} }

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: let
let
gdmMonitorsXml = pkgs.writeText "gdm-monitor.xml" '' gdmMonitorsXml = pkgs.writeText "gdm-monitor.xml" ''
<monitors version="2"> <monitors version="2">
<configuration> <configuration>
@@ -291,8 +290,7 @@ let
</configuration> </configuration>
</monitors> </monitors>
''; '';
in in {
{
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /run/gdm/.config/monitors.xml - - - - ${gdmMonitorsXml}" "L+ /run/gdm/.config/monitors.xml - - - - ${gdmMonitorsXml}"
]; ];

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment = { environment = {
systemPackages = with pkgs.gnomeExtensions; [ systemPackages = with pkgs.gnomeExtensions; [
control-monitor-brightness-and-volume-with-ddcutil control-monitor-brightness-and-volume-with-ddcutil

View File

@@ -1,4 +1,3 @@
{ ... }: {...}: {
{ dconf.settings = {};
dconf.settings = { };
} }

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./apps.nix ./apps.nix
./extensions.nix ./extensions.nix

View File

@@ -1,4 +1,3 @@
{ ... }: {...}: {
{ dconf.settings = {};
dconf.settings = { };
} }

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/settings-daemon/plugins/media-keys" = { "org/gnome/settings-daemon/plugins/media-keys" = {
custom-keybindings = lib.mkAfter [ custom-keybindings = lib.mkAfter [

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./dconf ./dconf
]; ];

View File

@@ -4,8 +4,7 @@
lib, lib,
czkawka-master, czkawka-master,
... ...
}: }: {
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
amdgpu_top amdgpu_top
arch-install-scripts arch-install-scripts

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
programs = { programs = {
ccache = { ccache = {
enable = true; enable = true;

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zram-generator zram-generator
]; ];

View File

@@ -1,5 +1,4 @@
{ lib, ... }: {lib, ...}: {
{
virtualisation.vmVariant = { virtualisation.vmVariant = {
virtualisation = { virtualisation = {
memorySize = 8192; memorySize = 8192;

67
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",
@@ -19,11 +33,11 @@
"czkawka-src": { "czkawka-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773724747, "lastModified": 1774297847,
"narHash": "sha256-wXiP4t5fQlAVrpZyJcIhUJ1Mdjn94eUaAOR4b08cWAI=", "narHash": "sha256-iEgM0Wjhyy2H6HxnqY7YDAHiuDIUaw5rmsE1Zsij/nk=",
"owner": "qarmin", "owner": "qarmin",
"repo": "czkawka", "repo": "czkawka",
"rev": "28ae8bae1ebe9858b395364386aefba6bcd40c45", "rev": "7680c07130f7bbfb5019e328362eaaebdce7aece",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -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": 1774210133, "lastModified": 1774875815,
"narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=", "narHash": "sha256-PzqwM4njoB3aznqwPZUawD4uOcJeu7N6GBTJKg81EQ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95", "rev": "9340f51314713c83360bf72d75c8b404778ab5b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -147,11 +161,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1773821835, "lastModified": 1774709303,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -163,11 +177,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1773821835, "lastModified": 1774709303,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -179,11 +193,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1774235121, "lastModified": 1774709303,
"narHash": "sha256-CzpSER+YKq4yD+RPom6Su9c/4FutF+sD4rEnls+4MyM=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1116aed2cee959f7d054a462458513ad323b710a", "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,20 +9,18 @@
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 = {
{
self, self,
nixpkgs, nixpkgs,
nix-flatpak, nix-flatpak,
home-manager, home-manager,
... ...
}@inputs: } @ inputs: let
let specialArgs = {inherit (inputs) czkawka-master fet clion-flake;};
specialArgs = { inherit (inputs) czkawka-master fet; }; in {
in
{
nixosConfigurations = { nixosConfigurations = {
epiquev2 = nixpkgs.lib.nixosSystem { epiquev2 = nixpkgs.lib.nixosSystem {
inherit specialArgs; inherit specialArgs;

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./modules ./modules

View File

@@ -7,8 +7,7 @@
pkgs, pkgs,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
@@ -23,11 +22,11 @@
"sd_mod" "sd_mod"
]; ];
kernelModules = [ ]; kernelModules = [];
}; };
kernelModules = [ "kvm-intel" ]; kernelModules = ["kvm-intel"];
extraModulePackages = [ ]; extraModulePackages = [];
resumeDevice = "/dev/disk/by-uuid/bea07563-dc23-415b-b12f-ba53138bd492"; resumeDevice = "/dev/disk/by-uuid/bea07563-dc23-415b-b12f-ba53138bd492";
kernelParams = [ kernelParams = [

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./flatpak.nix ./flatpak.nix
./gnome.nix ./gnome.nix

View File

@@ -3,6 +3,5 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
} }

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment = { environment = {
systemPackages = with pkgs.gnomeExtensions; [ systemPackages = with pkgs.gnomeExtensions; [
]; ];

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/Console" = { "org/gnome/Console" = {
custom-font = "FiraCode Nerd Font Mono 11"; custom-font = "FiraCode Nerd Font Mono 11";

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./apps.nix ./apps.nix
./extensions.nix ./extensions.nix

View File

@@ -1,4 +1,3 @@
{ ... }: {...}: {
{ dconf.settings = {};
dconf.settings = { };
} }

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
dconf.settings = { dconf.settings = {
"org/gnome/desktop/peripherals/touchpad" = { "org/gnome/desktop/peripherals/touchpad" = {
click-method = "areas"; click-method = "areas";

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./dconf ./dconf
]; ];

View File

@@ -3,8 +3,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
btop btop
gnome-power-manager gnome-power-manager

View File

@@ -1,3 +1,2 @@
{ ... }: {...}: {
{
} }

View File

@@ -1,5 +1,4 @@
{ pkgs, ... }: {pkgs, ...}: {
{
services.thermald.enable = true; services.thermald.enable = true;
services.power-profiles-daemon.enable = false; services.power-profiles-daemon.enable = false;
services.tlp = { services.tlp = {
@@ -42,7 +41,7 @@
systemd.services.disable-problematic-wakeup = { systemd.services.disable-problematic-wakeup = {
description = "Disable only specific noisy wakeup sources"; description = "Disable only specific noisy wakeup sources";
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";