wyj/Nix-Hyprland
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wyj/Nix-Hyprland:48a71a57dbb0763cd69eb2855e4fae14f50a27ea
Branches Tags
wyj/Nix-Hyprland:dev
..
compare: wyj/Nix-Hyprland:dev
Branches Tags
wyj/Nix-Hyprland:dev
12 Commits
48a71a57db .. dev
Author SHA1 Message Date
wyj 1aa26a0b4b try: intel mesa 2025-03-10 00:59:08 -04:00
wyj ff2d90ae0e Revert "fix: add vulkan-intel" 
This reverts commit b5c16479c6.
 2025-03-10 00:55:33 -04:00
wyj b5c16479c6 fix: add vulkan-intel 2025-03-10 00:53:14 -04:00
wyj f73e983c51 update: lock 2025-03-10 00:47:40 -04:00
wyj 813842534d fix: nerd fonts in individual pack 2025-03-10 00:30:44 -04:00
wyj 45179ddfa5 fix: remove kdenlive 2025-03-10 00:24:12 -04:00
wyj 6d358a4628 fix: update sound 2025-03-10 00:22:18 -04:00
wyj 2c0d333577 update: fix 2024-11-09 23:57:51 -05:00
wyj 0603084590 update: update 2024-05-24 03:29:31 -04:00
wyj 60e9df4b82 fix: chromium use wayland 2024-05-24 03:29:17 -04:00
wyj 67598a40db fix: xwayland.force_zero_scaling 2024-05-24 02:28:08 -04:00
wyj 041805571a update: nature_scroll 2024-05-24 02:22:47 -04:00
6 changed files with 61 additions and 189 deletions
Expand all files Collapse all files
flake.lock
Generated
+44 -178
View File
@@ -1,57 +1,5 @@
{ {
"nodes": { "nodes": {
"devshell": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1713532798,
"narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
"owner": "numtide",
"repo": "devshell",
"rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@@ -60,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715865404, "lastModified": 1738453229,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -73,31 +21,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1731533236,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -106,28 +39,6 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"nixvim",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -135,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715930644, "lastModified": 1741579508,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "narHash": "sha256-skRbH+UF2ES+msEa+KWi7AQFX73S+QsGlPsyCU6XyE0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "rev": "744f749dd6fbc1489591ea370b95156858629cb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -148,55 +59,41 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": { "ixx": {
"inputs": { "inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nuschtosSearch",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1715930644, "lastModified": 1729958008,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "nix-community", "owner": "NuschtOS",
"repo": "home-manager", "repo": "ixx",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "NuschtOS",
"repo": "home-manager", "ref": "v0.0.6",
"type": "github" "repo": "ixx",
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715901937,
"narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1741379970,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -208,11 +105,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1716218643, "lastModified": 1720535198,
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -224,24 +121,18 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks", "nuschtosSearch": "nuschtosSearch"
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1716274770, "lastModified": 1741098523,
"narHash": "sha256-uljGfzFKetmvwYyfMCa3WY7jZbRnN/g7C/qk0/bKsWA=", "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "c9f3d15796c80c336662e9dd2a0d6820e5fa2841", "rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -250,30 +141,26 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-utils": "flake-utils",
"gitignore": "gitignore", "ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1715870890, "lastModified": 1738508923,
"narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
"owner": "cachix", "owner": "NuschtOS",
"repo": "pre-commit-hooks.nix", "repo": "search",
"rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "cachix", "owner": "NuschtOS",
"repo": "pre-commit-hooks.nix", "repo": "search",
"type": "github" "type": "github"
} }
}, },
@@ -299,27 +186,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1715940852,
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
home-manager/modules/wms/hyprland.nix
+3 -1
View File
@@ -8,6 +8,8 @@
monitor = ",preferred,auto,2"; monitor = ",preferred,auto,2";
xwayland.force_zero_scaling = true;
env = [ env = [
"XDG_CURRENT_DESKTOP,Hyprland" "XDG_CURRENT_DESKTOP,Hyprland"
"XDG_SESSION_TYPE,wayland" "XDG_SESSION_TYPE,wayland"
@@ -30,7 +32,7 @@
follow_mouse = 1; follow_mouse = 1;
touchpad = { touchpad = {
natural_scroll = false; natural_scroll = true;
}; };
sensitivity = 0; # -1.0 - 1.0, 0 means no modification. sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
nixos/modules/bundle.nix
+2 -2
View File
@@ -7,11 +7,11 @@
./user.nix ./user.nix
./xserver.nix ./xserver.nix
./nm.nix ./nm.nix
./virtmanager.nix #./virtmanager.nix
./hyprland.nix ./hyprland.nix
./trim.nix ./trim.nix
./bluetooth.nix ./bluetooth.nix
./services.nix ./services.nix
./nixvim/nixvim.nix #./nixvim/nixvim.nix
]; ];
} }
nixos/modules/hyprland.nix
+1
View File
@@ -1,3 +1,4 @@
{ {
programs.hyprland.enable = true; programs.hyprland.enable = true;
hardware.graphics.enable = true;
} }
nixos/modules/sound.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
hardware.pulseaudio.enable = false; services.pulseaudio.enable = false;
sound.enable = true; #sound.enable = true;
# rtkit is optional but recommended # rtkit is optional but recommended
security.rtkit.enable = true; security.rtkit.enable = true;
nixos/packages.nix
+9 -6
View File
@@ -2,6 +2,7 @@
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = ["python-2.7.18.8" "electron-25.9.0"]; permittedInsecurePackages = ["python-2.7.18.8" "electron-25.9.0"];
chromium.commandLineArgs = "--ozone-platform=wayland";
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@@ -13,7 +14,7 @@
rofi rofi
wofi wofi
mpv mpv
kdenlive #kdenlive
discord discord
gparted gparted
obsidian obsidian
@@ -28,7 +29,7 @@
(python3.withPackages (ps: with ps; [ requests ])) (python3.withPackages (ps: with ps; [ requests ]))
# CLI utils # CLI utils
neofetch #neofetch
file file
tree tree
wget wget
@@ -87,9 +88,9 @@
pamixer pamixer
# GPU stuff # GPU stuff
amdvlk #amdvlk
rocm-opencl-icd #rocm-opencl-icd
glaxnimate #glaxnimate
# Screenshotting # Screenshotting
grim grim
@@ -114,6 +115,8 @@
font-awesome font-awesome
powerline-fonts powerline-fonts
powerline-symbols powerline-symbols
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) #(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
pkgs.nerd-fonts.code-new-roman
pkgs.nerd-fonts.symbols-only
]; ];
} }