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

Compare commits

base: wyj/Nix-Hyprland:78dca0df4cbd87c2b26c33d915ef7322e81ad96c
Branches Tags
wyj/Nix-Hyprland:dev
...
compare: wyj/Nix-Hyprland:dev
Branches Tags
wyj/Nix-Hyprland:dev
23 Commits
78dca0df4c ... 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
wyj 48a71a57db fix: remove no_cursor_wrap 2024-05-24 02:19:20 -04:00
wyj 220bddb57c fix: qt.platformTheme to qt.platformTheme.name 2024-05-23 18:38:19 -04:00
wyj c3157241f0 update: alacritty font size 13->16 2024-05-23 18:27:28 -04:00
wyj 02069036d1 init 2024-05-21 06:37:47 -04:00
Andrey0189 d8d53e3ffb Swipe forever 2024-04-18 11:47:37 +05:00
Andrey0189 36a687bd25 Brightness control for hyprland 2024-04-18 11:38:07 +05:00
Andrey0189 a7fca11b91 Keymap tweaks 2024-04-18 11:37:45 +05:00
Andrey0189 07209b5720 Optimizing keymaps 2024-04-18 09:51:55 +05:00
Andrey0189 4163673d44 +bluez-tools 2024-04-17 09:08:32 +05:00
Andrey0189 66e778ecd1 bluez 2024-04-17 08:51:23 +05:00
Andrey0189 e8d1371ae8 Bluetooth 2024-04-17 08:15:16 +05:00
20 changed files with 171 additions and 265 deletions
Expand all files Collapse all files
disko.nix
-41
View File
@@ -1,41 +0,0 @@
{
disko.devices = {
disk = {
my-disk = {
device = "/dev/sdb";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "256M";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
swap = {
size = "8G";
content = {
type = "swap";
resumeDevice = true;
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
};
};
}
flake.lock
Generated
+44 -174
View File
@@ -1,57 +1,5 @@
{ {
"nodes": { "nodes": {
"devshell": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1711099426,
"narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
"owner": "numtide",
"repo": "devshell",
"rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
"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": 1712014858, "lastModified": 1738453229,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -78,11 +26,11 @@
"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": {
@@ -91,46 +39,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"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": [
@@ -138,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713294767, "lastModified": 1741579508,
"narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", "narHash": "sha256-skRbH+UF2ES+msEa+KWi7AQFX73S+QsGlPsyCU6XyE0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", "rev": "744f749dd6fbc1489591ea370b95156858629cb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -151,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": 1712989663, "lastModified": 1729958008,
"narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "nix-community", "owner": "NuschtOS",
"repo": "home-manager", "repo": "ixx",
"rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", "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": 1711763326,
"narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713248628, "lastModified": 1741379970,
"narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -211,11 +105,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1713145326, "lastModified": 1720535198,
"narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=", "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e", "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -227,22 +121,18 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
"lastModified": 1713294906, "lastModified": 1741098523,
"narHash": "sha256-xJJZdCBzVFpVppaYyUK4lTTNOnbAxrjhodoJL3Oi91E=", "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "514a51877df9fe41ffc38c5237e3c4e5327e7607", "rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -251,31 +141,26 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-utils": "flake-utils",
"flake-utils": "flake-utils_2", "ixx": "ixx",
"gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1712897695, "lastModified": 1738508923,
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
"owner": "cachix", "owner": "NuschtOS",
"repo": "pre-commit-hooks.nix", "repo": "search",
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "cachix", "owner": "NuschtOS",
"repo": "pre-commit-hooks.nix", "repo": "search",
"type": "github" "type": "github"
} }
}, },
@@ -301,21 +186,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
flake.nix
+2 -2
View File
@@ -24,7 +24,7 @@
in { in {
# nixos - system hostname # nixos - system hostname
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos-c940 = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
pkgs-stable = import nixpkgs-stable { pkgs-stable = import nixpkgs-stable {
inherit system; inherit system;
@@ -38,7 +38,7 @@
]; ];
}; };
homeConfigurations.amper = home-manager.lib.homeManagerConfiguration { homeConfigurations.wyj = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
modules = [ ./home-manager/home.nix ]; modules = [ ./home-manager/home.nix ];
}; };
home-manager/home.nix
+2 -2
View File
@@ -6,8 +6,8 @@
]; ];
home = { home = {
username = "amper"; username = "wyj";
homeDirectory = "/home/amper"; homeDirectory = "/home/wyj";
stateVersion = "23.11"; stateVersion = "23.11";
}; };
} }
home-manager/modules/alacritty.nix
+1 -1
View File
@@ -5,7 +5,7 @@
window.opacity = 0.95; window.opacity = 0.95;
font = { font = {
size = 13.0; size = 16.0;
# draw_bold_text_with_bright_colors = true; # draw_bold_text_with_bright_colors = true;
normal = { normal = {
family = "JetBrains Mono"; family = "JetBrains Mono";
home-manager/modules/git.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Andrey0189"; userName = "Yingjie Wang";
userEmail = "varnavsky06@gmail.com"; userEmail = "phywyj@gmail.com";
}; };
} }
home-manager/modules/qt.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
qt = { qt = {
enable = true; enable = true;
platformTheme = "qtct"; platformTheme.name = "qtct";
style.name = "kvantum"; style.name = "kvantum";
}; };
home-manager/modules/wms/hyprland.nix
+9 -4
View File
@@ -6,7 +6,9 @@
settings = { settings = {
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
monitor = ",preferred,auto,1"; monitor = ",preferred,auto,2";
xwayland.force_zero_scaling = true;
env = [ env = [
"XDG_CURRENT_DESKTOP,Hyprland" "XDG_CURRENT_DESKTOP,Hyprland"
@@ -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.
@@ -44,8 +46,6 @@
"col.inactive_border" = "rgba(595959aa)"; "col.inactive_border" = "rgba(595959aa)";
layout = "dwindle"; layout = "dwindle";
no_cursor_warps = false;
}; };
decoration = { decoration = {
@@ -94,6 +94,7 @@
workspace_swipe_fingers = 3; workspace_swipe_fingers = 3;
workspace_swipe_invert = false; workspace_swipe_invert = false;
workspace_swipe_distance = 200; workspace_swipe_distance = 200;
workspace_swipe_forever = true;
}; };
misc = { misc = {
@@ -184,6 +185,10 @@
", XF86AudioLowerVolume, exec, pamixer -d 5 " ", XF86AudioLowerVolume, exec, pamixer -d 5 "
", XF86AudioMute, exec, pamixer -t" ", XF86AudioMute, exec, pamixer -t"
", XF86AudioMicMute, exec, pamixer --default-source -m" ", XF86AudioMicMute, exec, pamixer --default-source -m"
# Brightness control
", XF86MonBrightnessDown, exec, brightnessctl set 5%- "
", XF86MonBrightnessUp, exec, brightnessctl set +5% "
# Configuration files # Configuration files
''$mainMod SHIFT, N, exec, alacritty -e sh -c "rb"'' ''$mainMod SHIFT, N, exec, alacritty -e sh -c "rb"''
nixos/configuration.nix
+2 -2
View File
@@ -9,9 +9,9 @@
./modules/xserver.nix ./modules/xserver.nix
]; ];
networking.hostName = "nixos"; # Define your hostname. networking.hostName = "nixos-c940"; # Define your hostname.
time.timeZone = "Asia/Tashkent"; # Set your time zone. time.timeZone = "America/New_York"; # Set your time zone.
i18n.defaultLocale = "en_US.UTF-8"; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; # Select internationalisation properties.
nixos/hardware-configuration.nix
+7 -11
View File
@@ -8,30 +8,26 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/c3c28b79-eb8b-4a45-8ee2-5576e82cb4e5"; { device = "/dev/disk/by-uuid/a751720d-df78-43c3-bc1e-fabdc168fbc2";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [ ];
[ { device = "/dev/disk/by-uuid/3e9f0c85-9a78-44ad-a29c-84afc3b257cc"; }
{ device = "/dev/disk/by-uuid/d80806ff-1b8c-4cac-b7f8-593e030abcda"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s20f0u1.useDHCP = lib.mkDefault true;
# networking.interfaces.virbr0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }
nixos/modules/bluetooth.nix
+14
View File
@@ -0,0 +1,14 @@
{
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
settings = {
General = {
Enable = "Source,Sink,Media,Socket";
Experimental = true;
};
};
};
services.blueman.enable = true;
}
nixos/modules/bootloader.nix
+1 -4
View File
@@ -1,6 +1,3 @@
{ {
boot.loader.systemd-boot.enable = true; boot.loader.grub.device = "nodev";
boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelParams = [ "psmouse.synaptics_intertouch=0" ];
} }
nixos/modules/bundle.nix
+4 -2
View File
@@ -7,9 +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
./nixvim/nixvim.nix ./bluetooth.nix
./services.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/nixvim/keymaps.nix
+60 -7
View File
@@ -1,15 +1,68 @@
{ { config, lib, ... }: {
programs.nixvim = { programs.nixvim = {
globals = { globals = {
mapleader = "\\"; mapleader = "\\";
maplocalleader = "\\"; maplocalleader = "\\";
}; };
keymaps = [ keymaps = let
{ normal =
key = "<leader>n"; lib.mapAttrsToList
action = "<cmd>Neotree<CR>"; (key: action: {
} mode = "n";
]; inherit action key;
})
{
# Open Neotree
"<leader>n" = ":Neotree<CR>";
# Esc to clear search results
"<esc>" = ":noh<CR>";
# fix Y behaviour
Y = "y$";
# back and fourth between the two most recent files
"<C-c>" = ":b#<CR>";
# close by Ctrl+x
"<C-x>" = ":close<CR>";
# save by \+s or Ctrl+s
"<leader>s" = ":w<CR>";
"<C-s>" = ":w<CR>";
# navigate windows
"<leader>h" = "<C-w>h";
"<leader>j" = "<C-w>j";
"<leader>k" = "<C-w>k";
"<leader>l" = "<C-w>l";
# resize with arrows
"<C-Up>" = ":resize -2<CR>";
"<C-Down>" = ":resize +2<CR>";
"<C-Left>" = ":vertical resize +2<CR>";
"<C-Right>" = ":vertical resize -2<CR>";
# move current line up/down
# M = Alt key
"<M-k>" = ":move-2<CR>";
"<M-j>" = ":move+<CR>";
};
visual =
lib.mapAttrsToList
(key: action: {
mode = "v";
inherit action key;
})
{
# move selected line / block of text in visual mode
"K" = ":m '<-2<CR>gv=gv";
"J" = ":m '>+1<CR>gv=gv";
};
in
config.nixvim.helpers.keymaps.mkKeymaps
{options.silent = true;}
(normal ++ visual);
}; };
} }
nixos/modules/nixvim/plugins/barbar.nix
+1 -1
View File
@@ -6,7 +6,7 @@
next = "<TAB>"; next = "<TAB>";
previous = "<S-TAB>"; previous = "<S-TAB>";
close = "<C-q>"; # close = "<C-q>";
}; };
}; };
} }
nixos/modules/services.nix
+3
View File
@@ -0,0 +1,3 @@
{
services.openssh.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/modules/user.nix
+3 -3
View File
@@ -4,14 +4,14 @@
users = { users = {
defaultUserShell = pkgs.zsh; defaultUserShell = pkgs.zsh;
users.amper = { users.wyj = {
isNormalUser = true; isNormalUser = true;
description = "Ampersand"; description = "Yingjie Wang";
extraGroups = [ "networkmanager" "wheel" "input" "libvirtd" ]; extraGroups = [ "networkmanager" "wheel" "input" "libvirtd" ];
packages = with pkgs; []; packages = with pkgs; [];
}; };
}; };
# Enable automatic login for the user. # Enable automatic login for the user.
services.getty.autologinUser = "amper"; #services.getty.autologinUser = "amper";
} }
nixos/packages.nix
+12 -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
@@ -51,6 +52,9 @@
brightnessctl brightnessctl
swww swww
openssl openssl
lazygit
bluez
bluez-tools
# GUI utils # GUI utils
feh feh
@@ -84,9 +88,9 @@
pamixer pamixer
# GPU stuff # GPU stuff
amdvlk #amdvlk
rocm-opencl-icd #rocm-opencl-icd
glaxnimate #glaxnimate
# Screenshotting # Screenshotting
grim grim
@@ -111,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
]; ];
} }