diff --git a/flake.nix b/flake.nix index 4d5b7d3..f60b817 100644 --- a/flake.nix +++ b/flake.nix @@ -5,52 +5,15 @@ 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, nur, ... }@inputs: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in - { + outputs = { self, nixpkgs, ... }@inputs: { nixosConfigurations.thinknix = nixpkgs.lib.nixosSystem { - inherit system; + system = "x86_64-linux"; 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; - }; - }; }; } diff --git a/home/config.nix b/home/config.nix index 66a4143..cd50baa 100644 --- a/home/config.nix +++ b/home/config.nix @@ -1,5 +1,8 @@ -{ lib, ...}: -{ +let + lib = (import {}).lib; + +in + { firefox.enablePlasmaBrowserIntegration = true; firefox-bin.enablePlasmaBrowserIntegration = true; diff --git a/home/home.nix b/home/home.nix index 9a87b78..dbc5007 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,9 +1,12 @@ -{ pkgs, inputs, config, ... }: +{ pkgs, ... }: with pkgs; let # nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable - unstable = inputs.nixos-unstable; + unstable = import { }; + # nix-channel --add https://github.com/nix-community/NUR/archive/master.tar.gz NUR + nur = import { inherit pkgs; }; + myNur = nur.repos.schmittlauch; desktopApps = [ firefox @@ -119,7 +122,7 @@ let reptyr # re-bind running program to other tty xclip unzip - config.nur.repos.schmittlauch.lolcommits # from NUR + myNur.lolcommits # from NUR ]; nixHelpers = [ @@ -245,7 +248,7 @@ let (iosevka-bin.override { variant = "curly-slab"; }) - config.nur.repos.schmittlauch.vollkorn + myNur.vollkorn # TODO: humor-sans ]; @@ -257,8 +260,6 @@ let in { - nixpkgs.overlays = (import ./overlays.nix); - home.packages = desktopApps ++ latexApps @@ -275,7 +276,7 @@ in programs.home-manager.enable = true; programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager"; - home.stateVersion = "22.11"; + home.stateVersion = "18.09"; programs.direnv = { @@ -301,7 +302,7 @@ in enable = true; # ssh host config matchBlocks = - import "${inputs.mysecrets}/ssh_hosts.nix"; + import ./secrets/ssh_hosts.nix; }; programs.tmux = { @@ -330,7 +331,7 @@ in fonts.fontconfig.enable = true; programs.git = - let contacts = import "${inputs.mysecrets}/contacts.nix"; + let contacts = import ./secrets/contacts.nix; in { enable = true;