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

Update

Browse Source
This commit is contained in:
Hadi 2024-05-04 22:36:06 +02:00
parent 1af3617b32
commit 2c2b451d40
14 changed files with 197 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -50,6 +50,7 @@ This is my dotfiles repo. It's a work in progress, and I'm still learning how to
| Bar | waybar |
| Terminal | kitty |
| Shell | zsh |
| | tmux |
| | starship |
| | bat |
| | eza |

185
flake.lock
View File

@ -76,22 +76,6 @@
"type": "github"
}
},
"flake-compat_3": {
"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": {
"inputs": {
"nixpkgs-lib": [
@ -100,11 +84,11 @@
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github"
},
"original": {
@ -169,7 +153,7 @@
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
"systems": "systems_7"
},
"locked": {
"lastModified": 1685518550,
@ -214,11 +198,11 @@
]
},
"locked": {
"lastModified": 1714515075,
"narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
"lastModified": 1714679908,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
"type": "github"
},
"original": {
@ -235,11 +219,11 @@
]
},
"locked": {
"lastModified": 1714343445,
"narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=",
"lastModified": 1714679908,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
"type": "github"
},
"original": {
@ -289,11 +273,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1714612681,
"narHash": "sha256-Uv+XnqVAXzljkFVkGm92mgrmA2MRiszX8j7TmJUV1uA=",
"lastModified": 1714851003,
"narHash": "sha256-U5waSzulVM9LnoRgkqCGBEWkiAG/F9gK69gDgaY82qo=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "56de72f357222beca94e3d4f8152e2523a22c0b3",
"rev": "a3309b51a254f142c535022615be6f76eb23fa9b",
"type": "github"
},
"original": {
@ -352,6 +336,28 @@
"type": "github"
}
},
"hyprlang_2": {
"inputs": {
"nixpkgs": [
"rose-pine-hyprcursor",
"nixpkgs"
],
"systems": "systems_5"
},
"locked": {
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
@ -364,11 +370,11 @@
]
},
"locked": {
"lastModified": 1714589749,
"narHash": "sha256-zzkb5vc4n/YI5KHrMie7oMZlgCKxs7zm/ybVXNL02Z0=",
"lastModified": 1714755542,
"narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "c8c2151c607a036ddfc790f5f70237ab984266aa",
"rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
"type": "github"
},
"original": {
@ -400,11 +406,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1714465198,
"narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=",
"lastModified": 1714746424,
"narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4",
"rev": "3f017311191fe6d501ca2496a835d012f656ee9c",
"type": "github"
},
"original": {
@ -464,11 +470,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"lastModified": 1714635257,
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
"type": "github"
},
"original": {
@ -480,11 +486,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
"lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
"type": "github"
},
"original": {
@ -496,11 +502,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
"type": "github"
},
"original": {
@ -523,11 +529,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1714600955,
"narHash": "sha256-AHz9OVQeVlbhTboR5Wchjet9a2h+a8aPTDjEyVQLz/g=",
"lastModified": 1714730761,
"narHash": "sha256-TjxlzjUl+wf3xw1+NKJSMZ/yWO+HE7X8aP1Qey77R2o=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "82a19581defe682ff9ca7cb8b1b980b6dc297cf2",
"rev": "c05fba47c733445098847399b61ddfd81ecbde55",
"type": "github"
},
"original": {
@ -563,11 +569,11 @@
]
},
"locked": {
"lastModified": 1713954846,
"narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=",
"lastModified": 1714478972,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "6fb82e44254d6a0ece014ec423cb62d92435336f",
"rev": "2849da033884f54822af194400f8dff435ada242",
"type": "github"
},
"original": {
@ -584,9 +590,29 @@
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
"nixvim": "nixvim",
"rose-pine-hyprcursor": "rose-pine-hyprcursor",
"sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix",
"waybar": "waybar"
"spicetify-nix": "spicetify-nix"
}
},
"rose-pine-hyprcursor": {
"inputs": {
"hyprlang": "hyprlang_2",
"nixpkgs": "nixpkgs_4",
"utils": "utils"
},
"locked": {
"lastModified": 1711302328,
"narHash": "sha256-wLuFLI6S5DOretqJN05+kvrs8cbnZKfVLXrJ4hvI/Tg=",
"owner": "ndom91",
"repo": "rose-pine-hyprcursor",
"rev": "7e0473876f0e6d2308813a78fe84a6c6430b112b",
"type": "github"
},
"original": {
"owner": "ndom91",
"repo": "rose-pine-hyprcursor",
"type": "github"
}
},
"sf-arabic": {
@ -661,7 +687,7 @@
"spicetify-nix": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1704167711,
@ -738,6 +764,21 @@
}
},
"systems_5": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -752,22 +793,36 @@
"type": "github"
}
},
"waybar": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_5"
},
"systems_7": {
"locked": {
"lastModified": 1714631500,
"narHash": "sha256-yrUm8IX8mZJdpJHrd/Pd/pJYycjppe8YmqtT0yAXSkU=",
"owner": "Alexays",
"repo": "waybar",
"rev": "79ae530bd29cb561d6f48773e894dd62fe353b7f",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "Alexays",
"repo": "waybar",
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems_6"
},
"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"
}
},

7
flake.nix
View File

