Compare commits

..

No commits in common. "a7c4c1ea9a5a0a0958a2b5bae69ad48f0b3c5ca5" and "0691e38add2eac115350cbc7df0c748554c36aa7" have entirely different histories.

4 changed files with 67 additions and 40 deletions

View file

@ -117,11 +117,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716859594, "lastModified": 1716214890,
"narHash": "sha256-wllEikCX/bMY/ZyRszXvar+AzYqmAx6fcjvcDJBkzfU=", "narHash": "sha256-/zk5wn2NC8yOZLd6IxpmiVnnSj8mZUznDTngXvNM/vU=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "6b6cba7dc79b459f80ffc44b3dd9973effdbed34", "rev": "7dc5651e1edcc5268fd72dfb90bd1c5c9fba942d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
"eaf": { "eaf": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717119016, "lastModified": 1711033476,
"narHash": "sha256-ZapSc1Z/e4FVE0Bv5ITXhvHTKUbr60/4MX22owIJ5rE=", "narHash": "sha256-4CPhEO4d66GzD3vOcNyRl6DmRDYiiIeRhX/9RUPZ+PM=",
"owner": "emacs-eaf", "owner": "emacs-eaf",
"repo": "emacs-application-framework", "repo": "emacs-application-framework",
"rev": "e16075c602d535b4d6fe1d59e7e05ecd468272da", "rev": "9bf8caba36e27fafcef5d8e68969a1a8eb5432ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -469,11 +469,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716729592, "lastModified": 1715381426,
"narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -490,11 +490,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717097707, "lastModified": 1716457508,
"narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -560,9 +560,7 @@
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs"
],
"systems": "systems", "systems": "systems",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
@ -594,11 +592,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717171694, "lastModified": 1715722806,
"narHash": "sha256-LN2lrcGdAMpkooleWSOV+/q1+wx1f3pSBs1TWeoMCkA=", "narHash": "sha256-KrSLG2H3KGELxTFdiBhv8U6D53Q3UsJsQO+KgEabsNA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "e0cad229c3d799c7f72b1217ab2eb300ceecf3ac", "rev": "c28d1011f4868c1a1ee80b10d9ee79900686df82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -778,26 +776,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716948383, "lastModified": 1714253743,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1716991068, "lastModified": 1716361217,
"narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -807,6 +806,21 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1706487304, "lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -822,7 +836,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1714912032, "lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@ -1093,7 +1107,7 @@
"mini-frame": "mini-frame", "mini-frame": "mini-frame",
"nix-doom-emacs": "nix-doom-emacs", "nix-doom-emacs": "nix-doom-emacs",
"nix-straight": "nix-straight", "nix-straight": "nix-straight",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"org-krita": "org-krita", "org-krita": "org-krita",
"org-nursery": "org-nursery", "org-nursery": "org-nursery",
@ -1126,14 +1140,14 @@
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1717121863, "lastModified": 1716517042,
"narHash": "sha256-/3sxIe7MZqF/jw1RTQCSmgTjwVod43mmrk84m50MJQ4=", "narHash": "sha256-PDPMpBVv+6XdV4FvBWk002IBGofDIWCpo9ewks0kStM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "2a7b53172ed08f856b8382d7dcfd36a4e0cbd866", "rev": "66a43411079d0d1b1b776c0a6ced20a5df896edb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1170,14 +1184,14 @@
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1717184467, "lastModified": 1716456264,
"narHash": "sha256-d1m43p1Pvh6LMkSHcwDadVIAQrm+2HFhVjQ3m7wzf84=", "narHash": "sha256-s9Tyj5pEivl/AsvrpkUkfR1Iu3zHfXpviPfe4HbPJ5I=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "ebaed9d4bf258f4eda7d0690c4092fadcbeefa9d", "rev": "290c8aef476ce98fff9cefc059284429d561a085",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -183,7 +183,6 @@
home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
hyprland.url = "github:hyprwm/Hyprland/cba1ade848feac44b2eda677503900639581c3f4?submodules=1"; hyprland.url = "github:hyprwm/Hyprland/cba1ade848feac44b2eda677503900639581c3f4?submodules=1";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprland-plugins.url = "github:hyprwm/hyprland-plugins"; hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
hyprland-plugins.inputs.hyprland.follows = "hyprland"; hyprland-plugins.inputs.hyprland.follows = "hyprland";
hycov.url = "github:DreamMaoMao/hycov/115cba558d439cc25d62ce38b7c62cde83f50ef5"; hycov.url = "github:DreamMaoMao/hycov/115cba558d439cc25d62ce38b7c62cde83f50ef5";

View file

@ -10,6 +10,12 @@ in
# Security # Security
security = { security = {
pam.services.swaylock = {
text = ''
auth include login
'';
};
# pam.services.gtklock = {};
pam.services.login.enableGnomeKeyring = true; pam.services.login.enableGnomeKeyring = true;
}; };
@ -22,8 +28,17 @@ in
xwayland = { xwayland = {
enable = true; enable = true;
}; };
portalPackage = pkgs-hyprland.xdg-desktop-portal-hyprland; portalPackage = pkgs.xdg-desktop-portal-hyprland;
}; };
}; };
# fixes opengl/mesa version mismatch
hardware.opengl = {
package = pkgs-hyprland.mesa.drivers;
# if you also want 32-bit support (e.g for Steam)
driSupport32Bit = true;
package32 = pkgs-hyprland.pkgsi686Linux.mesa.drivers;
};
services.xserver.displayManager.sddm.package = lib.mkForce pkgs-hyprland.sddm;
} }

View file

@ -7,7 +7,6 @@
programs.git.userEmail = userSettings.email; programs.git.userEmail = userSettings.email;
programs.git.extraConfig = { programs.git.extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
safe.directory = [ ("/home/" + userSettings.username + "/.dotfiles") safe.directory = "/home/" + userSettings.username + "/.dotfiles";
("/home/" + userSettings.username + "/.dotfiles/.git") ];
}; };
} }