nix flake update and migrating nvim from nixCats to nix-wrapper-modules.
This commit is contained in:
parent
a0ba016d28
commit
41a858b7da
8 changed files with 94 additions and 53 deletions
|
|
@ -40,6 +40,7 @@
|
|||
};
|
||||
};
|
||||
imports = [
|
||||
inputs.nvim-config.homeModules.neovim
|
||||
../../modules/nixos/hostopts.nix
|
||||
../../modules/home-manager
|
||||
];
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ in {
|
|||
|
||||
# packages that should be on every system.
|
||||
environment.systemPackages = with pkgs; [
|
||||
inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim-minimal
|
||||
rsync
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
xterm
|
||||
];
|
||||
};
|
||||
nixpkgs.config.zathura.useMupdf = true;
|
||||
programs.dconf.enable = true;
|
||||
home-manager.users.${config.host.details.user} = {config, ...}: {
|
||||
gtk = {
|
||||
|
|
@ -34,7 +35,6 @@
|
|||
mpv
|
||||
zathura
|
||||
];
|
||||
nixpkgs.config.zathura.useMupdf = true;
|
||||
services.playerctld.enable = true;
|
||||
xsession.enable = true;
|
||||
xsession.windowManager.i3 = let
|
||||
|
|
@ -211,7 +211,7 @@
|
|||
# you can find window class names with xprop.
|
||||
criteria = [
|
||||
{class = "pwvucontrol";}
|
||||
{class = "helvum";}
|
||||
{class = "crosspipe";}
|
||||
];
|
||||
};
|
||||
startup = [
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
lib.mkIf (osConfig.host.details.gui.enable)
|
||||
[
|
||||
pwvucontrol
|
||||
helvum
|
||||
crosspipe
|
||||
]
|
||||
)
|
||||
[wiremix]
|
||||
|
|
|
|||
128
flake.lock
generated
128
flake.lock
generated
|
|
@ -10,11 +10,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771523612,
|
||||
"narHash": "sha256-ScRqXJaqDTonQ1cs7VKxPw5pO0TQ/OnErfjOKCHX4Ps=",
|
||||
"lastModified": 1773272006,
|
||||
"narHash": "sha256-YGuXb5p9RCWJ7NrqDh1AUTy2NNfLYn38t6trGMpSkJc=",
|
||||
"owner": "9001",
|
||||
"repo": "copyparty",
|
||||
"rev": "6f1d6647546832c6640cbad88817e28fb63ea3ec",
|
||||
"rev": "6eb4f0ad9cc266abd5007509a15be93daa887ccf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -56,11 +56,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771469470,
|
||||
"narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=",
|
||||
"lastModified": 1773025010,
|
||||
"narHash": "sha256-khlHllTsovXgT2GZ0WxT4+RvuMjNeR5OW0UYeEHPYQo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13",
|
||||
"rev": "7b9f7f88ab3b339f8142dc246445abb3c370d3d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -109,11 +109,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771625283,
|
||||
"narHash": "sha256-1T88/PSNKpRNtaiXATTae0hpRnBpjmIL0b1QfGO6HBA=",
|
||||
"lastModified": 1773367248,
|
||||
"narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a913ae61bf3b9f4312f6097b68cdf0a0fa699279",
|
||||
"rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -125,10 +125,10 @@
|
|||
"nix-secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1771674256,
|
||||
"narHash": "sha256-7vDCh0/Q6tvlSGZNXHG7d0pODJT+Drn5olJYPJuwPDs=",
|
||||
"lastModified": 1772508486,
|
||||
"narHash": "sha256-9RbAmpDSCx41vpK+qIC8ZFhQOGAenBYgXpCvyD7t5E8=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6f094d986afb6d6901ba4a7c510167917f3c5d90",
|
||||
"rev": "c279fc2ebafa3602d058bfc318a811c8cbc62f83",
|
||||
"shallow": true,
|
||||
"type": "git",
|
||||
"url": "ssh://forgejo@git.venberg.xyz/Gabe/nix-secrets.git"
|
||||
|
|
@ -139,28 +139,13 @@
|
|||
"url": "ssh://forgejo@git.venberg.xyz/Gabe/nix-secrets.git"
|
||||
}
|
||||
},
|
||||
"nixCats": {
|
||||
"locked": {
|
||||
"lastModified": 1769578476,
|
||||
"narHash": "sha256-4+KbiBcC6hQ3sh0UbPXjy6TOfLh9yhskRlfPzyZ2FH4=",
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "nixCats-nvim",
|
||||
"rev": "48f8be4bdafccfa19ceaaf08071a15eca36fdb1d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "nixCats-nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1771423359,
|
||||
"narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
|
||||
"lastModified": 1772972630,
|
||||
"narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
|
||||
"rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -180,11 +165,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771563879,
|
||||
"narHash": "sha256-vA5hocvdGhr+jfBN7A7ogeZqIz2qx01EixXwdVsQcnE=",
|
||||
"lastModified": 1773410545,
|
||||
"narHash": "sha256-8XGcJXvjvAIWwDX9omhdu2FkaDvkP+mPRGpBp37Riyw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "379d20c55f552e91fb9f3f0382e4a97d3f452943",
|
||||
"rev": "8f13b9722f3bb549630c620276530752e4ba4437",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -196,11 +181,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1771369470,
|
||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
||||
"lastModified": 1773282481,
|
||||
"narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0182a361324364ae3f436a63005877674cf45efb",
|
||||
"rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -212,16 +197,18 @@
|
|||
},
|
||||
"nvim-config": {
|
||||
"inputs": {
|
||||
"nixCats": "nixCats",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"plugins-lze": "plugins-lze",
|
||||
"plugins-lzextras": "plugins-lzextras",
|
||||
"wrappers": "wrappers"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771627184,
|
||||
"narHash": "sha256-Z/0ZYpLVb9vlw31xCWjWvp2Qn3qwUNXdnXiuUakueow=",
|
||||
"lastModified": 1773413301,
|
||||
"narHash": "sha256-O6eJw6svNMzqjHQ6OOQjIBOO6nkh7I5PVF2jGqewWaA=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "0499b132742b15397285373b0abbe071abe34297",
|
||||
"rev": "71f670b0494456b02c6d54712e95257903909e30",
|
||||
"shallow": true,
|
||||
"type": "git",
|
||||
"url": "ssh://forgejo@git.venberg.xyz/Gabe/nvim-config.git"
|
||||
|
|
@ -232,6 +219,38 @@
|
|||
"url": "ssh://forgejo@git.venberg.xyz/Gabe/nvim-config.git"
|
||||
}
|
||||
},
|
||||
"plugins-lze": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1772949858,
|
||||
"narHash": "sha256-skLhmn/MvxOZbrBiceF/xiLRRmmEs6ZQS2sGrBrUyLU=",
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "lze",
|
||||
"rev": "a3ba1a2d469d4ab26acb629aba8c7d70a6cbe558",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "lze",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plugins-lzextras": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1772949841,
|
||||
"narHash": "sha256-MQ1h2R5axM3u6mLNTDzXF/40o8+U0JOWb48UTQO9jfc=",
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "lzextras",
|
||||
"rev": "a6ac9a7bee380881af2dfbfd238ccb1697d677d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "lzextras",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"copyparty": "copyparty",
|
||||
|
|
@ -255,11 +274,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771524872,
|
||||
"narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=",
|
||||
"lastModified": 1773096132,
|
||||
"narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
|
||||
"owner": "mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7",
|
||||
"rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -282,6 +301,27 @@
|
|||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wrappers": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nvim-config",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773360496,
|
||||
"narHash": "sha256-AQN5UhIc2WHvELT4TWIsD1W05ksLXWRkS5NjPm3jkc0=",
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "nix-wrapper-modules",
|
||||
"rev": "8f1770c6d58a89a4757849713c0e6d9ace7b4ac3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "nix-wrapper-modules",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
|
|
@ -92,8 +92,6 @@
|
|||
}
|
||||
);
|
||||
|
||||
homeManagerModules = import ./modules/home-manager;
|
||||
|
||||
# NixOS configuration entrypoint
|
||||
# Available through 'nixos-rebuild --flake .#your-hostname'
|
||||
nixosConfigurations = {
|
||||
|
|
|
|||
|
|
@ -31,15 +31,16 @@
|
|||
curl
|
||||
rsync
|
||||
p7zip
|
||||
inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim-minimal
|
||||
];
|
||||
|
||||
wrappers.neovim.settings.minimal = lib.mkDefault true;
|
||||
|
||||
home.sessionVariables = {
|
||||
PIPENV_VENV_IN_PROJECT = 1;
|
||||
POETRY_VIRTUALENVS_IN_PROJECT = 1;
|
||||
};
|
||||
|
||||
home.sessionVariables.EDITOR = lib.mkDefault "nvim-minimal";
|
||||
home.sessionVariables.EDITOR = lib.mkDefault "nvim";
|
||||
|
||||
home.sessionPath = [
|
||||
"$HOME/.nix-profile/bin/"
|
||||
|
|
|
|||
|
|
@ -20,11 +20,13 @@
|
|||
libqalculate
|
||||
f2
|
||||
clock-rs
|
||||
inputs.nvim-config.packages.${pkgs.stdenv.hostPlatform.system}.nvim
|
||||
#TODO! move this to graphics module? This provides a drag and drop interface from the CLI.
|
||||
dragon-drop
|
||||
];
|
||||
|
||||
wrappers.neovim.enable=true;
|
||||
wrappers.neovim.settings.minimal = false;
|
||||
|
||||
home.sessionVariables.EDITOR = "nvim";
|
||||
|
||||
programs = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue