Compare commits

...

8 Commits

16 changed files with 108 additions and 40 deletions

View File

@@ -0,0 +1,23 @@
# Host-specific Hyprland config: blueocean
# Sourced from ../hyprland.conf via ~/.config/hypr/host.conf symlink.
#################
### AUTOSTART ###
#################
exec-once = 1password & firefox & thunderbird & slack & zoom &
exec-once = waybar & mako & hypridle & swww-daemon &
exec-once = $terminal
exec-once = systemctl --user start hyprpolkitagent
####################
### WINDOW RULES ###
####################
windowrule = match:class kitty, workspace 1
windowrule = match:class firefox, workspace 2
windowrule = match:class Slack, workspace 3
windowrule = match:class thunderbird, workspace 5
windowrule = match:class 1password, workspace 9
windowrule = match:class zoom, workspace 10

View File

@@ -0,0 +1,21 @@
# Host-specific Hyprland config: rihla
# Sourced from ../hyprland.conf via ~/.config/hypr/host.conf symlink.
#################
### AUTOSTART ###
#################
exec-once = discord & 1password & firefox &
exec-once = waybar & mako & hypridle & swww-daemon &
exec-once = $terminal
exec-once = systemctl --user start hyprpolkitagent
####################
### WINDOW RULES ###
####################
windowrule = match:class ghostty, workspace 1
windowrule = match:class firefox, workspace 2
windowrule = match:class discord, workspace 3
windowrule = match:class 1password, workspace 9

View File

@@ -30,18 +30,13 @@ $fileManager = dolphin
$menu = wofi --show drun $menu = wofi --show drun
################# ##############################
### AUTOSTART ### ### HOST-SPECIFIC INCLUDES ###
################# ##############################
# Autostart necessary processes (like notifications daemons, status bars, etc.) # Host-specific autostart + window rules.
# Or execute your favorite apps at launch like this: # Symlinked by home-manager to dotfiles/hypr/hosts/${hostSpec.hostName}.conf.
source = ~/.config/hypr/host.conf
exec-once = proton-mail & discord & 1password & firefox &
exec-once = thunderbird & slack & zoom &
exec-once = waybar & mako & hypridle & swww-daemon &
exec-once = $terminal
exec-once = systemctl --user start hyprpolkitagent
############################# #############################
### ENVIRONMENT VARIABLES ### ### ENVIRONMENT VARIABLES ###
@@ -139,14 +134,7 @@ animations {
# uncomment all if you wish to use that. # uncomment all if you wish to use that.
# workspace = w[tv1], gapsout:0, gapsin:0 # workspace = w[tv1], gapsout:0, gapsin:0
# workspace = f[1], gapsout:0, gapsin:0 # workspace = f[1], gapsout:0, gapsin:0
windowrule = match:class ghostty, workspace 1 # Host-specific windowrule match:class entries live in host.conf (sourced above).
windowrule = match:class firefox, workspace 2
windowrule = match:class discord, workspace 3
windowrule = match:class slack, workspace 3
windowrule = match:class Proton Mail, workspace 5
windowrule = match:class Thunderbird, workspace 5
windowrule = match:class 1password, workspace 9
windowrule = match:class Zoom Workplace, workspace 10
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
dwindle { dwindle {

View File

@@ -9,12 +9,12 @@
"cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
"cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" },
"copilot.lua": { "branch": "master", "commit": "aeca454727486d488a6ecbcde30db72e741e3524" }, "copilot.lua": { "branch": "master", "commit": "adff470bca742b7658228ed144589250ecb3dc0a" },
"crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" }, "crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" },
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
"fzf-lua": { "branch": "main", "commit": "beaa4e83e6be4174af291a464e4f49548c943963" }, "fzf-lua": { "branch": "main", "commit": "58f52b7df97aa3104db8a6763f4523e3e14e4b9b" },
"git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
"gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" }, "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" },
"grpc-nvim": { "branch": "main", "commit": "cd235398a9922ae412f59ebeabb0b13957be0d39" }, "grpc-nvim": { "branch": "main", "commit": "cd235398a9922ae412f59ebeabb0b13957be0d39" },
@@ -32,7 +32,7 @@
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
"nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
"nvim-lspconfig": { "branch": "master", "commit": "e146efacbafed3789ac568abcc5a981c5decaa58" }, "nvim-lspconfig": { "branch": "master", "commit": "81878de76c0de4ce289513734ad80c31ec7871b8" },
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
"nvim-tree.lua": { "branch": "master", "commit": "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8" }, "nvim-tree.lua": { "branch": "master", "commit": "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8" },
"nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
@@ -42,7 +42,7 @@
"rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
"snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
"telescope.nvim": { "branch": "master", "commit": "028d9a0695a0cc4cfa893889f8c408ed7ccc8adc" }, "telescope.nvim": { "branch": "master", "commit": "506338434fec5ad19cb1f8d45bf92d66c4917393" },
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
"ui": { "branch": "v3.0", "commit": "cb75908a86720172594b30de147272c1b3a7f452" }, "ui": { "branch": "v3.0", "commit": "cb75908a86720172594b30de147272c1b3a7f452" },
"volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },

View File

