liam/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

should have added ghostty to system packages

Browse Source
This commit is contained in:
Liam Malone
2024-05-03 11:50:34 +01:00
parent 013eccb642
commit 929e5c4c8a
5 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+85 -80
View File
@@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1712317700,
"narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=",
"lastModified": 1714679908,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
"type": "github"
},
"original": {
@@ -22,7 +22,10 @@
},
"hyprcursor": {
"inputs": {
"hyprlang": "hyprlang_2",
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
@@ -33,11 +36,11 @@
]
},
"locked": {
"lastModified": 1711466786,
"narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
"lastModified": 1713612213,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
"type": "github"
},
"original": {
@@ -52,14 +55,14 @@
"nixpkgs": [
"nixpkgs"
],
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1710180874,
"narHash": "sha256-ZSn3wXQuRz36Ta/L+UCFKuUVG6QpwK2QmRkPjpQprU4=",
"lastModified": 1713472482,
"narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=",
"owner": "hyprwm",
"repo": "hypridle",
"rev": "4395339a2dc410bcf49f3e24f9ed3024fdb25b0a",
"rev": "7cff4581a3753154fc5b41f39a098fad49b777b1",
"type": "github"
},
"original": {
@@ -72,18 +75,19 @@
"inputs": {
"hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang_3",
"hyprlang": "hyprlang_2",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs",
"systems": "systems_3",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1712333769,
"narHash": "sha256-OmD11ljYCvr/13ShvxebUfebRT8QbSngH6okJe4SIMo=",
"lastModified": 1714700359,
"narHash": "sha256-y5ecarXckRPV+K6cmfcWs/RiyvZbNZDkA5su9gEQ/6I=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "965a2e5b213eee595808bc7bff28e7df59442720",
"rev": "387127b12ab5df8f8f40e8da7d76f47636562cab",
"type": "github"
},
"original": {
@@ -104,11 +108,11 @@
]
},
"locked": {
"lastModified": 1712281995,
"narHash": "sha256-NoRAAqed5t3b3/Ebt5SW9BWh8dyKRmw9i9KjLcMdLsE=",
"lastModified": 1714613493,
"narHash": "sha256-OhEh+iBiDRMnMNTWz5cHhfg+63+F71DKM2Xj9a21rw0=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "a7145f019254a7d953d56945c168d1bc698c35e4",
"rev": "18daf37b7c4e6e51ca2bf8953ce4cff1c38ca725",
"type": "github"
},
"original": {
@@ -147,14 +151,15 @@
"nixpkgs": [
"hypridle",
"nixpkgs"
]
],
"systems": "systems"
},
"locked": {
"lastModified": 1708212860,
"narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=",
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "11d5ccda071c153dfdc18ef65338956a51cef96a",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
@@ -167,17 +172,19 @@
"inputs": {
"nixpkgs": [
"hyprland",
"hyprcursor",
"nixpkgs"
],
"systems": "systems_2"
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
@@ -187,31 +194,6 @@
}
},
"hyprlang_3": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1711250455,
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_4": {
"inputs": {
"nixpkgs": [
"hyprlock",
@@ -220,11 +202,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1711250455,
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
@@ -235,18 +217,18 @@
},
"hyprlock": {
"inputs": {
"hyprlang": "hyprlang_4",
"hyprlang": "hyprlang_3",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_5"
},
"locked": {
"lastModified": 1711884603,
"narHash": "sha256-y1Om75muuJcEoLd/FOYGIZ5/ja/Mc4iBX/9S7vWF0C8=",
"lastModified": 1714659497,
"narHash": "sha256-CJH9xc2y0AU+2GQSg2dubcPep/iIwb5f/cr2+0LGBWY=",
"owner": "hyprwm",
"repo": "hyprlock",
"rev": "071ebcefb9070e4397d75103f5f535b58dacf250",
"rev": "9cca0dbb45941e13322ff95796f486676f061c6e",
"type": "github"
},
"original": {
@@ -255,13 +237,38 @@
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1714589749,
"narHash": "sha256-zzkb5vc4n/YI5KHrMie7oMZlgCKxs7zm/ybVXNL02Z0=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "c8c2151c607a036ddfc790f5f70237ab984266aa",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github"
},
"original": {
@@ -273,11 +280,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"lastModified": 1714635257,
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
"type": "github"
},
"original": {
@@ -375,20 +382,18 @@
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1709983277,
"narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
"type": "gitlab"
"lastModified": 1713731601,
"narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
"type": "gitlab"
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
}
},
"xdph": {
@@ -411,11 +416,11 @@
]
},
"locked": {
"lastModified": 1709299639,
"narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
"lastModified": 1714060055,
"narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "2d2fb547178ec025da643db57d40a971507b82fe",
"rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
"type": "github"
},
"original": {
flake.nix
+9 -1
View File
@@ -21,9 +21,12 @@
url = "github:hyprwm/hypridle";
inputs.nixpkgs.follows = "nixpkgs";
};
ghostty = {
url = "git+ssh://git@github.com/mitchellh/ghostty";
};
};
outputs = { self, nixpkgs, hyprland, ... }@inputs:
outputs = { self, nixpkgs, ghostty, hyprland, ... }@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
@@ -35,6 +38,11 @@
modules = [
hyprland.nixosModules.default
./hosts/default/configuration.nix
{
environment.systemPackages = [
ghostty.packages.x86_64-linux.default
];
}
];
};
gamemachine = nixpkgs.lib.nixosSystem {
hosts/default/configuration.nix
+2 -1
View File
@@ -98,7 +98,8 @@
system76.enableAll = true;
};
security.pam.services.swaylock = {};
# security.pam.services.swaylock = {};
security.pam.services.hyprlock = {};
# Enable sound.
sound.enable = true;
hosts/default/home.nix
+3
View File
@@ -27,6 +27,7 @@
# ];
home.packages = with pkgs; [
android-studio
audacity
brave
brightnessctl
contour
@@ -37,6 +38,7 @@
firefox
floorp
gnome.gnome-keyring
gnome.gnome-sound-recorder
gnome.gvfs
gnome.nautilus
grim
@@ -48,6 +50,7 @@
libtool
libreoffice
minecraft
mpv
neofetch
networkmanagerapplet
openvpn
modules/desktop/hyprland.nix
+12 -13
View File
@@ -29,8 +29,7 @@
];
};
plugins = [
inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
# hyprland-plugins.packages.${pkgs.system}.hyprbars
# inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
];
settings = {
monitor = [
@@ -167,7 +166,7 @@
"$screenshotarea" = "hyprctl keyword animation 'fadeOut,0,0,default'; grimblast --notify copy area; hyprctl keyword animation 'fadeOut,1,4,default'";
bind = [
"$mainMod, grave, hyprexpo:expo, toggle" # can be: toggle, off/disable or on/enable
# "$mainMod, grave, hyprexpo:expo, toggle" # can be: toggle, off/disable or on/enable
"$altMod, Return, exec, $HOME/.local/bin/ghostty"
"$mainMod, Return, exec, $HOME/.local/bin/ghostty" # for apps that yoink alt- binds
"$altMod SHIFT, Return, exec, alacritty"
@@ -314,17 +313,17 @@
bind=, escape,submap,reset
submap = reset
plugin {
hyprexpo {
columns = 3
gapSize = 4
workspace_method = "center current"
enable_gesture = true
gesture_distance = 300
gesture_negative = true
}
}
'';
# plugin {
# hyprexpo {
# columns = 3
# gapSize = 4
# workspace_method = "center current"
# enable_gesture = true
# gesture_distance = 300
# gesture_negative = true
# }
# }
};
lib.inputMethod.fcitx5.waylandFrontend = true;
programs.hyprlock = {