Compare commits
2 commits
339938b213
...
c568b8dc24
Author | SHA1 | Date | |
---|---|---|---|
|
c568b8dc24 | ||
|
823500e981 |
41
flake.nix
41
flake.nix
|
@ -5,15 +5,52 @@
|
|||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
|
||||
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-22.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nur.url = "github:nix-community/NUR";
|
||||
# TODO: possible make this a flake as well
|
||||
mysecrets = {
|
||||
flake = false;
|
||||
url = "git+ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, ... }@inputs: {
|
||||
outputs =
|
||||
{ self, nixpkgs, nur, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
|
||||
nixosConfigurations.thinknix = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
inherit system;
|
||||
modules = [ ./nixos/configuration.nix ];
|
||||
# necessary to make the top-level inputs available to system configuration
|
||||
specialArgs = { inherit inputs; };
|
||||
};
|
||||
homeConfigurations.spiollinux = inputs.home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
modules = [
|
||||
{
|
||||
imports = [
|
||||
nur.hmModules.nur
|
||||
./home/home.nix
|
||||
];
|
||||
# extends the home config
|
||||
home.username = "spiollinux";
|
||||
home.homeDirectory = "/home/spiollinux";
|
||||
}
|
||||
];
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
let
|
||||
lib = (import <nixpkgs> {}).lib;
|
||||
|
||||
in
|
||||
{
|
||||
{ lib, ...}:
|
||||
{
|
||||
|
||||
firefox.enablePlasmaBrowserIntegration = true;
|
||||
firefox-bin.enablePlasmaBrowserIntegration = true;
|
||||
|
|
|
@ -1,12 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
{ pkgs, inputs, config, ... }:
|
||||
|
||||
with pkgs;
|
||||
let
|
||||
# nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
|
||||
unstable = import <nixos-unstable> { };
|
||||
# nix-channel --add https://github.com/nix-community/NUR/archive/master.tar.gz NUR
|
||||
nur = import <NUR> { inherit pkgs; };
|
||||
myNur = nur.repos.schmittlauch;
|
||||
unstable = inputs.nixos-unstable;
|
||||
|
||||
desktopApps = [
|
||||
firefox
|
||||
|
@ -122,7 +119,7 @@ let
|
|||
reptyr # re-bind running program to other tty
|
||||
xclip
|
||||
unzip
|
||||
myNur.lolcommits # from NUR
|
||||
config.nur.repos.schmittlauch.lolcommits # from NUR
|
||||
];
|
||||
|
||||
nixHelpers = [
|
||||
|
@ -248,7 +245,7 @@ let
|
|||
(iosevka-bin.override {
|
||||
variant = "curly-slab";
|
||||
})
|
||||
myNur.vollkorn
|
||||
config.nur.repos.schmittlauch.vollkorn
|
||||
# TODO: humor-sans
|
||||
];
|
||||
|
||||
|
@ -260,6 +257,8 @@ let
|
|||
in
|
||||
{
|
||||
|
||||
nixpkgs.overlays = (import ./overlays.nix);
|
||||
|
||||
home.packages =
|
||||
desktopApps
|
||||
++ latexApps
|
||||
|
@ -276,7 +275,7 @@ in
|
|||
|
||||
programs.home-manager.enable = true;
|
||||
programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager";
|
||||
home.stateVersion = "18.09";
|
||||
home.stateVersion = "22.11";
|
||||
|
||||
programs.direnv =
|
||||
{
|
||||
|
@ -302,7 +301,7 @@ in
|
|||
enable = true;
|
||||
# ssh host config
|
||||
matchBlocks =
|
||||
import ./secrets/ssh_hosts.nix;
|
||||
import "${inputs.mysecrets}/ssh_hosts.nix";
|
||||
};
|
||||
|
||||
programs.tmux = {
|
||||
|
@ -331,7 +330,7 @@ in
|
|||
fonts.fontconfig.enable = true;
|
||||
|
||||
programs.git =
|
||||
let contacts = import ./secrets/contacts.nix;
|
||||
let contacts = import "${inputs.mysecrets}/contacts.nix";
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
|
|
Loading…
Reference in a new issue