Compare commits

..

No commits in common. "b006f4e4d592c57b0fa64f05e908387faa58dd4b" and "be2e463958d2b9f6a6dc4b5a769572b4c3b984c6" have entirely different histories.

27 changed files with 408 additions and 453 deletions

View file

@ -2,8 +2,8 @@ name: deploy systems
on: on:
push: push:
paths: branches:
- "**.lock" - master
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View file

@ -1,44 +1,5 @@
{ {
"nodes": { "nodes": {
"ags": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1699817941,
"narHash": "sha256-Yos4QFOaUOdjUu21Aira7RhllLkSiE1u2yNn/PcyBqI=",
"owner": "Aylur",
"repo": "ags",
"rev": "54fd9cf50c428bc8760ef20f05f6daffcb821896",
"type": "github"
},
"original": {
"owner": "Aylur",
"repo": "ags",
"type": "github"
}
},
"anyrun": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1696926085,
"narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=",
"owner": "Kirottu",
"repo": "anyrun",
"rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216",
"type": "github"
},
"original": {
"owner": "Kirottu",
"repo": "anyrun",
"type": "github"
}
},
"crane": { "crane": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -115,27 +76,6 @@
} }
}, },
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"anyrun",
"nixpkgs"
]
},
"locked": {
"lastModified": 1696343447,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
@ -153,7 +93,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_3": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
@ -171,24 +111,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -254,11 +176,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699783872, "lastModified": 1699748018,
"narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "narHash": "sha256-28rwXnxgscLkeII6wj44cuP6RuiynhzZSa424ZwGt/s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "280721186ab75a76537713ec310306f0eba3e407", "rev": "50e582b9f91e409ffd2e134017445d376659b32e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,17 +192,17 @@
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"systems": "systems", "systems": "systems",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1699991507, "lastModified": 1699726486,
"narHash": "sha256-cX9QJkulEtvwgCgpOV3gCFrb7AT8yRr03nXenPIIVeI=", "narHash": "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "e8469f8b1bb184a08351ee3cc3fcc4d0638eb90b", "rev": "9afdd61adeaf413afbe853dbc5fdf6853c8bde21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,26 +211,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprland-plugins": {
"inputs": {
"hyprland": [
"hyprland"
]
},
"locked": {
"lastModified": 1699829380,
"narHash": "sha256-KSLTqvOIzv12IDJHPBKsrKd4eWOEKQBLEQr15PATMjE=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "9ad145a1021ea48beec65f234137d23e05c30918",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-plugins",
"type": "github"
}
},
"hyprland-protocols": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -344,11 +246,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1699903489, "lastModified": 1699376527,
"narHash": "sha256-j/qZoN22170Kc0I2I4xcJXtDgBdiUECZmxjF71LrY/8=", "narHash": "sha256-ODtyJTPFPKrkXLdsgsD/mWDO6Eajw3pSMJKDnmtZ8+k=",
"owner": "JakeStanger", "owner": "JakeStanger",
"repo": "ironbar", "repo": "ironbar",
"rev": "422edb315298b3e408b8d38ba3a73c5dca960869", "rev": "0d9e4545aa827a204d6fad17f52d14dff2d40231",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -360,11 +262,11 @@
"libnbtplusplus": { "libnbtplusplus": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1699286814, "lastModified": 1690036783,
"narHash": "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk=", "narHash": "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug=",
"owner": "PrismLauncher", "owner": "PrismLauncher",
"repo": "libnbtplusplus", "repo": "libnbtplusplus",
"rev": "23b955121b8217c1c348a9ed2483167a6f3ff4ad", "rev": "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -375,7 +277,7 @@
}, },
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1698420672, "lastModified": 1698420672,
@ -393,7 +295,7 @@
}, },
"nh": { "nh": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"nix-filter": "nix-filter", "nix-filter": "nix-filter",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -443,25 +345,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1700010845,
"narHash": "sha256-Zpd6vdDBsL8phO9QlIPX/h01v2LCOPlsrJQreOSenoQ=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "92d6637940bf86746a4f5efa7b86e1d94090b351",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "nix-gaming",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -484,11 +367,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1693471703, "lastModified": 1698134075,
"narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,31 +417,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_3": {
"locked": {
"dir": "lib",
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1699756042, "lastModified": 1699110214,
"narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", "rev": "78f3a4ae19f0e99d5323dd2e3853916b8ee4afee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -569,22 +434,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1698134075,
"narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1698553279, "lastModified": 1698553279,
"narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=",
@ -598,29 +447,13 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1699343069, "lastModified": 1699099776,
"narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1699781429,
"narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -630,13 +463,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1699343069, "lastModified": 1699094435,
"narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -664,11 +497,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699271226, "lastModified": 1698852633,
"narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=", "narHash": "sha256-Hsc/cCHud8ZXLvmm8pxrXpuaPEeNaaUttaCvtdX/Wug=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "ea758da1a6dcde6dc36db348ed690d09b9864128", "rev": "dec10399e5b56aa95fcd530e0338be72ad6462a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -680,18 +513,18 @@
"prismlauncher": { "prismlauncher": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_2",
"libnbtplusplus": "libnbtplusplus", "libnbtplusplus": "libnbtplusplus",
"nix-filter": "nix-filter_2", "nix-filter": "nix-filter_2",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_4",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1699860753, "lastModified": 1699724093,
"narHash": "sha256-bCZYkt7VyOfF0yRPjQhM6BT2DYWKMzkJDYHDSHHdDS4=", "narHash": "sha256-oB8kJ2ExM+WCPUMsM3DIDg25ZHop2G01AZJsY6DwkuI=",
"owner": "PrismLauncher", "owner": "PrismLauncher",
"repo": "PrismLauncher", "repo": "PrismLauncher",
"rev": "a3445cbbdd023c7948468edcddd540dd7f7dfd68", "rev": "e7b2dbdd003c2da55bb3e45b42bd9d6b158d9338",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -702,17 +535,13 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"ags": "ags",
"anyrun": "anyrun",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins",
"ironbar": "ironbar", "ironbar": "ironbar",
"nh": "nh", "nh": "nh",
"nix-gaming": "nix-gaming",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_3",
"prismlauncher": "prismlauncher", "prismlauncher": "prismlauncher",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
@ -747,11 +576,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1699951338, "lastModified": 1699311858,
"narHash": "sha256-1GeczM7XfgHcYGYiYNcdwSFu3E62vmh4d7mffWZvyzE=", "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "0e3a94167dcd10a47b89141f35b2ff9e04b34c46", "rev": "664187539871f63857bda2d498f452792457b998",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,12 +7,6 @@
}; };
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
prismlauncher.url = "github:PrismLauncher/PrismLauncher"; prismlauncher.url = "github:PrismLauncher/PrismLauncher";
ags.url = "github:Aylur/ags";
nix-gaming.url = "github:fufexan/nix-gaming";
hyprland-plugins = {
url = "github:hyprwm/hyprland-plugins";
inputs.hyprland.follows = "hyprland";
};
deploy-rs = { deploy-rs = {
url = "github:serokell/deploy-rs"; url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -37,10 +31,6 @@
url = "github:viperML/nh"; url = "github:viperML/nh";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
anyrun = {
url = "github:Kirottu/anyrun";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = {nixpkgs, ...} @ inputs: let outputs = {nixpkgs, ...} @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
@ -55,7 +45,6 @@
sops sops
alejandra alejandra
yaml-language-server yaml-language-server
lua-language-server
]; ];
}; };
formatter.${system} = pkgs.alejandra; formatter.${system} = pkgs.alejandra;

View file

@ -1,58 +0,0 @@
{
inputs,
pkgs,
lib,
...
}: let
compileSCSS = name: source: "${pkgs.runCommandLocal name {} ''
mkdir -p $out
${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css
''}/${name}.css";
in {
programs.anyrun = {
enable = true;
config = {
plugins = with inputs.anyrun.packages.${pkgs.system}; [
applications
dictionary
websearch
];
width = {fraction = 0.3;};
hideIcons = false;
ignoreExclusiveZones = false;
layer = "overlay";
hidePluginInfo = false;
closeOnClick = false;
showResultsImmediately = false;
};
extraCss = builtins.readFile (compileSCSS "style" ./style.scss);
extraConfigFiles = {
"dictionary.ron".text = ''
Config(
prefix: ":def",
)
'';
"applications.ron".text = ''
Config(
desktop_actions: false,
max_entries: 10,
)
'';
"websearch.ron".text = ''
Config(
prefix: "?",
engines: [
Custom(
name: "SearXNG",
url: "100.121.201.47:8100/search?q={}",
),
Custom(
name: "nix packages",
url: "search.nixos.org/packages?query={}&channel=unstable",
),
],
)
'';
};
};
}

View file

@ -1,30 +0,0 @@
* {
transition: 200ms ease-out;
color: #cdd6f4;
font-family: Monaspace Krypton;
font-size: 1.0rem;
}
#window,
#match,
#entry,
#plugin,
#main {
background: transparent;
}
#match:selected {
background:#2ac3de;
border-radius: 5px;
}
box#main {
background: #1a1b26;
border: 1px solid #f7768e;
border-radius: 24px;
padding: 8px;
}
entry#entry {
border-color: transparent;
}

