lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updating...

Browse source
This commit is contained in:
Daniel Flanagan 2024-03-22 09:54:00 -05:00
parent 85fa907283
commit 7762e62809
7 changed files with 48 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
flake.lock
View file

@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710427903, "lastModified": 1711006105,
"narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=", "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "21d89b333ca300bef82c928c856d48b94a9f997c", "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,11 +101,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1710146030,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +122,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703887061, "lastModified": 1709087332,
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +137,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1710123225, "lastModified": 1710783728,
"narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -158,11 +158,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1710593447, "lastModified": 1711058867,
"narHash": "sha256-cL3LPle9oIqItLfkEJ7PBYe5YLxs5WoiY2GcwSUeIDs=", "narHash": "sha256-iIaFlLZeP1rwichN+kHVrxUQNT8uMLldBXmKO3KNa30=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "6fea7876a47df8627a4b40361a6fc0f692c6601f", "rev": "be307a420480178c1bc443992c8336f6471b8b7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +179,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710532761, "lastModified": 1710974515,
"narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1710420202, "lastModified": 1710951922,
"narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=", "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da", "rev": "f091af045dff8347d66d186a62d42aceff159456",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1704874635, "lastModified": 1710695816,
"narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +259,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1710451336, "lastModified": 1711001935,
"narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d691274a972b3165335d261cc4671335f5c67de9", "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -284,11 +284,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1708018599, "lastModified": 1710923068,
"narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +363,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710433464, "lastModified": 1710644594,
"narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=", "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090", "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -29,8 +29,8 @@
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";
# hardware.inputs.nixpkgs.follows = "nixpkgs"; # hardware.inputs.nixpkgs.follows = "nixpkgs";
# hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
# hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs";
api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git"; api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git";
api-lyte-dev.inputs.nixpkgs.follows = "nixpkgs"; api-lyte-dev.inputs.nixpkgs.follows = "nixpkgs";

2
modules/home-manager/desktop.nix
View file

@ -1,5 +1,5 @@
{ {
pkgs, # pkgs,
outputs, outputs,
... ...
}: { }: {

4
modules/home-manager/wezterm/config.lua
View file

@ -3,7 +3,7 @@ local wezterm = require'wezterm'
-- rough duplication of colors.nix and font values from flake.nix -- rough duplication of colors.nix and font values from flake.nix
FONT = { FONT = {
name = "IosevkaLyteTerm"; name = "IosevkaLyteTerm";
size = 12; size = 12.0;
} }
COLORS = { COLORS = {
@ -16,7 +16,7 @@ if wezterm.config_builder then
end end
local font_spec = { family = FONT.name, weight = 'Medium', italic = false } local font_spec = { family = FONT.name, weight = 'Medium', italic = false }
local font_size = tostring(FONT.size); local font_size = FONT.size;
local font = wezterm.font_with_fallback{ local font = wezterm.font_with_fallback{
font_spec, font_spec,

4
modules/nixos/desktop-usage.nix
View file

@ -1,9 +1,7 @@
{ {
imports = [ imports = [
./sway.nix ./sway.nix
# ./hyprland.nix ./hyprland.nix
# ./plasma.nix
# ./gnome.nix
./fonts.nix ./fonts.nix
./user-installed-applications.nix ./user-installed-applications.nix
./kde-connect.nix ./kde-connect.nix

13
modules/nixos/sway.nix
View file

@ -3,6 +3,11 @@
./pipewire.nix ./pipewire.nix
]; ];
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
};
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
@ -15,11 +20,6 @@
# }; # };
}; };
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
};
xdg.portal = { xdg.portal = {
enable = true; enable = true;
wlr.enable = true; wlr.enable = true;
@ -29,6 +29,9 @@
]; ];
}; };
# I'm currently leaning Plasma since 6.0 released, so we use that pinentry
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
services.dbus.enable = true; services.dbus.enable = true;
programs.thunar = { programs.thunar = {

2
nixos/foxtrot.nix
View file

@ -20,7 +20,7 @@ in {
lutris lutris
# postgres # postgres
wifi wifi
# hyprland hyprland
{ {
programs.steam.enable = true; programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true; programs.steam.gamescopeSession.enable = true;