wizardlink/linuxware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wizardlink:88b54f083b4edab9028d6b8e41e0c79ed6ed7cce
Branches Tags
wizardlink:main
wizardlink:pre-restructure
wizardlink:pre-nixos
..
compare: wizardlink:12f4c0b3eedfa044aaa16b82ca1b522d4c8d1901
Branches Tags
wizardlink:main
wizardlink:pre-restructure
wizardlink:pre-nixos

No commits in common. "88b54f083b4edab9028d6b8e41e0c79ed6ed7cce" and "12f4c0b3eedfa044aaa16b82ca1b522d4c8d1901" have entirely different histories.
88b54f083b ... 12f4c0b3ee

7 changed files with 71 additions and 51 deletions
Show stats Expand all files Collapse all files

97
flake.lock
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736102453, "lastModified": 1734906446,
"narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", "narHash": "sha256-6OWluVE2A8xi+8V3jN9KA72RCgJjYdyyuLBUjxZ2q2U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "4846091641f3be0ad7542086d52769bb7932bde6", "rev": "eecb74dc79bb6752a2a507e6edee3042390a6091",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736421950, "lastModified": 1735053786,
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50", "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736115290, "lastModified": 1734906236,
"narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", "narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "52202272d89da32a9f866c0d10305a5e3d954c50", "rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +221,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1736462318, "lastModified": 1735209119,
"narHash": "sha256-HRV9PN89cVaYi3s7For9fMJN5fWVMWYhE71qWODmjio=", "narHash": "sha256-zarY0tzIHyWcaImbIJOYRbBbHdLRdNDkRfOmzPVapRk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "f9c37ca43b14a4564d92b5788c81bf16f7bb719c", "rev": "e75e2cdac79417ffdbbbe903f72668953483a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,11 +246,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735774328, "lastModified": 1728345020,
"narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", "rev": "a7c183800e74f337753de186522b9017a07a8cee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,11 +275,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736114838, "lastModified": 1734906472,
"narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", "narHash": "sha256-pWPRv/GA/X/iAwoE6gMNUqn/ZeJX1IeLPRpZI0tTPK0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-qtutils", "repo": "hyprland-qtutils",
"rev": "6997fe382dcf396704227d2b98ffdd5066da6959", "rev": "c77109d7e1ddbcdb87cafd32ce411f76328ae152",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,11 +304,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735393019, "lastModified": 1734906259,
"narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "narHash": "sha256-P79t/7HbACO4/PuJBroGpTptvCWJtXTv+gWsF+sM6MI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "rev": "0404833ea18d543df44df935ebf1b497310eb046",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736164519, "lastModified": 1734796073,
"narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3c895da64b0eb19870142196fa48c07090b441c4", "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,11 +354,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735493474, "lastModified": 1734793513,
"narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "narHash": "sha256-rrrHcXapXJvGFqX+L/Bb0182L25jofAZ0fm1FInvrTQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "rev": "4d7367b6eee87397e2dbca2e78078dd0a4ef4c61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,6 +398,22 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1729850857, "lastModified": 1729850857,
@ -416,11 +432,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1734649271,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -432,11 +448,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1734649271,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,14 +469,15 @@
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
] ],
"nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1735882644, "lastModified": 1734797603,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -487,11 +504,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736482561, "lastModified": 1735272951,
"narHash": "sha256-f4hvN4MF26NIYeFA/H1sVW6KU5X9/jy9l95WrMsNUIU=", "narHash": "sha256-xGQ4qVMb8XRIpDYq+tNu3db5LzoKyAJFRl3VA0us/+M=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "77fb1ae39e0f5c60a7d0bd6ce078b9c56e3356cb", "rev": "c4e2fb9a6a46acf1fd842ae33a342e71bd9a2263",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
flake.nix
View file

@ -68,9 +68,21 @@
formatter."${system}" = pkgs.nixfmt-rfc-style; formatter."${system}" = pkgs.nixfmt-rfc-style;
homeManagerModules = { homeManagerModules = {
common = import ./modules/home-manager/common.nix;
default = import ./modules/home-manager;
emacsConfig = import ./modules/home-manager/programs/emacs; emacsConfig = import ./modules/home-manager/programs/emacs;
hyprlandConfig = import ./modules/home-manager/programs/hyprland; hyprlandConfig = import ./modules/home-manager/programs/hyprland;
neovim = import ./modules/home-manager/programs/neovim; neovim = import ./modules/home-manager/programs/neovim;
theming = import ./modules/home-manager/theming.nix;
};
nixosModules = {
common = import ./modules/nixos/common.nix;
default = import ./modules/nixos;
desktop = import ./modules/nixos/desktop.nix;
hardware = import ./modules/nixos/hardware.nix;
sound = import ./modules/nixos/sound.nix;
system = import ./modules/nixos/system.nix;
}; };
}; };
} }

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

@ -40,7 +40,7 @@
blender blender
krita krita
lmms lmms
#orca-slicer # FIXME: Broken right now, gotta wait for PR 369729 orca-slicer
shotcut shotcut
vcv-rack vcv-rack

1
modules/home-manager/programs/neovim/default.nix
View file

@ -96,7 +96,6 @@ in
# Rust # Rust
rust-analyzer rust-analyzer
cargo # Needed by blink-cmp
taplo taplo
vscode-extensions.vadimcn.vscode-lldb vscode-extensions.vadimcn.vscode-lldb

4
modules/home-manager/programs/neovim/lsp.nix
View file

@ -31,7 +31,6 @@ in
-- "go", -- "go",
"c", "c",
"cpp", "cpp",
"cs",
"h", "h",
"javascript", "javascript",
"jsx", "jsx",
@ -84,9 +83,6 @@ in
nixd = { nixd = {
settings = { settings = {
nixd = { nixd = {
nixpkgs = {
expr = 'import (builtins.getFlake (${location})).inputs.nixpkgs { }',
},
options = { options = {
nixos = { nixos = {
expr = '(builtins.getFlake ("${location}")).nixosConfigurations.${hostname}.options', expr = '(builtins.getFlake ("${location}")).nixosConfigurations.${hostname}.options',

4
modules/home-manager/programs/neovim/lua/community.lua
View file

@ -7,13 +7,9 @@ return {
"AstroNvim/astrocommunity", "AstroNvim/astrocommunity",
{ import = "astrocommunity.colorscheme.catppuccin" }, { import = "astrocommunity.colorscheme.catppuccin" },
{ import = "astrocommunity.media.vim-wakatime" },
{ import = "astrocommunity.editing-support.todo-comments-nvim" }, { import = "astrocommunity.editing-support.todo-comments-nvim" },
{ import = "astrocommunity.editing-support.zen-mode-nvim" }, { import = "astrocommunity.editing-support.zen-mode-nvim" },
{ import = "astrocommunity.completion.blink-cmp" },
{ import = "astrocommunity.motion.flash-nvim" }, { import = "astrocommunity.motion.flash-nvim" },
{ import = "astrocommunity.motion.flit-nvim" }, { import = "astrocommunity.motion.flit-nvim" },
{ import = "astrocommunity.motion.leap-nvim" }, { import = "astrocommunity.motion.leap-nvim" },

2
modules/nixos/sound.nix
View file

@ -2,7 +2,7 @@
{ {
# Enable sound with pipewire. # Enable sound with pipewire.
services.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;