View file

@ -1,25 +0,0 @@
_: {
programs.cava = {
enable = true;
settings = {
general = {
mode = "normal";
framerate = 144;
bars = 0;
bar_width = 2;
bar_spacing = 3;
};
color = {
gradient = 1;
gradient_count = 2;
gradient_color_2 = "'#2ac3de'";
gradient_color_1 = "'#f7768e";
};
smoothing = {
monstercat = 1;
waves = 1;
gravity = 100;
};
};
};
}

View file

@ -10,12 +10,16 @@
gtk = { gtk = {
enable = true; enable = true;
font = { font = {
name = "Monaspace Krypton"; name = "jost";
package = pkgs.monaspace; package = pkgs.jost;
}; };
theme = { theme = {
name = "Tokyonight-Dark-BL"; name = "Catppuccin-Mocha-Standard-Pink-Dark";
package = pkgs.tokyo-night-gtk; package = pkgs.catppuccin-gtk.override {
accents = ["pink"];
size = "standard";
variant = "mocha";
};
}; };
}; };
} }

View file

@ -6,7 +6,7 @@
programs.helix = { programs.helix = {
enable = true; enable = true;
settings = { settings = {
theme = "tokyonight"; theme = "catppuccin_mocha";
editor = { editor = {
auto-save = true; auto-save = true;
true-color = true; true-color = true;

View file

@ -5,16 +5,14 @@ _: {
windowSize = "normal"; windowSize = "normal";
gui.theme = { gui.theme = {
lightTheme = false; lightTheme = false;
activeBorderColor = ["#2ac3de" "bold"]; activeBorderColor = ["#a6e3a1" "bold"];
inactiveBorderColor = ["#f7768e"]; inactiveBorderColor = ["#cdd6f4"];
optionsTextColor = [" #c0caf5"]; optionsTextColor = ["#89b4fa"];
selectedLineBgColor = ["#24283b"]; selectedLineBgColor = ["#313244"];
selectedRangeByColor = ["#24283b"]; selectedRangeByColor = ["#313244"];
cherryPickedCommitBgColor = ["#94e2d5"]; cherryPickedCommitBgColor = ["#94e2d5"];
cherryPickedCommitFgColor = ["#89b4fa"]; cherryPickedCommitFgColor = ["#89b4fa"];
unstagedChangesColor = ["red"]; unstagedChangesColor = ["red"];
showRandomTip = false;
animateExplosion = true;
}; };
}; };
}; };

View file

@ -8,12 +8,12 @@ _: {
ignoreTimeout = true; ignoreTimeout = true;
anchor = "top-right"; anchor = "top-right";
output = "DP-2"; output = "DP-2";
font = "Monaspace Krypton 10"; font = "jost 10";
padding = "6"; padding = "6";
margin = "18,21,0"; margin = "18,21,0";
backgroundColor = "#1a1b26"; backgroundColor = "#1e1e2e";
textColor = "#a9b1d6"; textColor = "#cdd6f4";
borderColor = "#2ac3de"; borderColor = "#74c7ec";
progressColor = "over #313244"; progressColor = "over #313244";
}; };
} }

