diff --git a/flake.lock b/flake.lock index eaaa2b5..587244c 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1710427903, - "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=", + "lastModified": 1711006105, + "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=", "owner": "nix-community", "repo": "disko", - "rev": "21d89b333ca300bef82c928c856d48b94a9f997c", + "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -137,11 +137,11 @@ }, "hardware": { "locked": { - "lastModified": 1710123225, - "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", + "lastModified": 1710783728, + "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", + "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", "type": "github" }, "original": { @@ -158,11 +158,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710593447, - "narHash": "sha256-cL3LPle9oIqItLfkEJ7PBYe5YLxs5WoiY2GcwSUeIDs=", + "lastModified": 1711058867, + "narHash": "sha256-iIaFlLZeP1rwichN+kHVrxUQNT8uMLldBXmKO3KNa30=", "owner": "helix-editor", "repo": "helix", - "rev": "6fea7876a47df8627a4b40361a6fc0f692c6601f", + "rev": "be307a420480178c1bc443992c8336f6471b8b7b", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1710974515, + "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710420202, - "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=", + "lastModified": 1710951922, + "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", "owner": "nixos", "repo": "nixpkgs", - "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da", + "rev": "f091af045dff8347d66d186a62d42aceff159456", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1711001935, + "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "20f77aa09916374aa3141cbc605c955626762c9a", "type": "github" }, "original": { @@ -284,11 +284,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": { @@ -363,11 +363,11 @@ ] }, "locked": { - "lastModified": 1710433464, - "narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=", + "lastModified": 1710644594, + "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090", + "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fb496f4..9e763d9 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,8 @@ hardware.url = "github:nixos/nixos-hardware"; # hardware.inputs.nixpkgs.follows = "nixpkgs"; - # hyprland.url = "github:hyprwm/Hyprland"; - # hyprland.inputs.nixpkgs.follows = "nixpkgs"; + hyprland.url = "github:hyprwm/Hyprland"; + hyprland.inputs.nixpkgs.follows = "nixpkgs"; api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git"; api-lyte-dev.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/home-manager/desktop.nix b/modules/home-manager/desktop.nix index 40f83e2..523c2bc 100644 --- a/modules/home-manager/desktop.nix +++ b/modules/home-manager/desktop.nix @@ -1,5 +1,5 @@ { - pkgs, + # pkgs, outputs, ... }: { diff --git a/modules/home-manager/wezterm/config.lua b/modules/home-manager/wezterm/config.lua index da6ac10..a997ba0 100644 --- a/modules/home-manager/wezterm/config.lua +++ b/modules/home-manager/wezterm/config.lua @@ -3,7 +3,7 @@ local wezterm = require'wezterm' -- rough duplication of colors.nix and font values from flake.nix FONT = { name = "IosevkaLyteTerm"; - size = 12; + size = 12.0; } COLORS = { @@ -16,7 +16,7 @@ if wezterm.config_builder then end 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{ font_spec, diff --git a/modules/nixos/desktop-usage.nix b/modules/nixos/desktop-usage.nix index 679a494..bd5e7b7 100644 --- a/modules/nixos/desktop-usage.nix +++ b/modules/nixos/desktop-usage.nix @@ -1,9 +1,7 @@ { imports = [ ./sway.nix - # ./hyprland.nix - # ./plasma.nix - # ./gnome.nix + ./hyprland.nix ./fonts.nix ./user-installed-applications.nix ./kde-connect.nix diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index 9137fe5..e6368cd 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -3,6 +3,11 @@ ./pipewire.nix ]; + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + }; + # services.xserver.libinput.enable = true; services.gnome.gnome-keyring.enable = true; @@ -15,11 +20,6 @@ # }; }; - programs.sway = { - enable = true; - wrapperFeatures.gtk = true; - }; - xdg.portal = { 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; programs.thunar = { diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index 50bfc33..d35c6d7 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -20,7 +20,7 @@ in { lutris # postgres wifi - # hyprland + hyprland { programs.steam.enable = true; programs.steam.gamescopeSession.enable = true;