Switch to nixos-unstable

main
Christian Ott 2 years ago
parent 9c610c086a
commit 1fd5165662
  1. 2
      configuration.nix
  2. 34
      flake.lock
  3. 14
      flake.nix
  4. 8
      greeter.nix
  5. 12
      home.nix

@ -78,7 +78,7 @@
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput = { services.libinput = {
enable = true; enable = true;
touchpad.tapping = true; touchpad.tapping = true;
}; };

@ -23,16 +23,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712386041, "lastModified": 1717097707,
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -74,16 +73,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713145326, "lastModified": 1716948383,
"narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=", "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e", "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -103,29 +102,12 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1713248628,
"narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

@ -2,31 +2,29 @@
description = "A very basic flake"; description = "A very basic flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
home-manager = { home-manager = {
url = github:nix-community/home-manager/release-23.11; url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, nix-colors, ... }@inputs: outputs = { self, nixpkgs, nixos-hardware, home-manager, nix-colors, ... }@inputs:
let let
username = "chrigi"; username = "chrigi";
lib = nixpkgs.lib; lib = nixpkgs.lib;
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs {
pkgs-unstable = import nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
in { in {
nixosConfigurations.nix-fw16 = lib.nixosSystem { nixosConfigurations.nix-fw16 = lib.nixosSystem {
specialArgs = { specialArgs = {
inherit pkgs-unstable; inherit pkgs;
}; };
modules = [ modules = [
./configuration.nix ./configuration.nix
@ -36,7 +34,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${username} = import ./home.nix; home-manager.users.${username} = import ./home.nix;
home-manager.extraSpecialArgs = {inherit pkgs-unstable username nix-colors; }; home-manager.extraSpecialArgs = {inherit username nix-colors; };
} }
]; ];
}; };

@ -1,8 +1,8 @@
{ config, pkgs, pkgs-unstable, lib, ... }: { config, pkgs, lib, ... }:
let let
tuigreet = "${pkgs-unstable.greetd.tuigreet}/bin/tuigreet"; tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
hyprland-session = "${pkgs-unstable.hyprland}/share/wayland-sessions"; hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
# https://github.com/bytemouse/config/blob/48d9be51a9666c9b62f4b8e84322b9d892ee0aea/modules/gnome.nix#L11 # https://github.com/bytemouse/config/blob/48d9be51a9666c9b62f4b8e84322b9d892ee0aea/modules/gnome.nix#L11
gnome-script = pkgs.writeShellScriptBin "gnome-script" '' gnome-script = pkgs.writeShellScriptBin "gnome-script" ''
@ -27,6 +27,6 @@ in {
}; };
}; };
}; };
environment.systemPackages = with pkgs-unstable; [ greetd.tuigreet ]; environment.systemPackages = with pkgs; [ greetd.tuigreet ];
} }

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, nix-colors, username, ... }: { config, pkgs, nix-colors, username, ... }:
{ {
imports = [ imports = [
@ -17,12 +17,12 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
kitty kitty
eza eza
pkgs-unstable.obsidian obsidian
jq jq
pkgs-unstable._1password _1password
pkgs-unstable._1password-gui _1password-gui
pkgs-unstable.skypeforlinux skypeforlinux
pkgs-unstable.hyprlock hyprlock
]; ];
programs.ssh = { programs.ssh = {

Loading…
Cancel
Save

Powered by TurnKey Linux.