From 1fd51656621da6d78a60a7c97c471ce03c1076b9 Mon Sep 17 00:00:00 2001 From: Christian Ott Date: Sat, 1 Jun 2024 11:40:28 +0200 Subject: [PATCH] Switch to nixos-unstable --- configuration.nix | 2 +- flake.lock | 34 ++++++++-------------------------- flake.nix | 14 ++++++-------- greeter.nix | 8 ++++---- home.nix | 14 +++++++------- 5 files changed, 26 insertions(+), 46 deletions(-) diff --git a/configuration.nix b/configuration.nix index 7c149f2..0ceee90 100644 --- a/configuration.nix +++ b/configuration.nix @@ -78,7 +78,7 @@ hardware.pulseaudio.enable = true; # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput = { + services.libinput = { enable = true; touchpad.tapping = true; }; diff --git a/flake.lock b/flake.lock index faa899d..d2580d5 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,15 @@ ] }, "locked": { - "lastModified": 1712386041, - "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", + "lastModified": 1717097707, + "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", + "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -74,16 +73,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713145326, - "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -103,29 +102,12 @@ "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": { "inputs": { "home-manager": "home-manager", "nix-colors": "nix-colors", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 0bce994..6a15ab5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,31 +2,29 @@ description = "A very basic flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-colors.url = "github:misterio77/nix-colors"; home-manager = { - url = github:nix-community/home-manager/release-23.11; + url = github:nix-community/home-manager; 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 username = "chrigi"; lib = nixpkgs.lib; system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - pkgs-unstable = import nixpkgs-unstable { + pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; in { nixosConfigurations.nix-fw16 = lib.nixosSystem { specialArgs = { - inherit pkgs-unstable; + inherit pkgs; }; modules = [ ./configuration.nix @@ -36,7 +34,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.${username} = import ./home.nix; - home-manager.extraSpecialArgs = {inherit pkgs-unstable username nix-colors; }; + home-manager.extraSpecialArgs = {inherit username nix-colors; }; } ]; }; diff --git a/greeter.nix b/greeter.nix index 89aefff..8595eb4 100644 --- a/greeter.nix +++ b/greeter.nix @@ -1,8 +1,8 @@ -{ config, pkgs, pkgs-unstable, lib, ... }: +{ config, pkgs, lib, ... }: let - tuigreet = "${pkgs-unstable.greetd.tuigreet}/bin/tuigreet"; - hyprland-session = "${pkgs-unstable.hyprland}/share/wayland-sessions"; + tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; + hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; # https://github.com/bytemouse/config/blob/48d9be51a9666c9b62f4b8e84322b9d892ee0aea/modules/gnome.nix#L11 gnome-script = pkgs.writeShellScriptBin "gnome-script" '' @@ -27,6 +27,6 @@ in { }; }; }; - environment.systemPackages = with pkgs-unstable; [ greetd.tuigreet ]; + environment.systemPackages = with pkgs; [ greetd.tuigreet ]; } \ No newline at end of file diff --git a/home.nix b/home.nix index b81e473..994dcb1 100644 --- a/home.nix +++ b/home.nix @@ -1,7 +1,7 @@ -{ config, pkgs, pkgs-unstable, nix-colors, username, ... }: +{ config, pkgs, nix-colors, username, ... }: { - imports = [ + imports = [ nix-colors.homeManagerModules.default ./modules/dunst.nix ./hyperland @@ -17,12 +17,12 @@ home.packages = with pkgs; [ kitty eza - pkgs-unstable.obsidian + obsidian jq - pkgs-unstable._1password - pkgs-unstable._1password-gui - pkgs-unstable.skypeforlinux - pkgs-unstable.hyprlock + _1password + _1password-gui + skypeforlinux + hyprlock ]; programs.ssh = {