Compare commits
5 Commits
e7b1f5acaf
...
90c612bb57
| Author | SHA1 | Date | |
|---|---|---|---|
| 90c612bb57 | |||
| f08555296c | |||
| 44404e02a0 | |||
| 65e5fd2d99 | |||
| ddb1d3c8d2 |
@@ -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,32 +155,27 @@
|
|||||||
"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,
|
||||||
}:
|
}:
|
||||||
pkgs.symlinkJoin {
|
pkgs.symlinkJoin {
|
||||||
inherit name;
|
inherit name;
|
||||||
paths = [ pkg ];
|
paths = [pkg];
|
||||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
nativeBuildInputs = [pkgs.makeWrapper];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
wrapProgram $out/bin/${name} \
|
wrapProgram $out/bin/${name} \
|
||||||
--prefix PATH : ${pkgs.lib.makeBinPath modules}
|
--prefix PATH : ${pkgs.lib.makeBinPath modules}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in [
|
||||||
[
|
|
||||||
# Ricing
|
# Ricing
|
||||||
## Desktop
|
## Desktop
|
||||||
bibata-cursors
|
bibata-cursors
|
||||||
@@ -207,7 +203,7 @@
|
|||||||
jq
|
jq
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
(input { package = "fsel"; })
|
(input {package = "fsel";})
|
||||||
|
|
||||||
# Terminal
|
# Terminal
|
||||||
## Styling / Functionality
|
## Styling / Functionality
|
||||||
@@ -218,6 +214,7 @@
|
|||||||
|
|
||||||
## Tools
|
## Tools
|
||||||
lazygit
|
lazygit
|
||||||
|
git-secret
|
||||||
p7zip-rar
|
p7zip-rar
|
||||||
any-nix-shell
|
any-nix-shell
|
||||||
bluetui
|
bluetui
|
||||||
@@ -240,6 +237,7 @@
|
|||||||
syncthing
|
syncthing
|
||||||
jellyfin-tui
|
jellyfin-tui
|
||||||
devenv
|
devenv
|
||||||
|
nix-output-monitor
|
||||||
|
|
||||||
# Apps
|
# Apps
|
||||||
## Actual Useful Stuff
|
## Actual Useful Stuff
|
||||||
@@ -282,7 +280,7 @@
|
|||||||
programs = {
|
programs = {
|
||||||
dconf.enable = true;
|
dconf.enable = true;
|
||||||
xfconf.enable = true;
|
xfconf.enable = true;
|
||||||
gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; # For wlogout svgs
|
gdk-pixbuf.modulePackages = [pkgs.librsvg]; # For wlogout svgs
|
||||||
};
|
};
|
||||||
|
|
||||||
## User Services
|
## User Services
|
||||||
@@ -300,11 +298,10 @@
|
|||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
nerd-fonts.fira-mono
|
nerd-fonts.fira-mono
|
||||||
];
|
];
|
||||||
fonts.fontconfig.defaultFonts.serif = [ "Fira Mono Nerd Font" ];
|
fonts.fontconfig.defaultFonts.serif = ["Fira Mono Nerd Font"];
|
||||||
|
|
||||||
# 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
|
||||||
@@ -330,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?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -36,7 +34,7 @@
|
|||||||
|
|
||||||
# Local User
|
# Local User
|
||||||
users.users.user01 = {
|
users.users.user01 = {
|
||||||
extraGroups = [ ];
|
extraGroups = [];
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# Ricing
|
# Ricing
|
||||||
inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges
|
inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges
|
||||||
@@ -48,5 +46,4 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 = [
|
||||||
@@ -128,6 +132,7 @@
|
|||||||
ffmpeg
|
ffmpeg
|
||||||
inputs.norgolith.packages.${pkgs.stdenv.hostPlatform.system}.default
|
inputs.norgolith.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||||
inputs.cracked-davinci.packages.${pkgs.stdenv.hostPlatform.system}.default
|
inputs.cracked-davinci.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||||
|
inputs.woomer.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||||
|
|
||||||
# wine
|
# wine
|
||||||
wineWow64Packages.stable
|
wineWow64Packages.stable
|
||||||
|
|||||||
87
flake.lock
generated
87
flake.lock
generated
@@ -84,6 +84,21 @@
|
|||||||
"url": "https://git.voidarc.co.uk/voidarc/nixos.davinci"
|
"url": "https://git.voidarc.co.uk/voidarc/nixos.davinci"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"crane": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1781825982,
|
||||||
|
"narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=",
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"doot": {
|
"doot": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"doot-src": "doot-src",
|
"doot-src": "doot-src",
|
||||||
@@ -233,6 +248,24 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils_4": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_7"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"fsel": {
|
"fsel": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
@@ -765,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": {
|
||||||
@@ -821,11 +854,11 @@
|
|||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1781453653,
|
"lastModified": 1782650144,
|
||||||
"narHash": "sha256-5XhbIAdcoVblquSRVbg5HUnRni96ksMqzGNTEGSb3Cg=",
|
"narHash": "sha256-E6SKjvY6Vz2mRok6ml8Dm4lMgUyfgtwHgwLlo93SLpI=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "e46d931775275918876fcde65d03e4dcffa45efa",
|
"rev": "45739fc4cf0ba3cdefab6593a0d629b637bb341a",
|
||||||
"revCount": 83,
|
"revCount": 88,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:///home/user01/.dotfiles/.config/nvim"
|
"url": "file:///home/user01/.dotfiles/.config/nvim"
|
||||||
},
|
},
|
||||||
@@ -916,6 +949,7 @@
|
|||||||
"otter-launcher": "otter-launcher",
|
"otter-launcher": "otter-launcher",
|
||||||
"sls-steam": "sls-steam",
|
"sls-steam": "sls-steam",
|
||||||
"way-edges": "way-edges",
|
"way-edges": "way-edges",
|
||||||
|
"woomer": "woomer",
|
||||||
"wshowkeys": "wshowkeys"
|
"wshowkeys": "wshowkeys"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1065,6 +1099,21 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_7": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
@@ -1104,9 +1153,31 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"woomer": {
|
||||||
|
"inputs": {
|
||||||
|
"crane": "crane",
|
||||||
|
"flake-utils": "flake-utils_3",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1782507996,
|
||||||
|
"narHash": "sha256-hO+SIA6Q41hiwZBFGHBjkOsRQFUcO0SbJqmYeyy2sfM=",
|
||||||
|
"owner": "voidarclabs",
|
||||||
|
"repo": "woomer",
|
||||||
|
"rev": "572844bdae8dded0bbad9e23ca354dcd857f6b98",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "voidarclabs",
|
||||||
|
"repo": "woomer",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"wshowkeys": {
|
"wshowkeys": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
|||||||
23
flake.nix
23
flake.nix
@@ -10,6 +10,10 @@
|
|||||||
|
|
||||||
# Apps
|
# Apps
|
||||||
sls-steam.url = "github:AceSLS/SLSsteam";
|
sls-steam.url = "github:AceSLS/SLSsteam";
|
||||||
|
woomer = {
|
||||||
|
url = "github:voidarclabs/woomer";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
chataigne.url = "./modules/chataigne";
|
chataigne.url = "./modules/chataigne";
|
||||||
norgolith = {
|
norgolith = {
|
||||||
url = "github:NTBBloodbath/norgolith";
|
url = "github:NTBBloodbath/norgolith";
|
||||||
@@ -47,33 +51,30 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
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 [
|
||||||
./configs/configuration-pc.nix
|
./configs/configuration-pc.nix
|
||||||
# ./modules/davinci/davinci.nix
|
# ./modules/davinci/davinci.nix
|
||||||
|
|||||||
@@ -5,11 +5,12 @@
|
|||||||
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;};
|
||||||
|
|
||||||
# The libraries you requested
|
# The libraries you requested
|
||||||
deps = with pkgs; [
|
deps = with pkgs; [
|
||||||
@@ -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 {
|
||||||
|
|||||||
@@ -4,8 +4,7 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
services.libinput.enable = true;
|
services.libinput.enable = true;
|
||||||
|
|
||||||
services.displayManager.defaultSession = "hyprland";
|
services.displayManager.defaultSession = "hyprland";
|
||||||
|
|||||||
Reference in New Issue
Block a user