Compare commits
7 commits
a48d9ae8d0
...
1c18df5e48
Author | SHA1 | Date | |
---|---|---|---|
![]() |
1c18df5e48 | ||
![]() |
c0ab761c57 | ||
![]() |
6e06d9b37b | ||
![]() |
66030b48d7 | ||
![]() |
39349b53e9 | ||
![]() |
c3356f6e09 | ||
![]() |
946e320ea4 |
7 changed files with 50 additions and 40 deletions
28
flake.lock
generated
28
flake.lock
generated
|
@ -128,11 +128,11 @@
|
||||||
"zon2nix": "zon2nix"
|
"zon2nix": "zon2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757019746,
|
"lastModified": 1757111114,
|
||||||
"narHash": "sha256-C1JdR4w+1FKaW1mKDfYzmV1xhGBklaRrHtLwWsCrAKo=",
|
"narHash": "sha256-pf/XTuWIJWcEXb/hcZ30MV6Alpnz8iP9dF4v1YBFqMI=",
|
||||||
"owner": "ghostty-org",
|
"owner": "ghostty-org",
|
||||||
"repo": "ghostty",
|
"repo": "ghostty",
|
||||||
"rev": "8a2ab8ff210ab2c7f8d281ddfbc7316f8dcb9145",
|
"rev": "e4c3a56242c3e70366bdd8013537a8fed8f7a147",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -231,11 +231,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756801442,
|
"lastModified": 1757153783,
|
||||||
"narHash": "sha256-uNaSFIlyJRsvcMNoN7gxkhr7V6gORtQVUEfFQnwTdWQ=",
|
"narHash": "sha256-HtnGRQX7BCze1eNlcc5ejAMExPk4DSqBPh6j2Byov7E=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nh",
|
"repo": "nh",
|
||||||
"rev": "f3095b9f00092717a694f39a2723fb04e3f575e0",
|
"rev": "036c141e2f14fb481f12c4d1498bc5d03d9e1865",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -279,15 +279,15 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 315532800,
|
"lastModified": 1756875158,
|
||||||
"narHash": "sha256-1Ayx5AcA9t6riKWsuwLNI8x9SvLXKDOeBcfY4kZb0Zs=",
|
"narHash": "sha256-nDWEPoSmjN0P/NG9XntBijws0vwxnbeq+pKBLJGC0sA=",
|
||||||
"rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
|
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre855444.aaff8c16d7fc/nixexprs.tar.xz?rev=aaff8c16d7fc04991cac6245bee1baa31f72b1e1"
|
"url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre855242.d0fc30899600/nixexprs.tar.xz?rev=d0fc30899600b9b3466ddb260fd83deb486c32f1"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
|
@ -532,11 +532,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756999202,
|
"lastModified": 1757142986,
|
||||||
"narHash": "sha256-AiJDRmIt2DuMk2IlBPnMG52ghUI9+D1nO7JRBF2vnZ0=",
|
"narHash": "sha256-HB01usaR5wg5LK3lV6S7Za2x4AfKrNceOnun/mlpChk=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "369fbe5c53420b1a17295c5e85ea0dbe02fbcfbd",
|
"rev": "ed4bfefc49ef23e55b4f6e39d2e297a79f5ab2df",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
# Unstable nixpkgs, using the new Lockable HTTP Tarball protocol
|
# Unstable nixpkgs, using the new Lockable HTTP Tarball protocol
|
||||||
# https://github.com/NixOS/infra/pull/562.
|
# https://github.com/NixOS/infra/pull/562.
|
||||||
nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
|
nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
|
||||||
|
|
||||||
impermanence.url = "github:nix-community/impermanence";
|
impermanence.url = "github:nix-community/impermanence";
|
||||||
|
|
||||||
|
|
|
@ -42,9 +42,6 @@
|
||||||
mprocs
|
mprocs
|
||||||
mpv
|
mpv
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
nitch
|
|
||||||
obsidian
|
|
||||||
microfetch
|
|
||||||
nmap
|
nmap
|
||||||
pamixer
|
pamixer
|
||||||
pwvucontrol
|
pwvucontrol
|
||||||
|
|
|
@ -40,7 +40,6 @@
|
||||||
mpv
|
mpv
|
||||||
nautilus
|
nautilus
|
||||||
nicotine-plus
|
nicotine-plus
|
||||||
obsidian
|
|
||||||
oculante
|
oculante
|
||||||
pandoc
|
pandoc
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
@ -75,7 +74,6 @@
|
||||||
unzip
|
unzip
|
||||||
zip
|
zip
|
||||||
util-linux
|
util-linux
|
||||||
zed-editor
|
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,25 +16,25 @@ in
|
||||||
defaultPackages = [ ];
|
defaultPackages = [ ];
|
||||||
systemPackages =
|
systemPackages =
|
||||||
(with pkgs; [
|
(with pkgs; [
|
||||||
|
(lib.hiPrio pkgs.uutils-coreutils-noprefix)
|
||||||
asciinema
|
asciinema
|
||||||
atuin
|
atuin
|
||||||
bat
|
bat
|
||||||
bvi
|
bvi
|
||||||
cachix
|
cachix
|
||||||
calc
|
calc
|
||||||
|
comma
|
||||||
cpufetch
|
cpufetch
|
||||||
curlie
|
curlie
|
||||||
delta
|
delta
|
||||||
diff-so-fancy
|
diff-so-fancy
|
||||||
difftastic
|
difftastic
|
||||||
difftastic
|
|
||||||
dig
|
dig
|
||||||
direnv
|
direnv
|
||||||
dust
|
dust
|
||||||
element
|
element
|
||||||
entr
|
entr
|
||||||
eza
|
eza
|
||||||
eza
|
|
||||||
fd
|
fd
|
||||||
ffmpeg-full
|
ffmpeg-full
|
||||||
figlet
|
figlet
|
||||||
|
@ -49,23 +49,23 @@ in
|
||||||
iamb
|
iamb
|
||||||
imagemagick
|
imagemagick
|
||||||
inetutils
|
inetutils
|
||||||
inetutils
|
|
||||||
jq
|
jq
|
||||||
just
|
just
|
||||||
kondo
|
kondo
|
||||||
lazygit
|
lazygit
|
||||||
linuxHeaders
|
linuxHeaders
|
||||||
microfetch
|
microfetch
|
||||||
microfetch
|
|
||||||
mprocs
|
|
||||||
mprocs
|
mprocs
|
||||||
neofetch
|
neofetch
|
||||||
nmap
|
nixfmt
|
||||||
nmap
|
nmap
|
||||||
ouch
|
ouch
|
||||||
procs
|
procs
|
||||||
pv
|
pv
|
||||||
ripgrep
|
python3
|
||||||
|
radare2
|
||||||
|
radicle-node
|
||||||
|
radicle-tui
|
||||||
ripgrep
|
ripgrep
|
||||||
rsync
|
rsync
|
||||||
sd
|
sd
|
||||||
|
@ -79,28 +79,18 @@ in
|
||||||
timg
|
timg
|
||||||
tokei
|
tokei
|
||||||
trash-cli
|
trash-cli
|
||||||
|
ty
|
||||||
universal-android-debloater
|
universal-android-debloater
|
||||||
unzip
|
unzip
|
||||||
util-linux
|
util-linux
|
||||||
|
uv
|
||||||
w3m
|
w3m
|
||||||
watchman
|
watchman
|
||||||
wget
|
wget
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
yazi
|
yazi
|
||||||
zed-editor
|
|
||||||
zip
|
|
||||||
zip
|
zip
|
||||||
zoxide
|
zoxide
|
||||||
(lib.hiPrio pkgs.uutils-coreutils-noprefix)
|
|
||||||
zoxide
|
|
||||||
nixfmt
|
|
||||||
radare2
|
|
||||||
uv
|
|
||||||
ty
|
|
||||||
python3
|
|
||||||
comma
|
|
||||||
radicle-node
|
|
||||||
radicle-tui
|
|
||||||
])
|
])
|
||||||
++ [
|
++ [
|
||||||
nil
|
nil
|
||||||
|
|
19
modules/programs/gui/zedless.mod.nix
Normal file
19
modules/programs/gui/zedless.mod.nix
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
inherit (lib) getFlakePkg;
|
||||||
|
inherit (lib.lists) singleton;
|
||||||
|
inherit (lib.modules) mkIf;
|
||||||
|
|
||||||
|
inherit (config.meta.system) isWorkstation;
|
||||||
|
zedless = (getFlakePkg inputs.zedless).overrideAttrs {
|
||||||
|
doCheck = false;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
# environment.systemPackages = mkIf isWorkstation <| singleton zedless;
|
||||||
|
}
|
|
@ -31,6 +31,7 @@ in
|
||||||
|
|
||||||
nvidia = mkIf cfg.nvidia.enable {
|
nvidia = mkIf cfg.nvidia.enable {
|
||||||
open = mkDefault true;
|
open = mkDefault true;
|
||||||
|
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||||
|
|
||||||
# Whether to enable kernel modesetting when using the NVIDIA proprietary driver.
|
# Whether to enable kernel modesetting when using the NVIDIA proprietary driver.
|
||||||
# Enabling this causes the proprietary NVIDIA driver to provide its own
|
# Enabling this causes the proprietary NVIDIA driver to provide its own
|
||||||
|
@ -46,7 +47,12 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
finegrained = false;
|
finegrained = false;
|
||||||
};
|
};
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
|
||||||
|
prime = {
|
||||||
|
offload.enable = true;
|
||||||
|
intelBusId = "PCI:0:2:0";
|
||||||
|
nvidiaBusId = "PCI:1:0:0";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.xserver.videoDrivers = [
|
services.xserver.videoDrivers = [
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue