winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat!: use nixpkgs-unstable everywhere

Browse source
This commit is contained in:
winston 2023-04-27 09:30:26 +02:00
parent ecf2f4e8a5
commit 1ab9928075
Signed by: winston
GPG key ID: 3786770EDBC2B481
17 changed files with 44 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
flake.lock
View file

@ -3,7 +3,7 @@
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -113,11 +113,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682419509, "lastModified": 1682535786,
"narHash": "sha256-+/HI3RbJcEKQ5+55dECzh8geginsbabsA0R3ORKi2Us=", "narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6142193635ecdafb9a231bd7d1880b9b7b210d19", "rev": "d82c9af8175878a461a0fdf914e67cc446664570",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,7 +212,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1682109806, "lastModified": 1682109806,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
@ -228,22 +228,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1682303062,
"narHash": "sha256-x+KAADp27lbxeoPXLUMxKcRsUUHDlg+qVjt5PjgBw9A=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f5364316e314436f6b9c8fd50592b18920ab18f9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1681303793, "lastModified": 1681303793,
@ -294,11 +278,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1682469450, "lastModified": 1682576338,
"narHash": "sha256-3p5eZJyLomaFjz718SWV9anj0uezvotHZArU9wuE1so=", "narHash": "sha256-+I4oXCpugPSaZ7SKI35OLSF/hy+rlZ/iNOGvcjqM2h4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "f21610e763905caad115f26d6c4e1e09ca6a5158", "rev": "342c8e2c9e72b2c3f6bd18f491e5b8bf7d5fcd9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -337,7 +321,6 @@
"nekowinston-nur": "nekowinston-nur", "nekowinston-nur": "nekowinston-nur",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"sops": "sops", "sops": "sops",
@ -350,11 +333,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1682338428, "lastModified": 1682539132,
"narHash": "sha256-T7AL/Us6ecxowjMAlO77GETTQO2SO+1XX2+Y/OSfHk8=", "narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "7c8e9727a2ecf9994d4a63d577ad5327e933b6a4", "rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
flake.nix
View file

@ -2,12 +2,10 @@
description = "nekowinston's hm flake"; description = "nekowinston's hm flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
darwin = { darwin = {
url = "github:lnl7/nix-darwin"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -34,7 +32,6 @@
nekowinston-nur, nekowinston-nur,
nix-index-database, nix-index-database,
nixpkgs, nixpkgs,
nixpkgs-unstable,
nur, nur,
pre-commit-hooks, pre-commit-hooks,
sops, sops,
@ -42,16 +39,12 @@
... ...
}: let }: let
overlays = final: prev: { overlays = final: prev: {
unstable = import nixpkgs-unstable {
system = prev.system;
config.allowUnfree = true;
};
nur = import nur { nur = import nur {
nurpkgs = prev; nurpkgs = prev;
pkgs = prev; pkgs = prev;
repoOverrides = { repoOverrides = {
nekowinston = import nekowinston-nur { nekowinston = import nekowinston-nur {
pkgs = import nixpkgs-unstable {system = prev.system;}; pkgs = import nixpkgs {system = prev.system;};
}; };
}; };
}; };
@ -129,7 +122,7 @@
}; };
homeConfigurations.winston = let homeConfigurations.winston = let
system = "aarch64-linux"; system = "aarch64-linux";
pkgs = import nixpkgs-unstable { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };

8
home/apps/gpg.nix
View file

@ -9,7 +9,7 @@
mailvelopeConfig = builtins.toJSON { mailvelopeConfig = builtins.toJSON {
name = "gpgmejson"; name = "gpgmejson";
description = "JavaScript binding for GnuPG"; description = "JavaScript binding for GnuPG";
path = pkgs.unstable.gpgme.dev + /bin/gpgme-json; path = pkgs.gpgme.dev + /bin/gpgme-json;
type = "stdio"; type = "stdio";
allowed_extensions = ["jid1-AQqSMBYb0a8ADg@jetpack"]; allowed_extensions = ["jid1-AQqSMBYb0a8ADg@jetpack"];
}; };
@ -18,9 +18,9 @@ in {
gnupg-pkcs11-scd gnupg-pkcs11-scd
pcsclite pcsclite
pinentry pinentry
unstable.git-credential-gopass git-credential-gopass
unstable.gopass gopass
unstable.gopass-jsonapi gopass-jsonapi
yubikey-personalization yubikey-personalization
]; ];

4
home/apps/i3.nix
View file

@ -41,7 +41,7 @@
modFocus = "${mod}+Ctrl"; modFocus = "${mod}+Ctrl";
hyper = "Mod4+Mod1+Shift+Ctrl"; hyper = "Mod4+Mod1+Shift+Ctrl";
gopass = lib.getExe pkgs.unstable.gopass; gopass = lib.getExe pkgs.gopass;
rofi = lib.getExe config.programs.rofi.package; rofi = lib.getExe config.programs.rofi.package;
thunar = lib.getExe pkgs.xfce.thunar; thunar = lib.getExe pkgs.xfce.thunar;
xargs = "${lib.getExe pkgs.findutils}/bin/xargs"; xargs = "${lib.getExe pkgs.findutils}/bin/xargs";
@ -442,7 +442,7 @@ in {
scriptPath = "${config.xdg.cacheHome}/X11/xsession"; scriptPath = "${config.xdg.cacheHome}/X11/xsession";
windowManager.i3 = { windowManager.i3 = {
enable = true; enable = true;
package = pkgs.unstable.i3; package = pkgs.i3;
config = config =
commonConfig {wayland = false;} commonConfig {wayland = false;}
// { // {

2
home/apps/kubernetes.nix
View file

@ -3,7 +3,7 @@
pkgs, pkgs,
... ...
}: { }: {
home.packages = with pkgs.unstable; [ home.packages = with pkgs; [
cmctl cmctl
dyff dyff
gojq gojq

4
home/apps/music.nix
View file

@ -66,7 +66,7 @@ in {
} }
''); '');
in { in {
ProgramArguments = ["${pkgs.unstable.mpd}/bin/mpd" "--no-daemon" "${mpdConf}"]; ProgramArguments = ["${pkgs.mpd}/bin/mpd" "--no-daemon" "${mpdConf}"];
KeepAlive = true; KeepAlive = true;
RunAtLoad = true; RunAtLoad = true;
StandardErrorPath = "${config.xdg.cacheHome}/mpd.log"; StandardErrorPath = "${config.xdg.cacheHome}/mpd.log";
@ -74,7 +74,7 @@ in {
}; };
}; };
#home.packages = lib.mkIf isLinux [pkgs.unstable.cider]; #home.packages = lib.mkIf isLinux [pkgs.cider];
launchd.agents.discord-applemusic-rich-presence = { launchd.agents.discord-applemusic-rich-presence = {
enable = true; enable = true;

2
home/apps/neovim.nix
View file

@ -14,7 +14,7 @@
withNodeJs = true; withNodeJs = true;
extraPackages = with pkgs.unstable; [ extraPackages = with pkgs; [
# external deps # external deps
fd fd
ripgrep ripgrep

2
home/apps/rice.nix
View file

@ -18,7 +18,7 @@ in {
}; };
theme = { theme = {
name = "Catppuccin-Mocha-Standard-Pink-Dark"; name = "Catppuccin-Mocha-Standard-Pink-Dark";
package = pkgs.unstable.catppuccin-gtk.override { package = pkgs.catppuccin-gtk.override {
accents = ["pink"]; accents = ["pink"];
variant = "mocha"; variant = "mocha";
}; };

4
home/apps/vscode.nix
View file

@ -9,8 +9,8 @@
in { in {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.unstable.vscode; package = pkgs.vscode;
extensions = with pkgs.unstable.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide jnoortheen.nix-ide
matklad.rust-analyzer matklad.rust-analyzer
mkhl.direnv mkhl.direnv

2
home/apps/wayland.nix
View file

@ -14,7 +14,7 @@ in {
programs.waybar = lib.mkIf isLinux { programs.waybar = lib.mkIf isLinux {
enable = true; enable = true;
package = pkgs.unstable.waybar; package = pkgs.waybar;
settings = [ settings = [
{ {
layer = "top"; layer = "top";

2
home/apps/zsh.nix
View file

@ -38,7 +38,7 @@ in {
starship = { starship = {
enable = true; enable = true;
package = pkgs.unstable.starship; package = pkgs.starship;
}; };
tealdeer = { tealdeer = {

18
home/default.nix
View file

@ -50,29 +50,29 @@ in {
mosh mosh
nur.repos.nekowinston.org-stats nur.repos.nekowinston.org-stats
(unstable.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
victor-mono victor-mono
ibm-plex ibm-plex
xkcd-font xkcd-font
wezterm wezterm
unstable.podman podman
unstable.podman-compose podman-compose
unstable.qemu qemu
] ]
++ lib.optionals isLinux [ ++ lib.optionals isLinux [
_1password-gui _1password-gui
#insomnia #insomnia
#mattermost-desktop #mattermost-desktop
neovide neovide
#unstable.jetbrains.webstorm #jetbrains.webstorm
#gnome.gnome-boxes #gnome.gnome-boxes
] ]
++ lib.optionals (isLinux && machine.personal) [ ++ lib.optionals (isLinux && machine.personal) [
nur.repos.nekowinston.discover-overlay nur.repos.nekowinston.discover-overlay
(unstable.discord.override {withOpenASAR = true;}) (discord.override {withOpenASAR = true;})
unstable.lutris lutris
unstable.heroic heroic
]); ]);
sessionVariables = lib.mkIf isDarwin { sessionVariables = lib.mkIf isDarwin {
@ -89,7 +89,7 @@ in {
taskwarrior.enable = true; taskwarrior.enable = true;
mangohud = { mangohud = {
enable = isLinux && machine.personal; enable = isLinux && machine.personal;
package = pkgs.unstable.mangohud; package = pkgs.mangohud;
}; };
zathura.enable = true; zathura.enable = true;
}; };

2
machines/bento/hardware.nix
View file

@ -64,6 +64,4 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
} }

2
machines/common/linux/default.nix
View file

@ -35,4 +35,6 @@
"94e2d5" "94e2d5"
"94e2d5" "94e2d5"
]; ];
programs.zsh.enable = true;
} }

4
machines/common/linux/xsession.nix
View file

@ -50,7 +50,7 @@
kanata = { kanata = {
enable = true; enable = true;
package = pkgs.unstable.kanata; package = pkgs.kanata;
keyboards.keychron-k6 = { keyboards.keychron-k6 = {
devices = ["/dev/input/by-id/usb-Keychron_Keychron_K6-event-kbd"]; devices = ["/dev/input/by-id/usb-Keychron_Keychron_K6-event-kbd"];
config = '' config = ''
@ -81,7 +81,7 @@
libinput.enable = true; libinput.enable = true;
windowManager.i3 = { windowManager.i3 = {
enable = true; enable = true;
package = pkgs.unstable.i3; package = pkgs.i3;
}; };
xkbOptions = "caps:ctrl_modifier"; xkbOptions = "caps:ctrl_modifier";
}; };

2
machines/futomaki/default.nix
View file

@ -49,7 +49,7 @@ in {
programs = { programs = {
steam = { steam = {
enable = true; enable = true;
package = pkgs.unstable.steam.override { package = pkgs.steam.override {
extraPkgs = pkgs: with pkgs; [gamemode mangohud]; extraPkgs = pkgs: with pkgs; [gamemode mangohud];
extraLibraries = pkgs: extraLibraries = pkgs:
with config.hardware.opengl; with config.hardware.opengl;

2
machines/futomaki/hardware.nix
View file

@ -61,8 +61,6 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [