romanl/nixos
1
0
Fork 0
mirror of https://github.com/JaxTheWolf/nixos.git synced 2026-03-31 17:50:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: romanl:463ce1c6f96113774b55ce6fe8b3821cceda178a
Branches Tags
romanl:main romanl:split-wip
...
compare: romanl:5b71825d70f5ed50dde163f123d5b095e0dbda1e
Branches Tags
romanl:main romanl:split-wip

4 Commits
463ce1c6f9 ... 5b71825d70

Author SHA1 Message Date
Roman Lubij
5b71825d70 packages.nix: add Blueman 2026-03-24 18:08:11 +01:00
Roman Lubij
4959baf11c Update FET to 7.8.1 2026-03-23 21:27:56 +01:00
Roman Lubij
b1eb8d16fc extensions: dash-to-dock: 
- enable autohide-in-fullscreen
 2026-03-23 21:24:49 +01:00
Roman Lubij
a4c34f9857 Reformat with alejandra 2026-03-23 21:24:20 +01:00
49 changed files with 213 additions and 264 deletions
Expand all files Collapse all files

13
common/default.nix
View File

@@ -3,8 +3,7 @@
pkgs,
lib,
...
}:
{
}: {
imports = [
./modules
./hardware-configuration.nix
@@ -123,16 +122,18 @@
pkgs.libheif.out
];
pathsToLink = [ "share/thumbnailers" ];
pathsToLink = ["share/thumbnailers"];
};
hardware = {
bluetooth = {
enable = true;
package = pkgs.bluez.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [
"--enable-sixaxis"
];
configureFlags =
old.configureFlags
++ [
"--enable-sixaxis"
];
});
powerOnBoot = true;

110
common/flakes/czkawka-master/flake.nix
View File

@@ -14,72 +14,68 @@
};
};
outputs =
{
self,
nixpkgs,
czkawka-src,
naersk,
}:
let
system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; };
naersk-lib = pkgs.callPackage naersk { };
outputs = {
self,
nixpkgs,
czkawka-src,
naersk,
}: let
system = "x86_64-linux";
pkgs = import nixpkgs {inherit system;};
naersk-lib = pkgs.callPackage naersk {};
nativeBuildInputs = with pkgs; [
cargo
cmake
makeWrapper
pkg-config
rustc
];
nativeBuildInputs = with pkgs; [
cargo
cmake
makeWrapper
pkg-config
rustc
];
runtimeLibs = with pkgs; [
fontconfig
libglvnd
libX11
libXcursor
libXi
libxkbcommon
libXrandr
wayland
];
in
{
packages.${system}.default = naersk-lib.buildPackage {
pname = "krokiet";
version = "master";
src = czkawka-src;
runtimeLibs = with pkgs; [
fontconfig
libglvnd
libX11
libXcursor
libXi
libxkbcommon
libXrandr
wayland
];
in {
packages.${system}.default = naersk-lib.buildPackage {
pname = "krokiet";
version = "master";
src = czkawka-src;
nativeBuildInputs = nativeBuildInputs;
buildInputs = runtimeLibs;
nativeBuildInputs = nativeBuildInputs;
buildInputs = runtimeLibs;
cargoBuildOptions =
x:
x
++ [
"-p"
"krokiet"
];
buildAndCheckFeatures = [
"winit_wayland"
"winit_x11"
cargoBuildOptions = x:
x
++ [
"-p"
"krokiet"
];
RUSTFLAGS = "-C target-cpu=native";
NIX_CFLAGS_COMPILE = "-march=native -mtune=native";
buildAndCheckFeatures = [
"winit_wayland"
"winit_x11"
];
postInstall = ''
wrapProgram $out/bin/krokiet \
--prefix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath runtimeLibs}
RUSTFLAGS = "-C target-cpu=native";
NIX_CFLAGS_COMPILE = "-march=native -mtune=native";
install -Dm444 -t $out/share/applications data/io.github.qarmin.krokiet.desktop
postInstall = ''
wrapProgram $out/bin/krokiet \
--prefix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath runtimeLibs}
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/io.github.qarmin.krokiet.svg \
install -Dm444 -t $out/share/applications data/io.github.qarmin.krokiet.desktop
install -Dm444 -t $out/share/metainfo data/io.github.qarmin.krokiet.metainfo.xml
'';
};
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/io.github.qarmin.krokiet.svg \
install -Dm444 -t $out/share/metainfo data/io.github.qarmin.krokiet.metainfo.xml
'';
};
};
}

21
common/flakes/fet/flake.nix
View File

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

3
common/hardware-configuration.nix
View File

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

3
common/modules/attic.nix
View File

