update
This commit is contained in:
parent
7e6fd0bb52
commit
bba677d11a
11
flake.nix
11
flake.nix
|
@ -3,7 +3,8 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
url = "nixpkgs/nixos-unstable";
|
#url = "nixpkgs/nixos-unstable";
|
||||||
|
url = "nixpkgs/nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
|
@ -39,7 +40,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, home-manager, nur, ... }:
|
outputs = { self, nixpkgs, home-manager, nur, ... }@inputs:
|
||||||
let
|
let
|
||||||
username = "manuel";
|
username = "manuel";
|
||||||
hostname = "terra";
|
hostname = "terra";
|
||||||
|
@ -56,13 +57,14 @@
|
||||||
{
|
{
|
||||||
overlays.default =
|
overlays.default =
|
||||||
(final: prev: rec {
|
(final: prev: rec {
|
||||||
|
|
||||||
nerdfonts = prev.nerdfonts.override {
|
nerdfonts = prev.nerdfonts.override {
|
||||||
fonts = [
|
fonts = [
|
||||||
"JetBrainsMono"
|
"JetBrainsMono"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
discord = prev.discord.override {
|
discord = prev.discord.override {
|
||||||
nss = pkgs.nss_latest;
|
|
||||||
withOpenASAR = true;
|
withOpenASAR = true;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
@ -75,8 +77,7 @@
|
||||||
./system/configuration.nix
|
./system/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager =
|
home-manager = {
|
||||||
{
|
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
users.${username} = import ./user/home.nix;
|
users.${username} = import ./user/home.nix;
|
||||||
|
|
|
@ -11,7 +11,9 @@
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
};
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
boot.loader.systemd-boot = {
|
boot.loader.systemd-boot = {
|
||||||
|
@ -84,8 +86,6 @@
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
|
||||||
# wget
|
|
||||||
git
|
git
|
||||||
links2
|
links2
|
||||||
ripgrep
|
ripgrep
|
||||||
|
@ -103,10 +103,6 @@
|
||||||
# };
|
# };
|
||||||
|
|
||||||
# List services that you want to enable:
|
# List services that you want to enable:
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
|
||||||
# services.openssh.enable = true;
|
|
||||||
|
|
||||||
services.udev.packages = [ pkgs.openrgb ];
|
services.udev.packages = [ pkgs.openrgb ];
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
|
@ -130,13 +126,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
|
|
||||||
inherit pkgs;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
nix.gc = {
|
nix.gc = {
|
||||||
persistent = true;
|
persistent = true;
|
||||||
automatic = true;
|
automatic = true;
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
nou = ''
|
nou = ''
|
||||||
pushd &> /dev/null
|
pushd &> /dev/null
|
||||||
cd "${config.home.homeDirectory}/.dotfiles"
|
cd "${config.home.homeDirectory}/.dotfiles"
|
||||||
nix flake lock --commit-lock-file
|
nix flake lock --commit-lock-file --update-input nixpkgs --update-input home-manager
|
||||||
doas nixos-rebuild switch --upgrade --flake .#
|
doas nixos-rebuild switch --upgrade --flake .#
|
||||||
popd &> /dev/null
|
popd &> /dev/null
|
||||||
'';
|
'';
|
||||||
|
|
Reference in New Issue