tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

unstable channel

Browse source
This commit is contained in:
tristan 2023-04-14 10:24:24 +01:00
parent 31d935cd37
commit 7a86dc748a
4 changed files with 19 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

112
flake.lock generated
View file

@ -22,84 +22,25 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680669251, "lastModified": 1681303793,
"narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.11", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs_2"
} }
}, },
"utils": { "utils": {
@ -116,49 +57,6 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "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", "root": "root",

6
flake.nix
View file

@ -2,13 +2,12 @@
description = "A flake using my config"; description = "A flake using my config";
inputs = { 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.url = "github:nix-community/home-manager/release-22.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/Hyprland";
}; };
outputs = { nixpkgs, home-manager, hyprland, ... }: outputs = { nixpkgs, home-manager, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
@ -24,7 +23,6 @@
inherit system; inherit system;
modules = [ modules = [
hyprland.nixosModules.default
./system/configuration.nix ./system/configuration.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

18
system/configuration.nix
View file

@ -6,16 +6,19 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
#required for upgrade to unstable?
nixpkgs.overlays = [
(self: super: {fcitx-engines = pkgs.fcitx5;})
];
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
nix.settings = { nix.settings = {
experimental-features = [ "nix-command" "flakes" ]; 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" ]; nix.settings.trusted-users = [ "root" "tristan" ];
@ -69,9 +72,9 @@
}; };
}; };
qt5.enable = true; qt.enable = true;
qt5.platformTheme = "gtk2"; qt.platformTheme = "gtk2";
qt5.style = "gtk2"; qt.style = "gtk2";
services.printing.enable = true; services.printing.enable = true;
@ -84,6 +87,7 @@
initialPassword = "pass"; initialPassword = "pass";
shell = pkgs.fish; shell = pkgs.fish;
}; };
programs.fish.enable = true;
environment.variables = { environment.variables = {
EDITOR = "nvim"; EDITOR = "nvim";

1
users/tristan/home.nix
View file

@ -20,6 +20,7 @@
lf lf
du-dust du-dust
godot_4 godot_4
ansible
]; ];
programs.git = { programs.git = {