flake update; switched many programs to stable

This commit is contained in:
Nickiel12 2023-09-21 10:37:37 -07:00
parent d8793e7bd9
commit 12eb601676
4 changed files with 93 additions and 35 deletions

View file

@ -191,6 +191,22 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1695283060,
"narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "31ed632c692e6a36cfc18083b88ece892f863ed4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1685801374, "lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
@ -327,7 +343,7 @@
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1694364351, "lastModified": 1694364351,
@ -349,6 +365,7 @@
"kmonad": "kmonad", "kmonad": "kmonad",
"nicks_nextcloud_integrations": "nicks_nextcloud_integrations", "nicks_nextcloud_integrations": "nicks_nextcloud_integrations",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable",
"nixvim": "nixvim" "nixvim": "nixvim"
} }
}, },

View file

@ -4,10 +4,10 @@
inputs = { inputs = {
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/release-23.05";
kmonad.url = "github:kmonad/kmonad?dir=nix"; kmonad.url = "github:kmonad/kmonad?dir=nix";
nicks_nextcloud_integrations.url = "git+https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git"; nicks_nextcloud_integrations.url = "git+https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git";
# dead code?
home-manager = { home-manager = {
url = github:nix-community/home-manager; url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -16,24 +16,29 @@
}; };
outputs = inputs@{ self, nixpkgs, home-manager, kmonad, ... }: outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, kmonad, ... }:
let let
user = "nixolas"; user = "nixolas";
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in {
nixosConfigurations = { nixosConfigurations = {
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
inherit inputs nixpkgs home-manager user kmonad; inherit inputs home-manager user kmonad;
# Home server # Home server
Alaska = lib.nixosSystem { Alaska = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit user; }; specialArgs = {
inherit user;
pkgs-stable = inputs.nixpkgs-stable;
};
modules = [ modules = [
inputs.nicks_nextcloud_integrations.nixosModules.default inputs.nicks_nextcloud_integrations.nixosModules.default
@ -46,7 +51,13 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit user; }; extraSpecialArgs = {
inherit user;
pkgs-stable = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
};
users.${user} = { users.${user} = {
imports = [ imports = [
(import ./users/${user}.nix) (import ./users/${user}.nix)
@ -61,7 +72,9 @@
NicksNixLaptop = lib.nixosSystem { NicksNixLaptop = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit user; }; specialArgs = {
inherit user;
};
modules = [ modules = [
{ {
@ -75,7 +88,13 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit user; }; extraSpecialArgs = {
inherit user;
pkgs-stable = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
};
users.${user} = { users.${user} = {
imports = [ imports = [
(import ./users/${user}.nix) (import ./users/${user}.nix)
@ -105,7 +124,13 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit user; }; extraSpecialArgs = {
inherit user;
pkgs-stable = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
};
users.${user} = { users.${user} = {
imports = [ imports = [
(import ./users/${user}.nix) (import ./users/${user}.nix)

17
modules/yazi.nix Normal file
View file

@ -0,0 +1,17 @@
{ config, lib, pkgs, home-manager, ... }:
{
programs.yazi = {
enable = true;
enableZshIntegration = true;
settings = {
sort_by = "natural";
sort_sensitive = false;
sort_dir_first = true;
show_hidden = true;
show_symlink = true;
};
};
}

View file

@ -1,4 +1,4 @@
{ inputs, config, pkgs, user, ... }: { inputs, config, pkgs, pkgs-stable, user, ... }:
let let
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz); moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
@ -26,6 +26,7 @@ in
../modules/rofi.nix ../modules/rofi.nix
../modules/wezterm.nix ../modules/wezterm.nix
../modules/xdg.nix ../modules/xdg.nix
../modules/yazi.nix
../modules/zsh.nix ../modules/zsh.nix
]; ];
@ -77,48 +78,45 @@ in
bottom # system monitor bottom # system monitor
du-dust # directory disk-space analyzer du-dust # directory disk-space analyzer
ffmpeg-full # ffmpeg for video/audio rendering ffmpeg-full # ffmpeg for video/audio rendering
frei0r # kdenlive video plugins pkgs-stable.frei0r # kdenlive video plugins
flameshot # screenshot utility pkgs-stable.flameshot # screenshot utility
fontpreview # utility to preview fonts pkgs-stable.fontpreview # utility to preview fonts
gitui # command line git tui gitui # command line git tui
helvum # audio sink gui control pkgs-stable.helvum # audio sink gui control
pandoc # utility for converting between document types pkgs-stable.pandoc # utility for converting between document types
qmk # QMK utility for compiling qmk firmware pkgs-stable.qmk # QMK utility for compiling qmk firmware
nextcloud-client # Nextcloud private syncing nextcloud-client # Nextcloud private syncing
hddtemp hddtemp
texlive.combined.scheme-medium pkgs-stable.texlive.combined.scheme-medium
# commandline utils # commandline utils
eza eza
fd fd
fortune fortune
neofetch neofetch
pandoc
pfetch pfetch
ripgrep
rmtrash rmtrash
testdisk # file recovery https://itsfoss.com/recover-deleted-files-linux/ testdisk # file recovery https://itsfoss.com/recover-deleted-files-linux/
xdotool xdotool
yazi pkgs-stable.vhs
vhs
nodejs # required for coc-nvim pkgs-stable.nodejs # required for coc-nvim
# Gui application # Gui application
darktable # RAW processing pkgs-stable.darktable # RAW processing
dbeaver # SQL management tool pkgs-stable.dbeaver # SQL management tool
firefox # Internet access firefox # Internet access
handbrake # dvd ripping pkgs-stable.handbrake # dvd ripping
inkscape # Vector drawing pkgs-stable.inkscape # Vector drawing
kicad # PCB design pkgs-stable.kicad # PCB design
krita # Raster drawing krita # Raster drawing
libreoffice-fresh # Office editing pkgs-stable.libreoffice-fresh # Office editing
makemkv # blue-ray + dvd -> mkv pkgs-stable.makemkv # blue-ray + dvd -> mkv
obsidian # Markdown and notes pkgs-stable.obsidian # Markdown and notes
qalculate-gtk # unit-friendly calculator qalculate-gtk # unit-friendly calculator
vscodium # when vim and emacs (somehow) isn't enough pkgs-stable.vscodium # when vim and emacs (somehow) isn't enough
dragon # simple audio player pkgs-stable.dragon # simple audio player
obs-studio # for video recording and virtual camera obs-studio # for video recording and virtual camera
libsForQt5.kate # kate/kwrite libsForQt5.kate # kate/kwrite
@ -128,9 +126,9 @@ in
libsForQt5.soundkonverter # audio cd ripping libsForQt5.soundkonverter # audio cd ripping
# Kdenlive and deps # Kdenlive and deps
libsForQt5.kdenlive pkgs-stable.libsForQt5.kdenlive
mediainfo pkgs-stable.mediainfo
mlt pkgs-stable.mlt
# Drawing tablet driver # Drawing tablet driver
opentabletdriver opentabletdriver
@ -138,6 +136,7 @@ in
sessionVariables = { sessionVariables = {
NIX_SHELL_PRESERVE_PROMPT = 1; NIX_SHELL_PRESERVE_PROMPT = 1;
EDITOR = "nvim";
}; };
}; };