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

updates/changes

Browse Source
This commit is contained in:
Liam Malone
2024-10-25 10:25:48 +02:00
parent 7f1ef8885c
commit 608664d417
5 changed files with 65 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+43 -45
View File
@@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728326504, "lastModified": 1729527199,
"narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=", "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0", "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -97,11 +97,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1728751148, "lastModified": 1729703875,
"narHash": "sha256-+KghVxxdTs86GhzC3ruWBFqdU9EsK7qzcO7FY8sIr8I=", "narHash": "sha256-haI5d6Xs4FzBN2x+BkmvnRUT0BAaaVnRcnW/DaEWXsw=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "ccb97c6c3360474594ca50fa0dcda5bce597ca81", "rev": "61aff898bd585d77c89f6b4a453992a6daec6f56",
"revCount": 7691, "revCount": 7775,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
}, },
@@ -139,11 +139,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728791962, "lastModified": 1729716953,
"narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "64c6325b28ebd708653dd41d88f306023f296184", "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -168,11 +168,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727821604, "lastModified": 1728669738,
"narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=", "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d", "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -191,11 +191,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1727257269, "lastModified": 1729679960,
"narHash": "sha256-b/j875k6RrxQLtbW+NCLw7NLToMd9KDYywjtUoihpq4=", "narHash": "sha256-RoFKwZsx4RHKUwO8LhEZtmI08VBVrWt3TdzoJgx1HJ0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "cc23f97836adbba1abc8edd48169fb1f1f698c32", "rev": "4d2fb9e73eb6b75336ed3eb198e900f94ada24f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -218,19 +218,17 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1728825236, "lastModified": 1729771961,
"narHash": "sha256-5BKg6tsbX6Ch7QffScQbsCOFbNG0qs4pMeyFNaqnmro=", "narHash": "sha256-KQDmhPEFST6KW1HLbRUrUFYww3UNvfGucd2ketSWmcI=",
"ref": "refs/heads/main", "owner": "hyprwm",
"rev": "05a5e0b4f1ced12f2a0330132f37b0081d7a5e4d", "repo": "Hyprland",
"revCount": 5335, "rev": "f603a22af0c8890b9742d761d44f0b595740f5b1",
"submodules": true, "type": "github"
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}, },
"original": { "original": {
"submodules": true, "owner": "hyprwm",
"type": "git", "repo": "Hyprland",
"url": "https://github.com/hyprwm/Hyprland" "type": "github"
} }
}, },
"hyprland-plugins": { "hyprland-plugins": {
@@ -250,11 +248,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728383680, "lastModified": 1729596320,
"narHash": "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=", "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "d05eb1ffba2ebffb5b4e1b407f134a4dcb411a88", "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -385,11 +383,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1728821111, "lastModified": 1729555766,
"narHash": "sha256-3dDOBfFkmusoF+6LWXkvQaSfzXb0DEqMEQQvEBbjN9Q=", "narHash": "sha256-sUIsjWpZLplSJXWyJcDZdvDweksXLH5r9GSkwg0kgBw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "11694528b4e0af597f25a5308d6872afd0b06807", "rev": "a093a9eefda2db2430dd1612b2858a55daf14738",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -435,11 +433,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727300645, "lastModified": 1728941256,
"narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -532,11 +530,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1728018373, "lastModified": 1729413321,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -548,11 +546,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1729665710,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -573,11 +571,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1728092656, "lastModified": 1729104314,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+2 -2
View File
@@ -9,8 +9,8 @@
}; };
ags.url = "github:Aylur/ags"; ags.url = "github:Aylur/ags";
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; # hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
# hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprland-plugins = { hyprland-plugins = {
url = "github:hyprwm/hyprland-plugins"; url = "github:hyprwm/hyprland-plugins";
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
hosts/default/configuration.nix
+17 -36
View File
@@ -30,6 +30,7 @@
Settings.Autoconnect = true; Settings.Autoconnect = true;
}; };
}; };
# Configure network proxy if necessary # Configure network proxy if necessary
# proxy.default = "http://user:password@proxy:port/"; # proxy.default = "http://user:password@proxy:port/";
# proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@@ -46,11 +47,10 @@
i18n= { i18n= {
defaultLocale = "en_US.UTF-8"; defaultLocale = "en_US.UTF-8";
inputMethod = { inputMethod = {
#enabled = "fcitx5";
type = "fcitx5";
enable = true; enable = true;
type = "fcitx5";
fcitx5 = { fcitx5 = {
# waylandFrontend = true; waylandFrontend = true;
addons = with pkgs; [ addons = with pkgs; [
fcitx5-mozc fcitx5-mozc
fcitx5-gtk fcitx5-gtk
@@ -62,24 +62,17 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
services = { services = {
xserver = { # xserver = {
enable = true;
xkb = {
layout = "us";
variant = "";
};
windowManager = {
i3.enable = true;
dwm.enable = true;
};
};
# displayManager.sddm = {
# enable = true; # enable = true;
# wayland.enable = true; # xkb = {
# layout = "us";
# variant = "";
# };
# windowManager = {
# i3.enable = true;
# dwm.enable = true;
# };
# }; # };
# desktopManager.plasma6.enable = true;
libinput.enable = true; libinput.enable = true;
@@ -102,25 +95,12 @@
thermald.enable = true; thermald.enable = true;
power-profiles-daemon.enable = false; power-profiles-daemon.enable = false;
## enable/disable camera
# pipewire.wireplumber.extraConfig = {
# "10-enable-camera" = {
# "wireplumber.profiles" = {
# main = {
# "monitor.libcamera" = "enabled";
# };
# };
# };
# };
}; };
security.pam.services.hyprlock = {}; security.pam.services.hyprlock = {};
environment.etc."greetd/environments".text = '' environment.etc."greetd/environments".text = ''
Hyprland Hyprland
none+i3
non+dwm
''; '';
hardware = { hardware = {
@@ -140,7 +120,8 @@
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-emoji noto-fonts-emoji
liberation_ttf liberation_ttf
fira-code fira-code
@@ -153,13 +134,13 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
dwm = prev.dwm.overrideAttrs (old: {src = /home/liamm/oss/dwm;}); dwm = prev.dwm.overrideAttrs (old: {url = "github:Liam-Malone/dwm";});
}) })
(final: prev: { (final: prev: {
dmenu = prev.dmenu.overrideAttrs (old: {src = /home/liamm/oss/dmenu;}); dmenu = prev.dmenu.overrideAttrs (old: {url = "github:Liam-Malone/dmenu";});
}) })
(final: prev: { (final: prev: {
slstatus = prev.slstatus.overrideAttrs (old: {src = /home/liamm/oss/slstatus;}); slstatus = prev.slstatus.overrideAttrs (old: {url = "github:Liam-Malone/slstatus";});
}) })
]; ];
# nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ # nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
hosts/default/home.nix
+1 -2
View File
@@ -62,7 +62,6 @@
openvpn openvpn
pamixer pamixer
pavucontrol pavucontrol
picom
powertop powertop
praat praat
prismlauncher prismlauncher
@@ -79,7 +78,6 @@
unzip unzip
wev wev
wl-clipboard wl-clipboard
xclip
xdg-user-dirs xdg-user-dirs
zip zip
zoom-us zoom-us
@@ -191,6 +189,7 @@
enableCompletion = true; enableCompletion = true;
enableVteIntegration = true; enableVteIntegration = true;
initExtra ='' initExtra =''
export SHELL=/run/current-system/sw/bin/bash
if [[ -z $ORIG_SHLVL ]]; then if [[ -z $ORIG_SHLVL ]]; then
export ORIG_SHLVL=$SHLVL export ORIG_SHLVL=$SHLVL
fi; fi;
modules/desktop/hyprland.nix
+2 -1
View File
@@ -348,6 +348,7 @@
} }
''; '';
}; };
lib.inputMethod.fcitx5.waylandFrontend = true; lib.inputMethod.fcitx5.waylandFrontend = true;
programs.hyprlock = { programs.hyprlock = {
enable = true; enable = true;
@@ -359,7 +360,7 @@
}; };
background = [ background = [
{ {
path = "/home/liamm/pictures/.wallpapers/bloody_snow.jpg"; path = "~/pictures/.wallpapers/bloody_snow.jpg";
blur_passes = 2; blur_passes = 2;
blur_size = 8; blur_size = 8;
} }