View file

@ -0,0 +1,111 @@
* {
bg-col: #1e1e2e;
bg-col-light: #1e1e2e;
border-col: #1e1e2e;
selected-col: #1e1e2e;
blue: #89b4fa;
fg-col: #cdd6f4;
fg-col2: #f38ba8;
grey: #6c7086;
width: 600;
font: "JetBrainsMono Nerd Font 14";
}
element-text, element-icon , mode-switcher {
background-color: inherit;
text-color: inherit;
}
window {
height: 360px;
border: 3px;
border-color: @border-col;
background-color: @bg-col;
}
mainbox {
background-color: @bg-col;
}
inputbar {
children: [prompt,entry];
background-color: @bg-col;
border-radius: 5px;
padding: 2px;
}
prompt {
background-color: @blue;
padding: 6px;
text-color: @bg-col;
border-radius: 3px;
margin: 20px 0px 0px 20px;
}
textbox-prompt-colon {
expand: false;
str: ":";
}
entry {
padding: 6px;
margin: 20px 0px 0px 10px;
text-color: @fg-col;
background-color: @bg-col;
}
listview {
border: 0px 0px 0px;
padding: 6px 0px 0px;
margin: 10px 0px 0px 20px;
columns: 2;
lines: 5;
background-color: @bg-col;
}
element {
padding: 5px;
background-color: @bg-col;
text-color: @fg-col ;
}
element-icon {
size: 25px;
}
element selected {
background-color: @selected-col ;
text-color: @fg-col2 ;
}
mode-switcher {
spacing: 0;
}
button {
padding: 10px;
background-color: @bg-col-light;
text-color: @grey;
vertical-align: 0.5;
horizontal-align: 0.5;
}
button selected {
background-color: @bg-col;
text-color: @blue;
}
message {
background-color: @bg-col-light;
margin: 2px;
padding: 2px;
border-radius: 5px;
}
textbox {
padding: 6px;
margin: 20px 0px 0px 20px;
text-color: @blue;
background-color: @bg-col-light;
}

