Compare commits

..

No commits in common. "995ef6a85dddbb3f3058feacdbe2c24f32327e48" and "a8d273df45cec74bea392a1a0a39812e05609ed5" have entirely different histories.

9 changed files with 36 additions and 39 deletions

18
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723399884, "lastModified": 1714515075,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab", "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723362943, "lastModified": 1714253743,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,11 +37,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1723580753, "lastModified": 1714596740,
"narHash": "sha256-9Zuz0QyCp+jY9vszrn4TkqpcnGKA7bM9M+da/6I0Yfs=", "narHash": "sha256-V3ZR38xu3JSUrg04wMTp0fzDSP+ogNJOOU5ckreCzLQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e36bc569a3652499909486b983ef97d319ee7271", "rev": "c8456769a0904ac761020a76bf0bb72a92c27c7c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -51,8 +51,9 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.graphics = { hardware.opengl = {
enable = true; enable = true;
driSupport = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver intel-media-driver
vaapiVdpau vaapiVdpau
@ -60,6 +61,8 @@
]; ];
}; };
virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.enable = true;
users.extraGroups.vboxusers.members = [ "ephase" ]; users.extraGroups.vboxusers.members = [ "ephase" ];
hardware.opengl.driSupport32Bit = true;
} }

View file

@ -43,8 +43,10 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.graphics.enable32Bit = true; hardware.opengl.enable = true;
hardware.graphics.extraPackages = with pkgs; [ hardware.opengl.driSupport = true;
hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages = with pkgs; [
intel-media-driver intel-media-driver
]; ];
} }

View file

@ -25,10 +25,6 @@
"amdgpu" "amdgpu"
]; ];
boot.kernelParams = [
"amdgpu.ppfeaturemask=0xffffffff"
];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.initrd.luks.devices."nixos".device = "/dev/disk/by-uuid/ea7fa60d-35e5-48b8-95d7-142f37b262cd"; boot.initrd.luks.devices."nixos".device = "/dev/disk/by-uuid/ea7fa60d-35e5-48b8-95d7-142f37b262cd";
boot.initrd.luks.devices."nixos".preLVM = true; boot.initrd.luks.devices."nixos".preLVM = true;
@ -68,10 +64,10 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
hardware.graphics = { hardware.opengl = {
enable32Bit = true; driSupport = true;
driSupport32Bit = true;
}; };
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.xpadneo.enable = true; hardware.xpadneo.enable = true;
programs.coolercontrol.enable = true;
} }

View file

@ -1,4 +1,4 @@
-- Which-key -- Which-key
-- --
local wk = require 'which-key' local wk = require 'which-key'
-- wk.register() wk.register()

View file

@ -84,7 +84,7 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
dejavu_fonts dejavu_fonts
# emojione emojione
font-awesome font-awesome
grim grim
lato lato
@ -128,7 +128,7 @@ in
home.pointerCursor = { home.pointerCursor = {
name = "Adwaita"; name = "Adwaita";
package = pkgs.adwaita-icon-theme; package = pkgs.gnome.adwaita-icon-theme;
size = 24; size = 24;
x11 = { x11 = {
enable = true; enable = true;

View file

@ -4,21 +4,18 @@ with lib;
config = mkIf config.modules.desktop.sway.enable { config = mkIf config.modules.desktop.sway.enable {
services.kanshi = { services.kanshi = {
enable = config.modules.desktop.sway.kanshi ; enable = config.modules.desktop.sway.kanshi ;
settings = [ profiles = {
{ standalone = {
outputs = [
profile.name = "standalone";
profile.outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
scale = 1.33; scale = 1.33;
status = "enable"; status = "enable";
} }
]; ];
} };
{ home = {
profile.name = "home"; outputs = [
profile.outputs = [
{ {
criteria = "Iiyama North America PL2792UH 1166310803122"; criteria = "Iiyama North America PL2792UH 1166310803122";
mode = "3840x2160"; mode = "3840x2160";
@ -37,10 +34,9 @@ with lib;
status = "disable"; status = "disable";
} }
]; ];
} };
{ work = {
profile.name = "work"; outputs = [
profile.outputs = [
{ {
criteria = "Iiyama North America PL2480H 11183M2807013"; criteria = "Iiyama North America PL2480H 11183M2807013";
mode = "1920x1080"; mode = "1920x1080";
@ -56,8 +52,8 @@ with lib;
status = "disable"; status = "disable";
} }
]; ];
} };
]; };
}; };
}; };
} }

View file

@ -31,7 +31,7 @@ in
gamescopeSession = { gamescopeSession = {
enable = cfg.gamescope; enable = cfg.gamescope;
args = [ args = [
"-O HDMI-A-2" "-O HDMI-A-1"
"-F fsr" "-F fsr"
]; ];
}; };

View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
nix = { nix = {
package = pkgs.nixVersions.latest; package = pkgs.nixUnstable;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';