update
This commit is contained in:
parent
9b6420d631
commit
1318405807
|
@ -33,7 +33,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
kernelPackages = pkgs.linuxPackages_zen;
|
kernelPackages = pkgs.linuxPackages_latest;
|
||||||
kernelModules = [ "i2c-dev" "i2c-piix4" ];
|
kernelModules = [ "i2c-dev" "i2c-piix4" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
firewall.enable = false;
|
firewall.enable = false;
|
||||||
extraHosts = ''
|
extraHosts = ''
|
||||||
192.168.0.18 steam.deck
|
192.168.0.18 steam.deck
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
|
@ -115,15 +115,12 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
|
||||||
users.users.manuel = {
|
users.users.manuel = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "audio" "games" "input" "scanner" "lp" "users" "video" "vboxusers" "wheel" "networkmanager" ];
|
extraGroups = [ "audio" "games" "input" "scanner" "lp" "users" "video" "vboxusers" "wheel" "networkmanager" ];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
};
|
};
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
bc compsize distrobox fd file git htop links2 libsForQt5.dolphin
|
bc compsize distrobox fd file git htop links2 libsForQt5.dolphin
|
||||||
|
@ -136,7 +133,6 @@
|
||||||
package = pkgs.gamescope_git;
|
package = pkgs.gamescope_git;
|
||||||
};
|
};
|
||||||
|
|
||||||
# List services that you want to enable:
|
|
||||||
programs = {
|
programs = {
|
||||||
dconf.enable = true;
|
dconf.enable = true;
|
||||||
hyprland.enable = true;
|
hyprland.enable = true;
|
||||||
|
@ -197,7 +193,6 @@
|
||||||
|
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
podman.enable = true;
|
podman.enable = true;
|
||||||
# virtualbox.host.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
|
@ -205,7 +200,7 @@
|
||||||
xdgOpenUsePortal = true;
|
xdgOpenUsePortal = true;
|
||||||
wlr.enable = false; #conflict with XDPH if enabled
|
wlr.enable = false; #conflict with XDPH if enabled
|
||||||
extraPortals = [
|
extraPortals = [
|
||||||
pkgs.xdg-desktop-portal-gtk
|
pkgs.xdg-desktop-portal-gtk
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -225,7 +220,7 @@
|
||||||
extraOptions = ''
|
extraOptions = ''
|
||||||
experimental-features = nix-command flakes
|
experimental-features = nix-command flakes
|
||||||
warn-dirty = false
|
warn-dirty = false
|
||||||
'';
|
'';
|
||||||
gc = {
|
gc = {
|
||||||
persistent = true;
|
persistent = true;
|
||||||
automatic = true;
|
automatic = true;
|
||||||
|
@ -234,16 +229,18 @@
|
||||||
};
|
};
|
||||||
settings = {
|
settings = {
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
extra-substituters = [
|
substituters = [
|
||||||
"https://nyx.chaotic.cx"
|
"https://nyx.chaotic.cx"
|
||||||
|
"https://hyprland.cachix.org"
|
||||||
];
|
];
|
||||||
extra-trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
|
"nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
|
||||||
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
|
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
|
||||||
|
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "22.05"; # Did you read the comment?
|
system.stateVersion = "22.05";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
fish-plugin-gruvbox-theme = { url = "github:Jomik/fish-gruvbox"; flake = false; };
|
fish-plugin-gruvbox-theme = { url = "github:Jomik/fish-gruvbox"; flake = false; };
|
||||||
|
|
||||||
arrpc = { url = "github:notashelf/arrpc-flake"; inputs.nixpkgs.follows = "nixpkgs"; };
|
arrpc = { url = "github:notashelf/arrpc-flake"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||||
chaotic-nyx.url = "github:chaotic-cx/nyx";
|
chaotic-nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||||
grub2-themes = { url = "github:vinceliuice/grub2-themes"; inputs.nixpkgs.follows = "nixpkgs"; };
|
grub2-themes = { url = "github:vinceliuice/grub2-themes"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||||
openmw-git = { url = "gitlab:OpenMW/openmw"; flake = false; };
|
openmw-git = { url = "gitlab:OpenMW/openmw"; flake = false; };
|
||||||
waybar = { url = "github:alexays/waybar"; flake = false; };
|
waybar = { url = "github:alexays/waybar"; flake = false; };
|
||||||
|
@ -27,7 +27,6 @@
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
|
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenvNoCC, fetchFromGitHub, gtk3 }:
|
{ stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "gruvbox-plus-icon-pack";
|
pname = "gruvbox-plus-icon-pack";
|
||||||
|
@ -13,10 +13,15 @@ stdenvNoCC.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ gtk3 ];
|
nativeBuildInputs = [ gtk3 ];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/icons/GruvboxPlus
|
mkdir -p $out/share/icons/GruvboxPlus
|
||||||
cp -r * $out/share/icons/GruvboxPlus
|
cp -r * $out/share/icons/GruvboxPlus
|
||||||
gtk-update-icon-cache $out/share/icons/GruvboxPlus
|
|
||||||
|
for theme in $out/share/icons/*; do
|
||||||
|
gtk-update-icon-cache $theme
|
||||||
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontDropIconThemeCache = true;
|
dontDropIconThemeCache = true;
|
||||||
|
|
|
@ -17,6 +17,8 @@
|
||||||
nvim-surround
|
nvim-surround
|
||||||
nvim-web-devicons
|
nvim-web-devicons
|
||||||
which-key-nvim
|
which-key-nvim
|
||||||
|
smart-splits-nvim
|
||||||
|
legendary-nvim
|
||||||
|
|
||||||
vim-fugitive
|
vim-fugitive
|
||||||
|
|
||||||
|
|
|
@ -90,13 +90,12 @@ require("nvim-treesitter.configs").setup({
|
||||||
highlight = { enable = true, },
|
highlight = { enable = true, },
|
||||||
})
|
})
|
||||||
|
|
||||||
require("which-key").setup()
|
|
||||||
|
require("smart-splits").setup()
|
||||||
|
|
||||||
require("trouble").setup()
|
require("trouble").setup()
|
||||||
|
|
||||||
local telescope = require("telescope")
|
local telescope = require("telescope") local telescope_builtin = require("telescope.builtin")
|
||||||
local telescope_builtin = require("telescope.builtin")
|
|
||||||
|
|
||||||
telescope.load_extension("fzf")
|
telescope.load_extension("fzf")
|
||||||
|
|
||||||
require('nvim-surround').setup()
|
require('nvim-surround').setup()
|
||||||
|
@ -114,7 +113,7 @@ lspconfig.lua_ls.setup {
|
||||||
Lua = {
|
Lua = {
|
||||||
runtime = { version = "LuaJIT" },
|
runtime = { version = "LuaJIT" },
|
||||||
diagnostics = { globals = { "vim" } },
|
diagnostics = { globals = { "vim" } },
|
||||||
workspace = {
|
workspace = {
|
||||||
library = vim.api.nvim_get_runtime_file("", true),
|
library = vim.api.nvim_get_runtime_file("", true),
|
||||||
checkThirdParty = false
|
checkThirdParty = false
|
||||||
},
|
},
|
||||||
|
@ -254,36 +253,26 @@ cmp.setup.cmdline("/", {
|
||||||
{ name = "buffer" },
|
{ name = "buffer" },
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
-- keymaps
|
-- keymaps
|
||||||
vim.keymap.set("n", "<C-n>", "<cmd>NeoTreeFocusToggle<CR>")
|
require("which-key").setup()
|
||||||
|
require("legendary").setup({
|
||||||
|
keymaps = {
|
||||||
|
{ "<S-h>", "<cmd>BufferLineCyclePrev<CR>", description = "Prev buffer" },
|
||||||
|
{ "<S-l>", "<cmd>BufferLineCycleNext<CR>", description = "Next buffer" },
|
||||||
|
{ "<ESC>", "<cmd>noh<CR><ESC>", description = "Escape and clear hlsearch", mode = {"n", "i" }},
|
||||||
|
|
||||||
vim.keymap.set("n", "<C-h>", "<C-w>h", { desc = "Go to left window" })
|
{ "<Leader>ff", telescope_builtin.find_files, description = "Find Files" },
|
||||||
vim.keymap.set("n", "<C-j>", "<C-w>j", { desc = "Go to lower window" })
|
{ "<Leader>fg", telescope_builtin.live_grep, description = "Live Grep" },
|
||||||
vim.keymap.set("n", "<C-k>", "<C-w>k", { desc = "Go to upper window" })
|
{ "<Leader>fb", telescope_builtin.buffers, description = "List Buffers" },
|
||||||
vim.keymap.set("n", "<C-l>", "<C-w>l", { desc = "Go to right window" })
|
{ "<Leader>fh", telescope_builtin.help_tags, description = "Help Tags" },
|
||||||
|
{ "<Leader>fc", telescope_builtin.git_files, description = "Find Files (Git)" },
|
||||||
|
|
||||||
vim.keymap.set("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase window height" })
|
{ "<C-n>", "<cmd>NeoTreeFocusToggle<CR>", description = "Open NeoTree" },
|
||||||
vim.keymap.set("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" })
|
{ "<leader>xx", "<cmd>TroubleToggle<CR>", description = "Toggle Trouble Window", opts = { silent = true, noremap = true } },
|
||||||
vim.keymap.set("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
|
|
||||||
vim.keymap.set("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
|
},
|
||||||
vim.keymap.set("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
|
extensions = {
|
||||||
vim.keymap.set("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
|
smart_splits = {},
|
||||||
vim.keymap.set("n", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
|
},
|
||||||
vim.keymap.set("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
|
})
|
||||||
vim.keymap.set("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
|
|
||||||
vim.keymap.set({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<S-h>", "<cmd>BufferLineCyclePrev<cr>", { desc = "Prev buffer" })
|
|
||||||
vim.keymap.set("n", "<S-l>", "<cmd>BufferLineCycleNext<cr>", { desc = "Next buffer" })
|
|
||||||
vim.keymap.set("n", "[b", "<cmd>BufferLineCyclePrev<cr>", { desc = "Prev buffer" })
|
|
||||||
vim.keymap.set("n", "]b", "<cmd>BufferLineCycleNext<cr>", { desc = "Next buffer" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", '<leader>ff', telescope_builtin.find_files, { desc = "Find Files" })
|
|
||||||
vim.keymap.set("n", '<leader>fg', telescope_builtin.live_grep, { desc = "Live Grep" })
|
|
||||||
vim.keymap.set("n", '<leader>fb', telescope_builtin.buffers, { desc = "List Buffers" })
|
|
||||||
vim.keymap.set("n", '<leader>fh', telescope_builtin.help_tags, { desc = "Help Tags" })
|
|
||||||
vim.keymap.set("n", '<leader>fc', telescope_builtin.git_files, { desc = "Find Files (Git)" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>", { silent = true, noremap = true, desc = "Toggle Trouble Window" })
|
|
||||||
|
|
|
@ -138,7 +138,6 @@ in
|
||||||
exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1
|
exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1
|
||||||
exec-once = ${pkgs.swww}/bin/swww-daemon
|
exec-once = ${pkgs.swww}/bin/swww-daemon
|
||||||
exec-once = ${pkgs.arrpc}/bin/arRPC
|
exec-once = ${pkgs.arrpc}/bin/arRPC
|
||||||
exec-once = ${pkgs.jamesdsp}/bin/jamesdsp -t
|
|
||||||
|
|
||||||
exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh;
|
exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh;
|
||||||
exec = pkill waybar; ${pkgs.waybar_hyprland}/bin/waybar
|
exec = pkill waybar; ${pkgs.waybar_hyprland}/bin/waybar
|
||||||
|
@ -160,7 +159,6 @@ in
|
||||||
bind = ${modKey} SHIFT, 3, movetoworkspace, 3
|
bind = ${modKey} SHIFT, 3, movetoworkspace, 3
|
||||||
bind = ${modKey} SHIFT, 4, movetoworkspace, 4
|
bind = ${modKey} SHIFT, 4, movetoworkspace, 4
|
||||||
bind = ${modKey} SHIFT, 5, movetoworkspace, 5
|
bind = ${modKey} SHIFT, 5, movetoworkspace, 5
|
||||||
bind = ${modKey} SHIFT, 6, movetoworkspace, 6
|
|
||||||
|
|
||||||
|
|
||||||
bindm = ${modKey}, mouse:272, movewindow
|
bindm = ${modKey}, mouse:272, movewindow
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
bc
|
bc
|
||||||
bottom
|
bottom
|
||||||
calcurse
|
calcurse
|
||||||
jamesdsp
|
|
||||||
gimp
|
gimp
|
||||||
gnome.file-roller
|
gnome.file-roller
|
||||||
gnome.gnome-boxes
|
gnome.gnome-boxes
|
||||||
|
@ -144,7 +143,7 @@
|
||||||
services.gnome-keyring.enable = true;
|
services.gnome-keyring.enable = true;
|
||||||
|
|
||||||
services.easyeffects = {
|
services.easyeffects = {
|
||||||
enable = false;
|
enable = true;
|
||||||
preset = "DT770";
|
preset = "DT770";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in New Issue