@@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
nix.settings = {
substituters = [
"https://attic.awroo.fun/my-config"

3
common/modules/default.nix
View File

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

3
common/modules/flatpak.nix
View File

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

3
common/modules/gnome.nix
View File

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

7
common/modules/home/dconf/apps.nix
View File

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

3
common/modules/home/dconf/default.nix
View File

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

7
common/modules/home/dconf/extensions.nix
View File

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

19
common/modules/home/dconf/gnome.nix
View File

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

3
common/modules/home/default.nix
View File

@@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./dconf
./desktop-files.nix

3
common/modules/home/desktop-files.nix
View File

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

3
common/modules/home/starship.nix
View File

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

3
common/modules/home/zsh.nix
View File

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

16
common/modules/packages.nix
View File

@@ -6,8 +6,7 @@
solaar-master,
fet,
...
}:
{
}: {
nixpkgs = {
config = {
allowUnfree = true;
@@ -153,12 +152,13 @@
vkbasalt
vlc
(vscode.fhsWithPackages (
ps: with ps; [
python3
zlib
gcc
gnumake
]
ps:
with ps; [
python3
zlib
gcc
gnumake
]
))
webp-pixbuf-loader
wev

5
common/modules/programs.nix
View File

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

5
common/modules/services.nix
View File

@@ -3,13 +3,14 @@
pkgs,
lib,
...
}:
{
}: {
services = {
sshd.enable = true;
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
blueman.enable = true;
geoclue2.enable = true;
xserver = {

3
desktop/default.nix
View File

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

9
desktop/hardware-configuration.nix
View File

@@ -7,15 +7,14 @@
pkgs,
modulesPath,
...
}:
{
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot = {
initrd = {
kernelModules = [ ];
kernelModules = [];
verbose = false;
availableKernelModules = [
"nvme"
@@ -36,7 +35,7 @@
pkgs.linuxKernel.packages.linux_xanmod_latest.zenpower
];
blacklistedKernelModules = [ "k10temp" ];
blacklistedKernelModules = ["k10temp"];
kernelParams = [
"amdgpu.seamless=1"
@@ -180,7 +179,7 @@
];
};
swapDevices = [ ];
swapDevices = [];
# 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

3
desktop/modules/default.nix
View File

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

3
desktop/modules/flatpak.nix
View File

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

6
desktop/modules/gdm-monitors.nix
View File

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

3
desktop/modules/gnome.nix
View File

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

5
desktop/modules/home/dconf/apps.nix
View File

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

3
desktop/modules/home/dconf/default.nix
View File

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

5
desktop/modules/home/dconf/extensions.nix
View File

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

3
desktop/modules/home/dconf/gnome.nix
View File

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

3
desktop/modules/home/default.nix
View File

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

3
desktop/modules/packages.nix
View File

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

3
desktop/modules/programs.nix
View File

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

3
desktop/modules/services.nix
View File

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

3
desktop/modules/vm.nix
View File

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

30
flake.lock generated
View File

@@ -19,11 +19,11 @@
"czkawka-src": {
"flake": false,
"locked": {
"lastModified": 1773724747,
"narHash": "sha256-wXiP4t5fQlAVrpZyJcIhUJ1Mdjn94eUaAOR4b08cWAI=",
"lastModified": 1774297847,
"narHash": "sha256-iEgM0Wjhyy2H6HxnqY7YDAHiuDIUaw5rmsE1Zsij/nk=",
"owner": "qarmin",
"repo": "czkawka",
"rev": "28ae8bae1ebe9858b395364386aefba6bcd40c45",
"rev": "7680c07130f7bbfb5019e328362eaaebdce7aece",
"type": "github"
},
"original": {
@@ -95,11 +95,11 @@
]
},
"locked": {
"lastModified": 1774210133,
"narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=",
"lastModified": 1774371786,
"narHash": "sha256-ag1HUJv0SDBqKAYxwWlvAE2gBsEk3XYFvWtmdAHFz7E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95",
"rev": "b8cb89f2c4f7006b17b4aa5d8b39b95b93b559d8",
"type": "github"
},
"original": {
@@ -147,11 +147,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1773821835,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"lastModified": 1774106199,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github"
},
"original": {
@@ -163,11 +163,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1773821835,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"lastModified": 1774106199,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github"
},
"original": {
@@ -179,11 +179,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1774235121,
"narHash": "sha256-CzpSER+YKq4yD+RPom6Su9c/4FutF+sD4rEnls+4MyM=",
"lastModified": 1774321912,
"narHash": "sha256-Nna0UkHU2xmhyx0VAel4DDdwpAlA70ZgzAtOD4m3Pc8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1116aed2cee959f7d054a462458513ad323b710a",
"rev": "b0d3faa43b2bd4cc22fdf98ee00cac4f2f47ac8a",
"type": "github"
},
"original": {

107
flake.nix
View File

@@ -11,65 +11,62 @@
fet.url = "path:./common/flakes/fet";
};
outputs =
{
self,
nixpkgs,
nix-flatpak,
home-manager,
...
}@inputs:
let
specialArgs = { inherit (inputs) czkawka-master fet; };
in
{
nixosConfigurations = {
epiquev2 = nixpkgs.lib.nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
./common
./desktop
nix-flatpak.nixosModules.nix-flatpak
outputs = {
self,
nixpkgs,
nix-flatpak,
home-manager,
...
} @ inputs: let
specialArgs = {inherit (inputs) czkawka-master fet;};
in {
nixosConfigurations = {
epiquev2 = nixpkgs.lib.nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
./common
./desktop
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.jax = {
imports = [
./common/modules/home
./desktop/modules/home
];
};
home-manager.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.jax = {
imports = [
./common/modules/home
./desktop/modules/home
];
};
}
];
};
};
}
];
};
dalaptop = nixpkgs.lib.nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
./common
./laptop
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.jax = {
imports = [
./common/modules/home
./laptop/modules/home
];
};
dalaptop = nixpkgs.lib.nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
./common
./laptop
nix-flatpak.nixosModules.nix-flatpak
home-manager.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.jax = {
imports = [
./common/modules/home
./laptop/modules/home
];
};
}
];
};
};
}
];
};
};
};
}

3
laptop/default.nix
View File

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

9
laptop/hardware-configuration.nix
View File

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

3
laptop/modules/default.nix
View File

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

3
laptop/modules/flatpak.nix
View File

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

3
laptop/modules/gnome.nix
View File

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

3
laptop/modules/home/dconf/apps.nix
View File

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

3
laptop/modules/home/dconf/default.nix
View File

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

5
laptop/modules/home/dconf/extensions.nix
View File

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

3
laptop/modules/home/dconf/gnome.nix
View File

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

3
laptop/modules/home/default.nix
View File

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

3
laptop/modules/packages.nix
View File

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

3
laptop/modules/programs.nix
View File

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

5
laptop/modules/services.nix
View File

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