From 7a86dc748af8b7c4e6f96197047ea7a8d4268eda Mon Sep 17 00:00:00 2001 From: tristan Date: Fri, 14 Apr 2023 10:24:24 +0100 Subject: [PATCH] unstable channel --- flake.lock | 112 ++------------------------------------- flake.nix | 6 +-- system/configuration.nix | 18 ++++--- users/tristan/home.nix | 1 + 4 files changed, 19 insertions(+), 118 deletions(-) diff --git a/flake.lock b/flake.lock index e2550ea..69a5afd 100644 --- a/flake.lock +++ b/flake.lock @@ -22,84 +22,25 @@ "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1680964754, - "narHash": "sha256-cjCjECP+Sv6GyiPqiVsfm/KEMLHcM8wI1krWGfdL5vM=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "86852cdc78b833ae405b6161f639424787a825e4", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671839510, - "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1680669251, - "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1681154110, - "narHash": "sha256-OQwWzlzAY1dCqgSsgZzsPIOGmX4pBGaoXOy0rSl4b5Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "115a96e2ac1e92937cd47c30e073e16dcaaf6247", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-unstable", "type": "indirect" } }, "root": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } }, "utils": { @@ -116,49 +57,6 @@ "repo": "flake-utils", "type": "github" } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1680810405, - "narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673116118, - "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 48cbe1f..b46bb3b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,12 @@ description = "A flake using my config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-22.11"; + nixpkgs.url = "nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager/release-22.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - hyprland.url = "github:hyprwm/Hyprland"; }; - outputs = { nixpkgs, home-manager, hyprland, ... }: + outputs = { nixpkgs, home-manager, ... }: let system = "x86_64-linux"; @@ -24,7 +23,6 @@ inherit system; modules = [ - hyprland.nixosModules.default ./system/configuration.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/system/configuration.nix b/system/configuration.nix index 5496096..a424188 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -6,16 +6,19 @@ { config, pkgs, ... }: { + + #required for upgrade to unstable? + nixpkgs.overlays = [ + (self: super: {fcitx-engines = pkgs.fcitx5;}) + ]; + + imports = [ ./hardware-configuration.nix ]; nix.settings = { experimental-features = [ "nix-command" "flakes" ]; - - # temporary unstable hyprland release - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; }; nix.settings.trusted-users = [ "root" "tristan" ]; @@ -69,9 +72,9 @@ }; }; - qt5.enable = true; - qt5.platformTheme = "gtk2"; - qt5.style = "gtk2"; + qt.enable = true; + qt.platformTheme = "gtk2"; + qt.style = "gtk2"; services.printing.enable = true; @@ -84,6 +87,7 @@ initialPassword = "pass"; shell = pkgs.fish; }; + programs.fish.enable = true; environment.variables = { EDITOR = "nvim"; diff --git a/users/tristan/home.nix b/users/tristan/home.nix index 012794e..79b8417 100644 --- a/users/tristan/home.nix +++ b/users/tristan/home.nix @@ -20,6 +20,7 @@ lf du-dust godot_4 + ansible ]; programs.git = {