torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Revert "Switch to hyprland flake"

Browse Source 
This reverts commit 1dbc476b8c.
This commit is contained in:
Torjus Håkestad 2024-05-24 00:04:53 +02:00
parent 2ce97c825a
commit e54e88e1e9
8 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
flake.lock
View File

@ -26,15 +26,16 @@
]
},
"locked": {
"lastModified": 1716457508,
"narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
"lastModified": 1715381426,
"narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
"rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
@ -56,22 +57,6 @@
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1716361217,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1716061101,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
@ -87,13 +72,13 @@
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs-unstable": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"type": "github"
},
"original": {
@ -103,6 +88,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716218643,
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1713248628,
@ -159,7 +160,7 @@
"ghettoptt": "ghettoptt",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable",
"notlistener": "notlistener",
"sops-nix": "sops-nix"
}
@ -167,7 +168,7 @@
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2"
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1716244104,

6
flake.nix
View File

@ -6,13 +6,9 @@
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager?ref=release-23.11";
inputs.nixpkgs.follows = "nixpkgs";
};
# hyprland = {
# url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
# inputs.nixpkgs.follows = "nixpkgs";
# };
sops-nix.url = "github:Mic92/sops-nix";
notlistener.url = "git+https://git.t-juice.club/torjus/notlistener?ref=master";
ghettoptt.url = "git+https://git.t-juice.club/torjus/ghettoptt?ref=master";

3
home/hyprland/hyprland_gunter.nix
View File

@ -52,11 +52,10 @@
};
env = [
"WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:01:00.0-card"
"LIBVA_DRIVER_NAME,nvidia"
"XDG_SESSION_TYPE,wayland"
"GBM_BACKEND,nvidia-drm"
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
# "__GLX_VENDOR_LIBRARY_NAME,nvidia"
"WLR_NO_HARDWARE_CURSORS,1"
];

6
hosts/common/cachix.nix
View File

@ -1,6 +0,0 @@
{ pkgs, ... }: {
nix.settings = {
substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
};
}

5
hosts/common/default.nix
View File

@ -1,5 +0,0 @@
{ inputs, self, pks, ... }: {
imports = [
./cachix.nix
];
}

2
hosts/gunter/configuration.nix
View File

@ -4,7 +4,6 @@
imports = [
./hardware-configuration.nix
../../system/monitoring.nix
../common
];
# Sops stuff
@ -94,7 +93,6 @@
services.xserver.windowManager.i3.enable = true;
programs.hyprland = {
enable = true;
# package = inputs.hyprland.packages.${pkgs.system}.hyprland;
xwayland.enable = true;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
};

5
hosts/magicman/configuration.nix
View File

@ -1,10 +1,7 @@
{ config, lib, pkgs, ... }:
{
imports = [
./hardware-configuration.nix
../common
];
imports = [ ./hardware-configuration.nix ];
# Bootloader stuff
boot.kernelParams = [

3
system/security.nix
View File

@ -7,7 +7,4 @@
# Enable rtkit
security.rtkit.enable = true;
# enable polkit
security.polkit.enable = true;
}