@@ -67,8 +67,8 @@
"format": "{}% " "format": "{}% "
}, },
"temperature": { "temperature": {
// "thermal-zone": 2, "hwmon-path-abs": "/sys/devices/platform/coretemp.0/hwmon",
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", "input-filename": "temp1_input",
"critical-threshold": 80, "critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}", // "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C", "format": "{temperatureC}°C",

15
flake.lock generated
View File

@@ -172,16 +172,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775425411, "lastModified": 1776950293,
"narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "narHash": "sha256-t6KMARLILjPuTBSRoYanUxV+FU50IFZ7L5XVdOcdtaY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "rev": "6837e0d6c5eda81fd26308489799fbf83a160465",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -598,16 +597,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1776734388, "lastModified": 1776548001,
"narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@@ -2,10 +2,10 @@
description = "My NixOS system flake"; description = "My NixOS system flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@@ -36,7 +36,7 @@
sessionVariables = { sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
GOPROXY = "https://go.dogar.dev,direct"; GOPROXY = "https://go.dogar.dev";
}; };
file.".npmrc".source = file.".npmrc".source =
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/npm/.npmrc"; config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/npm/.npmrc";

View File

@@ -1,7 +1,7 @@
{ config, ... }: { config, ... }:
{ {
programs.ghostty = { programs.ghostty = {
enable = true; enable = false;
settings = { settings = {
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";

View File

@@ -38,6 +38,9 @@
lfs = { lfs = {
locksverify = true; locksverify = true;
}; };
"url \"ssh://git@github.com/\"" = {
insteadOf = "https://github.com/";
};
}; };
}; };
} }

View File

@@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
hostSpec,
... ...
}: }:
{ {
@@ -9,6 +10,8 @@
file = { file = {
"${config.xdg.configHome}/hypr/hyprland.conf".source = "${config.xdg.configHome}/hypr/hyprland.conf".source =
config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.conf"}"; config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.conf"}";
"${config.xdg.configHome}/hypr/host.conf".source =
config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hosts/${hostSpec.hostName}.conf"}";
"${config.xdg.configHome}/hypr/hypridle.conf".source = "${config.xdg.configHome}/hypr/hypridle.conf".source =
config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hypridle.conf"}"; config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hypridle.conf"}";
"${config.xdg.configHome}/hypr/hyprlock.conf".source = "${config.xdg.configHome}/hypr/hyprlock.conf".source =

View File

@@ -3,6 +3,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
awscli2 awscli2
btop btop
lm_sensors
zoxide zoxide
unzip unzip
tmux tmux

View File

@@ -5,7 +5,7 @@
programs.uv = { programs.uv = {
enable = true; enable = true;
settings = { settings = {
pip.index-url = "https://pip.dogar.dev"; pip.index-url = "https://pip.dogar.dev/root/pypi/+simple";
}; };
}; };
} }

View File

@@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
hostSpec,
... ...
}: }:
{ {
@@ -9,6 +10,8 @@
file = { file = {
"${config.xdg.configHome}/hypr/hyprland.conf".source = "${config.xdg.configHome}/hypr/hyprland.conf".source =
config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.conf"}"; config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hyprland.conf"}";
"${config.xdg.configHome}/hypr/host.conf".source =
config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hosts/${hostSpec.hostName}.conf"}";
"${config.xdg.configHome}/hypr/hypridle.conf".source = "${config.xdg.configHome}/hypr/hypridle.conf".source =
config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hypridle.conf"}"; config.lib.file.mkOutOfStoreSymlink "${lib.custom.relativeToRoot "dotfiles/hypr/hypridle.conf"}";
"${config.xdg.configHome}/hypr/hyprlock.conf".source = "${config.xdg.configHome}/hypr/hyprlock.conf".source =
@@ -27,5 +30,5 @@
]; ];
}; };
services.awww.enable = true; services.swww.enable = true;
} }

View File

@@ -0,0 +1,24 @@
{ pkgs, ... }:
let
androidComposition = pkgs.androidenv.composeAndroidPackages {
includeNDK = true;
};
androidSdk = androidComposition.androidsdk;
in
{
environment = {
systemPackages = with pkgs; [
androidSdk
android-studio
];
variables = let
sdkPath = "${androidSdk}/libexec/android-sdk";
in {
ANDROID_HOME = sdkPath;
ANDROID_SDK_ROOT = sdkPath;
ANDROID_NDK_ROOT = "${sdkPath}/ndk-bundle";
ANDROID_USER_HOME = "\${HOME}/.android";
};
};
}

View File

@@ -45,6 +45,7 @@
# #
(map (c: lib.custom.relativeToRoot "hosts/common/optional/${c}.nix") [ (map (c: lib.custom.relativeToRoot "hosts/common/optional/${c}.nix") [
"1password" "1password"
"android-studio"
"claude-code" "claude-code"
"dconf" "dconf"
"docker" "docker"
@@ -102,6 +103,8 @@
enableIPv6 = false; enableIPv6 = false;
}; };
nixpkgs.config.android_sdk.accept_license = true;
boot = { boot = {
loader = { loader = {
# Set this to true on first install. This must be false for secure boot. # Set this to true on first install. This must be false for secure boot.