22
home/rofi/default.nix Normal file
View file

@ -0,0 +1,22 @@
{pkgs, ...}: {
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
theme = ./catppuccin-mocha.rasi;
extraConfig = {
modi = "run,drun,window";
icon-theme = "Oranchelo";
show-icons = true;
terminal = "wezterm";
drun-display-format = "{icon} {name}";
location = 0;
disable-history = false;
hide-scrollbar = true;
display-drun = " Apps ";
display-run = " Run ";
display-window = " Window";
display-Network = " 󰤨 Network";
sidebar-mode = true;
};
};
}

View file

@ -19,7 +19,7 @@ _: {
gaps_in = 10 gaps_in = 10
gaps_out = 20 gaps_out = 20
border_size = 4 border_size = 4
col.active_border = rgb(f7768e) rgb(2ac3de) col.active_border = rgb(f5c2e7)
col.inactive_border = rgb(6c7086) col.inactive_border = rgb(6c7086)
layout = dwindle layout = dwindle
@ -48,17 +48,12 @@ _: {
enabled = yes enabled = yes
bezier = fastBezier, 0.05, 1.1, 0.2, 1.0 bezier = fastBezier, 0.05, 1.1, 0.2, 1.0
bezier = linear, 0.0, 0.0, 1.0, 1.0
bezier = liner, 1, 1, 1, 1
animation = windows, 1, 7, fastBezier, slide animation = windows, 1, 7, fastBezier, slide
animation = windowsOut, 1, 7, fastBezier, slide animation = windowsOut, 1, 7, fastBezier, slide
animation = border, 1, 10, fastBezier animation = border, 1, 10, fastBezier
animation = fade, 1, 7, fastBezier animation = fade, 1, 7, fastBezier
animation = workspaces, 1, 6, fastBezier animation = workspaces, 1, 6, fastBezier
animation = border, 1, 1, liner
animation = borderangle, 1, 40, liner, loop
animation = borderangle, 1, 100, linear, loop
} }
dwindle { dwindle {
@ -78,10 +73,6 @@ _: {
sensitivity = -0.5 sensitivity = -0.5
} }
misc {
disable_hyprland_logo = true
}
exec-once = swww init exec-once = swww init
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@ -100,7 +91,6 @@ _: {
windowrulev2 = float, title:^(RuneLite)$ windowrulev2 = float, title:^(RuneLite)$
windowrulev2 = move 850 360, title:^(RuneLite)$ windowrulev2 = move 850 360, title:^(RuneLite)$
windowrulev2 = size 830 600, title:^(RuneLite)$ windowrulev2 = size 830 600, title:^(RuneLite)$
windowrulev2 = fullscreen, title:^(cs2)$
#binds #binds
$mainMod = SUPER $mainMod = SUPER
@ -108,7 +98,7 @@ _: {
bind = $mainMod, Return, exec, wezterm bind = $mainMod, Return, exec, wezterm
bind = $mainMod, Q, killactive, bind = $mainMod, Q, killactive,
bind = $mainMod, V, togglefloating, bind = $mainMod, V, togglefloating,
bind = $mainMod, R, exec, anyrun bind = $mainMod, R, exec, rofi -modi run -show drun
bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle bind = $mainMod, J, togglesplit, # dwindle
bind =, Print, exec, grim -g "$(slurp)" - | swappy -f - bind =, Print, exec, grim -g "$(slurp)" - | swappy -f -

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 KiB

View file

@ -0,0 +1,60 @@
{
pkgs,
lib,
...
}: let
compileSCSS = name: source: "${pkgs.runCommandLocal name {} ''
mkdir -p $out
${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css
''}/${name}.css";
in {
programs.waybar = {
enable = true;
systemd.enable = true;
settings = {
bar = {
layer = "top";
position = "top";
height = 30;
modules-left = ["river/tags"];
modules-center = ["river/window"];
modules-right = ["cpu" "memory" "clock" "battery" "tray"];
};
"river/tags" = {
num-tags = 5;
tag-labels = ["" "" "" "" ""];
};
"river/window" = {
format = "{}";
};
"cpu" = {
interval = 10;
format = "{}%";
max-length = 10;
tooltip = false;
};
"memory" = {
interval = 10;
format = "{}%";
max-length = 10;
tooltip = false;
};
"battery" = {
format = "{capacity}%";
interval = 60;
tooltip = false;
};
"clock" = {
interval = 60;
format = "{:%H:%M}";
max-length = 25;
tooltip = false;
};
"tray" = {
icon-size = 21;
spacing = 5;
};
};
style = builtins.readFile (compileSCSS "style" ./style.scss);
};
}

View file

@ -0,0 +1,68 @@
$rosewater: #f5e0dc;
$flamingo: #f2cdcd;
$pink: #f5c2e7;
$mauve: #cba6f7;
$red: #f38ba8;
$maroon: #eba0ac;
$peach: #fab387;
$yellow: #f9e2af;
$green: #a6e3a1;
$teal: #94e2d5;
$sky: #89dceb;
$sapphire: #74c7ec;
$blue: #89b4fa;
$lavender: #b4befe;
$text: #cdd6f4;
$subtext1: #bac2de;
$subtext0: #a6adc8;
$overlay2: #9399b2;
$overlay1: #7f849c;
$overlay0: #6c7086;
$surface2: #585b70;
$surface1: #45475a;
$surface0: #313244;
$base: #1e1e2e;
$mantle: #181825;
$crust: #11111b;
@mixin module-spacing {
padding: 0 0.5rem 0 0.5rem;
}
* {
all: unset;
font-family: JetBrainsMono Nerd Font;
font-size: 13px;
color: $text;
}
window#waybar {
background-color: $base;
}
#tags {
button {
padding: 0.5rem;
}
button.focused {
border-radius: 3px;
border: 1px solid;
border-color: $red;
}
button.urgent {
border-radius: 3px;
background-color: $red;
}
}
#cpu,
#memory,
#clock,
#battery,
#tray {
@include module-spacing;
}