@ -19,11 +19,11 @@
};
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
hyprland.url = "github:hyprwm/Hyprland";
waybar.url = "github:Alexays/waybar";
rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
};
outputs = inputs@{ nixpkgs, home-manager, sops-nix, nixvim, hyprland
, spicetify-nix, nixos-hardware, waybar, ... }: {
outputs = inputs@{ nixpkgs, home-manager, sops-nix, hyprland, spicetify-nix
, nixos-hardware, ... }: {
nixosConfigurations = {
nixy = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -44,7 +44,6 @@
inherit spicetify-nix;
inherit sops-nix;
inherit hyprland;
inherit waybar;
};
};
}

13
home/apps/default.nix
View File

@ -1,4 +1,13 @@
{
imports =
[ ./kitty ./lf ./neofetch ./nvim ./qutebrowser ./spicetify ./wofi ./cava ];
imports = [
./kitty
./lf
./neofetch
./nvim
./qutebrowser
./spicetify
./wofi
./cava
./tmux
];
}

2
home/apps/kitty/default.nix
View File

@ -16,7 +16,7 @@
confirm_os_window_close = "0";
remember_window_size = "no";
disable_ligatures = "never";
shell = "${pkgs.zsh}/bin/zsh";
shell = "${pkgs.tmux}/bin/tmux";
initial_window_width = 1200;
initial_window_height = 600;

3
home/apps/nvim/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, inputs, ... }: {
{ inputs, ... }: {
imports = [
inputs.nixvim.homeManagerModules.nixvim
./auto-pairs.nix
@ -22,6 +22,7 @@
./comment.nix
./oil.nix
./trouble.nix
./tmux-navigator.nix
];
programs.nixvim = {

8
home/apps/nvim/keymaps.nix
View File

@ -46,19 +46,19 @@
{
key = "<C-h>";
action = "<C-w>h";
action = "<cmd>TmuxNavigateLeft<cr>";
}
{
key = "<C-j>";
action = "<C-w>j";
action = "<cmd>TmuxNavigateDown<cr>";
}
{
key = "<C-k>";
action = "<C-w>k";
action = "<cmd>TmuxNavigateUp<cr>";
}
{
key = "<C-l>";
action = "<C-w>l";
action = "<cmd>TmuxNavigateRight<cr>";
}
# Terminal Mappings

1
home/apps/nvim/tmux-navigator.nix Normal file
View File

@ -0,0 +1 @@
{ programs.nixvim.plugins.tmux-navigator = { enable = true; }; }

46
home/apps/tmux/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ pkgs, ... }: {
programs.tmux = {
enable = true;
mouse = true;
shell = "${pkgs.zsh}/bin/zsh";
prefix = "C-s";
terminal = "kitty";
keyMode = "vi";
extraConfig = ''
bind-key h select-pane -L
bind-key j select-pane -D
bind-key k select-pane -U
bind-key l select-pane -R
'';
plugins = with pkgs; [
tmuxPlugins.vim-tmux-navigator
{
plugin = tmuxPlugins.catppuccin;
extraConfig = ''
set-option -g status-position top
set -g @catppuccin_window_left_separator ""
set -g @catppuccin_window_right_separator " "
set -g @catppuccin_window_middle_separator " █"
set -g @catppuccin_window_number_position "right"
set -g @catppuccin_window_default_fill "number"
set -g @catppuccin_window_default_text "#W"
set -g @catppuccin_window_current_fill "number"
set -g @catppuccin_window_current_text "#W"
set -g @catppuccin_status_modules_right "directory session"
set -g @catppuccin_status_left_separator " "
set -g @catppuccin_status_right_separator ""
set -g @catppuccin_status_fill "icon"
set -g @catppuccin_status_connect_separator "no"
set -g @catppuccin_directory_text "#{pane_current_path}"
set -g @catppuccin_status_background "default"
'';
}
];
};
}

1
home/home.nix
View File

@ -39,6 +39,7 @@ in {
wget
curl
ripgrep
neovide
tree # temp
# Just cool

1
home/scripts/startup.nix
View File

@ -52,6 +52,7 @@ let
[[ ${toString variable.enableNextcloud} == "true" ]] && nextcloud-watch &
battery-notif &
sleep 2
${pkgs.waybar}/bin/waybar &
'';

7
home/system/hyprland/default.nix
View File

@ -1,12 +1,13 @@
{ self, pkgs, config, hyprland, ... }:
{ pkgs, config, hyprland, ... }:
let variable = import ../../../variables.nix;
in {
imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ./hyprcursor.nix ];
imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ];
home.packages = with pkgs; [
hyprshot
hyprpicker
hyprcursor
xdg-desktop-portal-hyprland
wlr-randr
wl-clipboard
@ -105,7 +106,7 @@ in {
"QT_QPA_PLATFORM=wayland,xcb"
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
"GTK_THEME,Flat-Remix-GTK-Violet-Darkest-Solid:dark"
# "HYPRCURSOR_THEME,rose-pine"
# "HYPRCURSOR_THEME,rose-pine-hyprcursor"
# "HYPRCURSOR_SIZE,16"
];

9
home/system/hyprland/hyprcursor.nix
View File

@ -1,9 +0,0 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ hyprcursor ];
# home.file.".local/share/icons/rose-pine-hyprcursor" = {
# recursive = true;
# source = ./rose-pine;
#};
}

4
home/system/waybar/default.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: {
{ config, ... }: {
services = {
blueman-applet.enable = true;
network-manager-applet.enable = true;
@ -6,7 +6,7 @@
programs.waybar = {
enable = true;
package = inputs.waybar.packages."${pkgs.system}".waybar;
# package = inputs.waybar.packages."${pkgs.system}".waybar;
settings = {
mainBar = {
layer = "top";