Compare commits

..

4 Commits

Author SHA1 Message Date
fd62c17426 updated nvim input 2026-07-03 21:38:23 +01:00
90c612bb57 enabled git-secret and gnupg 2026-07-02 08:55:28 +01:00
f08555296c added rocm drivers 2026-06-30 20:33:44 +01:00
44404e02a0 changed to alejandra for formatting 2026-06-28 13:55:43 +01:00
7 changed files with 255 additions and 224 deletions

View File

@@ -4,9 +4,7 @@
pkgs, pkgs,
inputs, inputs,
... ...
}: }: {
{
imports = [ imports = [
/etc/nixos/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
]; ];
@@ -50,6 +48,9 @@
}; };
}; };
# Set <nixpkgs> correctly
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
## Optimise Nix store on rebuild and collect garbage as a service ## Optimise Nix store on rebuild and collect garbage as a service
nix.optimise.automatic = true; nix.optimise.automatic = true;
nix.gc = { nix.gc = {
@@ -154,17 +155,13 @@
"docker" "docker"
"wheel" "wheel"
]; ];
packages = packages = with pkgs; let
with pkgs; input = {
let
input =
{
package, package,
output ? "default", output ? "default",
}: }:
inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output}; inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
wrap = wrap = {
{
name, name,
pkg, pkg,
modules, modules,
@@ -178,8 +175,7 @@
--prefix PATH : ${pkgs.lib.makeBinPath modules} --prefix PATH : ${pkgs.lib.makeBinPath modules}
''; '';
}; };
in in [
[
# Ricing # Ricing
## Desktop ## Desktop
bibata-cursors bibata-cursors
@@ -218,6 +214,7 @@
## Tools ## Tools
lazygit lazygit
git-secret
p7zip-rar p7zip-rar
any-nix-shell any-nix-shell
bluetui bluetui
@@ -305,7 +302,6 @@
# System Packages # System Packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Utilities # Utilities
inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default
vim vim
@@ -331,8 +327,11 @@
libnotify libnotify
gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
programs.gnupg.agent = {
enable = true;
pinentryPackage = pkgs.pinentry-all;
};
# The comment # The comment
system.stateVersion = "25.05"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

View File

@@ -4,9 +4,7 @@
pkgs, pkgs,
inputs, inputs,
... ...
}: }: {
{
networking.hostName = "mobile02"; # Define your hostname. networking.hostName = "mobile02"; # Define your hostname.
# Opengl and vulkan # Opengl and vulkan
@@ -48,5 +46,4 @@
}; };
programs.steam.enable = true; programs.steam.enable = true;
} }

View File

@@ -4,9 +4,7 @@
pkgs, pkgs,
inputs, inputs,
... ...
}: }: {
{
networking.hostName = "HACKSTATION"; networking.hostName = "HACKSTATION";
# Enable nix-ld to run unpatched binaries # Enable nix-ld to run unpatched binaries
@@ -30,10 +28,16 @@
extraPackages = with pkgs; [ extraPackages = with pkgs; [
libva-vdpau-driver libva-vdpau-driver
libvdpau-va-gl libvdpau-va-gl
rocmPackages.clr.icd
]; ];
enable32Bit = true; enable32Bit = true;
}; };
# For rOCM
systemd.tmpfiles.rules = [
"L+ /opt/rocm - - - - ${pkgs.rocmPackages.clr}"
];
hardware.amdgpu.opencl.enable = true; hardware.amdgpu.opencl.enable = true;
boot.kernelParams = [ boot.kernelParams = [

53
flake.lock generated
View File

@@ -798,11 +798,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1781074563, "lastModified": 1782467914,
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -813,6 +813,22 @@
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": {
"lastModified": 1780336545,
"narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1769170682, "lastModified": 1769170682,
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
@@ -851,14 +867,15 @@
}, },
"nvim-wrapped": { "nvim-wrapped": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6",
"wrappers": "wrappers"
}, },
"locked": { "locked": {
"lastModified": 1781453653, "lastModified": 1783103301,
"narHash": "sha256-5XhbIAdcoVblquSRVbg5HUnRni96ksMqzGNTEGSb3Cg=", "narHash": "sha256-EJ662Hh+r1AKh1MGFrN2QbrIMYTwu4Jb106BNyeMIZI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e46d931775275918876fcde65d03e4dcffa45efa", "rev": "7de01201e837d93ad3128719ad49162d4b900d5d",
"revCount": 83, "revCount": 92,
"type": "git", "type": "git",
"url": "file:///home/user01/.dotfiles/.config/nvim" "url": "file:///home/user01/.dotfiles/.config/nvim"
}, },
@@ -993,7 +1010,7 @@
}, },
"sls-steam": { "sls-steam": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1781157498, "lastModified": 1781157498,
@@ -1175,6 +1192,24 @@
"type": "github" "type": "github"
} }
}, },
"wrappers": {
"inputs": {
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1782135443,
"narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=",
"owner": "BirdeeHub",
"repo": "nix-wrapper-modules",
"rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f",
"type": "github"
},
"original": {
"owner": "BirdeeHub",
"repo": "nix-wrapper-modules",
"type": "github"
}
},
"wshowkeys": { "wshowkeys": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",

View File

@@ -51,31 +51,28 @@
}; };
}; };
outputs = outputs = {
{
self, self,
nixpkgs, nixpkgs,
... ...
}@inputs: } @ inputs: let
let
system = "x86_64-linux"; system = "x86_64-linux";
hardwareConfig = import /etc/nixos/hardware-configuration.nix; hardwareConfig = import /etc/nixos/hardware-configuration.nix;
common = import ./configs/common.nix; common = import ./configs/common.nix;
mkSystem = mkSystem = extraModules:
extraModules:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
modules = [ modules =
[
common common
hardwareConfig hardwareConfig
] ]
++ extraModules; ++ extraModules;
}; };
in in {
{
nixosConfigurations = { nixosConfigurations = {
mobile02 = mkSystem [./configs/configuration-laptop.nix]; mobile02 = mkSystem [./configs/configuration-laptop.nix];
hackstation = mkSystem [ hackstation = mkSystem [

View File

@@ -5,9 +5,10 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
}; };
outputs = outputs = {
{ self, nixpkgs }: self,
let nixpkgs,
}: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs {inherit system;}; pkgs = import nixpkgs {inherit system;};
@@ -55,8 +56,7 @@
"Development" "Development"
]; ];
}; };
in in {
{
# packages.${system}.default = chataigne-bin; # packages.${system}.default = chataigne-bin;
devShells.${system}.default = pkgs.mkShell { devShells.${system}.default = pkgs.mkShell {

View File

@@ -4,8 +4,7 @@
pkgs, pkgs,
inputs, inputs,
... ...
}: }: {
{
services.libinput.enable = true; services.libinput.enable = true;
services.displayManager.defaultSession = "hyprland"; services.displayManager.defaultSession = "hyprland";