View file

@ -1,19 +0,0 @@
local wezterm = require 'wezterm'
return {
front_end = "WebGpu",
webgpu_preferred_adapter = {
backend = "Vulkan",
device_type = "DiscreteGpu",
name = "NVIDIA GeForce GTX 1070 Ti"
},
enable_wayland = false,
font = wezterm.font 'Monaspace Krypton',
font_size = 12.0,
window_background_opacity = 0.6,
text_background_opacity = 1.0,
enable_tab_bar = false,
color_scheme = 'tokyonight',
window_padding = { top = 0, bottom = 0, left = 0, right = 0 }
}

View file

@ -1,6 +1,31 @@
_: { _: {
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
extraConfig = builtins.readFile ./config.lua; extraConfig = ''
local wezterm = require 'wezterm'
return {
front_end = "WebGpu",
webgpu_preferred_adapter = {
backend="Vulkan",
device_type="DiscreteGpu",
name="NVIDIA GeForce GTX 1070 Ti"
},
enable_wayland = false,
font = wezterm.font 'Comic Code Ligatures',
font_size = 12.0,
window_background_opacity = 0.6,
text_background_opacity = 1.0,
enable_tab_bar = false,
color_scheme = 'Catppuccin Mocha',
window_padding = {
top = 0,
bottom = 0,
left = 0,
right = 0,
}
}
'';
}; };
} }

