Compare commits
No commits in common. "02923d376f19879528e2f05873cb8ed9aa038166" and "565dfc28d7f17819d687b9e75108cbac587123c8" have entirely different histories.
02923d376f
...
565dfc28d7
7 changed files with 42 additions and 132 deletions
13
README.md
13
README.md
|
|
@ -47,6 +47,16 @@ nix = {
|
|||
auto-optimise-store = true;
|
||||
};
|
||||
|
||||
registry = {
|
||||
nixpkgs = {
|
||||
flake = inputs.nixpkgs;
|
||||
};
|
||||
};
|
||||
|
||||
nixPath = [
|
||||
"nixpkgs=${inputs.nixpkgs.outPath}"
|
||||
];
|
||||
|
||||
gc = {
|
||||
automatic = true;
|
||||
options = "--delete-older-than 7d";
|
||||
|
|
@ -54,9 +64,6 @@ nix = {
|
|||
};
|
||||
```
|
||||
|
||||
### GUI Notes
|
||||
- Look into `nixpkgs#eww`
|
||||
|
||||
### Information Backups:
|
||||
```bash
|
||||
$ sudo nix-channel --list
|
||||
|
|
|
|||
40
flake.lock
40
flake.lock
|
|
@ -104,11 +104,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726440980,
|
||||
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
|
||||
"lastModified": 1725180166,
|
||||
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
|
||||
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -130,11 +130,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726342126,
|
||||
"narHash": "sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0=",
|
||||
"lastModified": 1725228396,
|
||||
"narHash": "sha256-QBXwqyPuHUKBiuyzHBxqH/MpjPY9DQiY2M81P2t6b/0=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "727258241fc0b3c02691b72302d2c3092baca275",
|
||||
"revCount": 16244,
|
||||
"rev": "02eb07cfd539c34c080cb1baf042e5e780c1fcc2",
|
||||
"revCount": 16214,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
|
@ -157,11 +157,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725836728,
|
||||
"narHash": "sha256-dCbHCwqrzcHlEsRilMX+KM3IfRV46ieGqDyAD3GgCSs=",
|
||||
"lastModified": 1723511483,
|
||||
"narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "353b25f0b6da5ede15206d416345a2ec4195b5c8",
|
||||
"revCount": 107,
|
||||
"rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
|
||||
"revCount": 106,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||
},
|
||||
|
|
@ -177,11 +177,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726449931,
|
||||
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
|
||||
"lastModified": 1725161148,
|
||||
"narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
|
||||
"rev": "32058e9138248874773630c846563b1a78ee7a5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -234,11 +234,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725882169,
|
||||
"narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=",
|
||||
"lastModified": 1725298871,
|
||||
"narHash": "sha256-+3GjkgCQ41dPiTc8egAs1vznQsj4w1+xE7RrDyXohLM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180",
|
||||
"rev": "e3328f01dcb99241ac5ae69d9ace84512acca340",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -250,11 +250,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1726243404,
|
||||
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
|
||||
"lastModified": 1725103162,
|
||||
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
|
||||
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
17
flake.nix
17
flake.nix
|
|
@ -379,8 +379,7 @@
|
|||
];
|
||||
};
|
||||
|
||||
/*
|
||||
nixps = nixpkgs.lib.nixosSystem {
|
||||
/* nixps = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./system/xps/configuration.nix
|
||||
|
|
@ -421,20 +420,6 @@
|
|||
*/
|
||||
};
|
||||
|
||||
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
|
||||
/*
|
||||
Some options:
|
||||
- nixpkgs.legacyPackages.x86_64-linux.alejandra
|
||||
- nixpkgs.legacyPackages.x86_64-linux.nixfmt-classic
|
||||
- nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style
|
||||
- nixpkgs.legacyPackages.x86_64-linux.treefmt
|
||||
- Didn't figure it out
|
||||
- Seems too... "Meh"
|
||||
|
||||
Related but not formatters:
|
||||
- nixpkgs.legacyPackages.x86_64-linux.deadnix
|
||||
*/
|
||||
|
||||
packages.x86_64-linux = {
|
||||
binaryobjectscanner = pkgs.callPackage ./home/packages/binaryobjectscanner/package.nix {};
|
||||
hactoolnet = pkgs.callPackage ./home/packages/hactoolnet/package.nix {};
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
{ nixpkgs }:
|
||||
{
|
||||
home.shellAliases = {
|
||||
# From Nix environment
|
||||
"7z" = "7zz";
|
||||
# "7zz" is from "nixpkgs#_7zz"
|
||||
"termbin" = "nc termbin.com 9999";
|
||||
# Alias that lets me upload text to https://termbin.com/
|
||||
# Mainly so I can lazily upload build logs.
|
||||
} // nixpkgs.lib.optionalAttrs (nixpkgs.lib.options ? wsl) {
|
||||
# From Windows "%PATH%"
|
||||
"adb" = "adb.exe";
|
||||
"caja" = "explorer.exe";
|
||||
|
|
@ -16,5 +8,12 @@
|
|||
"tailscale" = "tailscale.exe";
|
||||
"yt-dlp" = "yt-dlp.exe";
|
||||
"7zexe" = "/mnt/c/Program\\ Files/7-Zip/7z.exe";
|
||||
|
||||
# From Nix environment
|
||||
"7z" = "7zz";
|
||||
# "7zz" is from "nixpkgs#_7zz"
|
||||
"termbin" = "nc termbin.com 9999";
|
||||
# Alias that lets me upload text to https://termbin.com/
|
||||
# Mainly so I can lazily upload build logs.
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@ in
|
|||
pkgs.progress
|
||||
pkgs.pyrosimple
|
||||
pkgs.python3
|
||||
pkgs.python3Packages.nsz
|
||||
pkgs.quickbms
|
||||
pkgs.sshfs
|
||||
pkgs.unrar-wrapper
|
||||
|
|
@ -161,8 +162,6 @@ in
|
|||
pkgs.nixfmt-classic
|
||||
# nixfmt was renamed to nixfmt-classic.
|
||||
# The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style
|
||||
pkgs.python3Packages.nsz
|
||||
# Eh, don't want it in my current config.
|
||||
pkgs.p7zip
|
||||
# Replaced in favour of nixpkgs#_7zz
|
||||
pkgs.rclone
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
rom-properties,
|
||||
...
|
||||
}:
|
||||
{
|
||||
# Use PipeWire
|
||||
security.rtkit.enable = true;
|
||||
|
||||
# dconf
|
||||
programs.dconf.enable = true;
|
||||
|
||||
services = {
|
||||
# Use PipeWire
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
# Enable the X11 windowing system.
|
||||
xserver = {
|
||||
enable = true;
|
||||
xkb.layout = "us";
|
||||
};
|
||||
# Enable the Cinnamon Desktop Environment.
|
||||
cinnamon.apps.enable = true;
|
||||
|
||||
displayManager.lightdm.enable = true;
|
||||
desktopManager.cinnamon.enable = true;
|
||||
};
|
||||
|
||||
|
||||
# Fonts
|
||||
fonts = {
|
||||
enableDefaultPackages = false;
|
||||
packages = [
|
||||
# fonts.enableDefaultPackages
|
||||
pkgs.dejavu_fonts
|
||||
pkgs.freefont_ttf
|
||||
pkgs.gyre-fonts
|
||||
# TrueType substitutes for standard PostScript fonts
|
||||
pkgs.liberation_ttf
|
||||
pkgs.unifont
|
||||
pkgs.noto-fonts-color-emoji
|
||||
# fonts.enableDefaultPackages
|
||||
pkgs.unifont_upper
|
||||
pkgs.noto-fonts
|
||||
pkgs.noto-fonts-cjk-sans
|
||||
pkgs.corefonts
|
||||
];
|
||||
fontconfig.cache32Bit = true;
|
||||
};
|
||||
|
||||
# KDE6
|
||||
# Enable the KDE Desktop Environment.
|
||||
xdg.icons.enable = true;
|
||||
environment = {
|
||||
sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
systemPackages = [
|
||||
pkgs.kdePackages.sddm-kcm
|
||||
pkgs.kdePackages.audiocd-kio
|
||||
pkgs.kdePackages.skanpage
|
||||
pkgs.kdePackages.isoimagewriter
|
||||
pkgs.kdePackages.krdc # RDP
|
||||
# pkgs.kdePackages.neochat # Matrix
|
||||
pkgs.kdePackages.breeze-icons
|
||||
pkgs.kdePackages.discover # "KDE and Plasma resources management GUI"
|
||||
pkgs.kdePackages.partitionmanager # Partition Manager
|
||||
pkgs.exfatprogs
|
||||
pkgs.sublime4
|
||||
rom-properties.packages.x86_64-linux.rp_kde6
|
||||
# (rom-properties.packages.x86_64-linux.rp_kde6.overrideAttrs (oldAttrs: { patches = oldAttrs.patches ++ [ ../files/rp_larger_icons.diff ]; }))
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -37,13 +37,10 @@
|
|||
pkgs.unifont
|
||||
pkgs.noto-fonts-color-emoji
|
||||
# fonts.enableDefaultPackages
|
||||
pkgs.comic-mono
|
||||
pkgs.corefonts
|
||||
pkgs.inconsolata
|
||||
pkgs.monocraft
|
||||
pkgs.unifont_upper
|
||||
pkgs.noto-fonts
|
||||
pkgs.noto-fonts-cjk-sans
|
||||
pkgs.unifont_upper
|
||||
pkgs.corefonts
|
||||
];
|
||||
fonts.fontconfig.cache32Bit = true;
|
||||
# dconf
|
||||
|
|
|
|||
Loading…
Reference in a new issue