View file

@ -2,35 +2,44 @@ _: {
programs.zathura = { programs.zathura = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
set notification-error-bg "#f7768e" set default-fg "#CDD6F4"
set notification-error-fg "#c0caf5" set default-bg "#1E1E2E"
set notification-warning-bg "#e0af68"
set notification-warning-fg "#414868" set completion-bg "#313244"
set notification-bg "#1a1b26" set completion-fg "#CDD6F4"
set notification-fg "#c0caf5" set completion-highlight-bg "#575268"
set completion-bg "#1a1b26" set completion-highlight-fg "#CDD6F4"
set completion-fg "#a9b1d6" set completion-group-bg "#313244"
set completion-group-bg "#1a1b26" set completion-group-fg "#89B4FA"
set completion-group-fg "#a9b1d6"
set completion-highlight-bg "#414868" set statusbar-fg "#CDD6F4"
set completion-highlight-fg "#c0caf5" set statusbar-bg "#313244"
set index-bg "#1a1b26"
set index-fg "#c0caf5" set notification-bg "#313244"
set index-active-bg "#414868" set notification-fg "#CDD6F4"
set index-active-fg "#c0caf5" set notification-error-bg "#313244"
set inputbar-bg "#1a1b26" set notification-error-fg "#F38BA8"
set inputbar-fg "#c0caf5" set notification-warning-bg "#313244"
set statusbar-bg "#1a1b26" set notification-warning-fg "#FAE3B0"
set statusbar-fg "#c0caf5"
set highlight-color "#e0af68" set inputbar-fg "#CDD6F4"
set highlight-active-color "#9ece6a" set inputbar-bg "#313244"
set default-bg "#1a1b26"
set default-fg "#c0caf5" set recolor-lightcolor "#1E1E2E"
set render-loading true set recolor-darkcolor "#CDD6F4"
set render-loading-fg "#1a1b26"
set render-loading-bg "#c0caf5" set index-fg "#CDD6F4"
set recolor-lightcolor "#1a1b26" set index-bg "#1E1E2E"
set recolor-darkcolor "#c0caf5" set index-active-fg "#CDD6F4"
set index-active-bg "#313244"
set render-loading-bg "#1E1E2E"
set render-loading-fg "#CDD6F4"
set highlight-color "#575268"
set highlight-fg "#F5C2E7"
set highlight-active-color "#F5C2E7"
''; '';
}; };
} }

View file

@ -10,7 +10,7 @@
simplified_ui = false; simplified_ui = false;
default_layout = "default"; default_layout = "default";
ui.pane_frames.rounded_corners = true; ui.pane_frames.rounded_corners = true;
theme = "tokyonight"; theme = "catppuccin-mocha";
themes.catppuccin-mocha = { themes.catppuccin-mocha = {
bg = "#585b70"; bg = "#585b70";
fg = "#cdd6f4"; fg = "#cdd6f4";

View file

@ -3,7 +3,6 @@
./hardware-configuration.nix ./hardware-configuration.nix
./services ./services
../../modules ../../modules
../../modules/prometheus/exporters/postgres.nix
]; ];
boot.loader = { boot.loader = {

View file

@ -5,9 +5,6 @@ inputs: let
hyprlandModule = inputs.hyprland.homeManagerModules.default; hyprlandModule = inputs.hyprland.homeManagerModules.default;
ironbarModule = inputs.ironbar.homeManagerModules.default; ironbarModule = inputs.ironbar.homeManagerModules.default;
nix-index-Module = inputs.nix-index-database.hmModules.nix-index; nix-index-Module = inputs.nix-index-database.hmModules.nix-index;
anyrunModule = inputs.anyrun.homeManagerModules.default;
agsModule = inputs.ags.homeManagerModules.default;
stylixModule = inputs.stylix.homeManagerModules.stylix;
inherit (inputs.nixpkgs.lib) nixosSystem; inherit (inputs.nixpkgs.lib) nixosSystem;
in { in {
tsuki = nixosSystem { tsuki = nixosSystem {
@ -28,8 +25,6 @@ in {
hyprlandModule hyprlandModule
ironbarModule ironbarModule
nix-index-Module nix-index-Module
anyrunModule
agsModule
]; ];
}; };
}; };

View file

@ -1,10 +1,10 @@
{lib, ...}: { {lib, ...}: {
environment.etc = { environment.etc = {
"resolv.conf".text = "nameserver 1.1.1.1\n"; "resolv.conf".text = "nameserver 8.8.8.8\n";
}; };
networking = { networking = {
nameservers = [ nameservers = [
"1.1.1.1" "8.8.8.8"
]; ];
defaultGateway = "172.31.1.1"; defaultGateway = "172.31.1.1";
defaultGateway6 = { defaultGateway6 = {

View file

@ -1,12 +1,9 @@
{ {
inputs,
config, config,
pkgs, pkgs,
... ...
}: { }: {
imports = [ imports = [
inputs.nix-gaming.nixosModules.steamCompat
inputs.nix-gaming.nixosModules.pipewireLowLatency
./hardware-configuration.nix ./hardware-configuration.nix
./services ./services
../../home/wayland/hyprland/wayland.nix ../../home/wayland/hyprland/wayland.nix
@ -55,6 +52,17 @@
}; };
}; };
environment.etc = {
"pipewire/pipewire.conf.d/92-low-latency.conf".text = ''
context.properties = {
default.clock.rate = 48000
default.clock.quantum = 1024
default.clock.min-quantum = 16
default.clock.max-quantum = 2048
}
'';
};
services.pcscd.enable = true; services.pcscd.enable = true;
services.davfs2.enable = true; services.davfs2.enable = true;
@ -67,18 +75,10 @@
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
wireplumber.enable = true; wireplumber.enable = true;
lowLatency = {
enable = true;
quantum = 64;
rate = 48000;
};
}; };
programs.steam = { programs.steam = {
enable = true; enable = true;
extraCompatPackages = [
inputs.nix-gaming.packages.${pkgs.system}.proton-ge
];
}; };
security.polkit.enable = true; security.polkit.enable = true;
@ -92,7 +92,7 @@
nvidia = { nvidia = {
powerManagement.enable = true; powerManagement.enable = true;
modesetting.enable = true; modesetting.enable = true;
package = config.boot.kernelPackages.nvidiaPackages.production; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
opengl = { opengl = {
enable = true; enable = true;

View file

@ -1,19 +1,13 @@
{ {pkgs, ...}: {
inputs,
pkgs,
...
}: {
imports = [ imports = [
../../home ../../home
../../home/ags
../../home/anyrun
../../home/cava
../../home/wezterm ../../home/wezterm
../../home/zathura ../../home/zathura
../../home/gtk ../../home/gtk
../../home/mako ../../home/mako
../../home/lf ../../home/lf
../../home/zellij ../../home/zellij
../../home/rofi
../../home/ironbar ../../home/ironbar
../../home/spotify-player ../../home/spotify-player
../../home/wayland/hyprland ../../home/wayland/hyprland
@ -41,7 +35,6 @@
imv imv
mpv mpv
rustypaste-cli rustypaste-cli
drawio
obsidian obsidian
gimp gimp
cryptomator cryptomator
@ -51,9 +44,9 @@
gamemode gamemode
mangohud mangohud
bottles bottles
osu-lazer-bin
runelite runelite
prismlauncher prismlauncher
inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
(libsForQt5.callPackage ../../pkgs/chatterino7 {}) (libsForQt5.callPackage ../../pkgs/chatterino7 {})
(callPackage ../../pkgs/jellyfin-rpc {}) (callPackage ../../pkgs/jellyfin-rpc {})
]; ];

View file

@ -4,7 +4,6 @@
fontDir.enable = true; fontDir.enable = true;
packages = with pkgs; [ packages = with pkgs; [
corefonts corefonts
monaspace
jost jost
jetbrains-mono jetbrains-mono
nerdfonts nerdfonts

View file

@ -29,16 +29,12 @@
"https://cache.nixos.org" "https://cache.nixos.org"
"https://jakestanger.cachix.org" "https://jakestanger.cachix.org"
"https://cache.garnix.io" "https://cache.garnix.io"
"https://nix-gaming.cachix.org"
"https://anyrun.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"jakestanger.cachix.org-1:VWJE7AWNe5/KOEvCQRxoE8UsI2Xs2nHULJ7TEjYm7mM=" "jakestanger.cachix.org-1:VWJE7AWNe5/KOEvCQRxoE8UsI2Xs2nHULJ7TEjYm7mM="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
]; ];
}; };
}; };