dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: dusk:8cbabf0599fc750326d69fa7855a07450673f57f
Branches Tags
dusk:terra
..
compare: dusk:ac9730653abf6dcb2ec51e93f3ee86673e34f73f
Branches Tags
dusk:terra

No commits in common. "8cbabf0599fc750326d69fa7855a07450673f57f" and "ac9730653abf6dcb2ec51e93f3ee86673e34f73f" have entirely different histories.
8cbabf0599 ... ac9730653a

8 changed files with 71 additions and 43 deletions
Show Stats Expand all files Collapse all files

79
flake.lock
View File

@ -80,6 +80,18 @@
"url": "https://git.gaze.systems/dusk/website.git" "url": "https://git.gaze.systems/dusk/website.git"
} }
}, },
"catppuccin-discord": {
"flake": false,
"locked": {
"narHash": "sha256-Yic2wQb2Dg86yimbTXDVdRcN1N+9FJrY34PQKpQuRfo=",
"type": "file",
"url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"
},
"original": {
"type": "file",
"url": "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"
}
},
"crane": { "crane": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -482,11 +494,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1676058777, "lastModified": 1674602802,
"narHash": "sha256-zyIksNoVO6WqGv1ezsgbGdRdA9XFzw/MQrv7V0ewfGc=", "narHash": "sha256-MXq9P36zSJTD0yFd1cXC9AV6WJZJuL36R1rrwDlc0d4=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "6929a12f291fa5dee50cde9c89845b206b7333fd", "rev": "91dca3f667e146f93e6dca205b0a3f2a7a64b488",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +515,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1675935446, "lastModified": 1674556204,
"narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "narHash": "sha256-HCRmkZsq01h2Evch08zpgE9jeHdMtGdT1okWotyvuhY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "rev": "c59f0eac51da91c6989fd13a68e156f63c0e60b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +539,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1676066608, "lastModified": 1674604320,
"narHash": "sha256-wUfFD5kZ4+MSX92Zruy/W64m7E5CzORfiVdLOuyJ15o=", "narHash": "sha256-yhSiPmT3fmOaV2dLBNCsGGpN4t2Ucs6Q3dGygBH34sc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "bda8208aaa3d7eb9f14d49691b919f8f2e9f5594", "rev": "12e293e3092b03dbb9d82e7a749f482ef2b7ea6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -641,11 +653,11 @@
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1676062747, "lastModified": 1674573236,
"narHash": "sha256-jUZrWQRIO/lDeInw1Kn6WSnQxbuSfakOsTcBQiztxRQ=", "narHash": "sha256-VN1KG1Sh9s5IpLzVhCYAQcBITh4jmG8gl0F4wBX8lVk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "a304ab352b1194d6b6e0dd2ca3efe979dcbb50c9", "rev": "6e5321582ca7595455edf2a9643f83ce390d0a71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -695,11 +707,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1675933606, "lastModified": 1674550793,
"narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=", "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2", "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -710,11 +722,11 @@
}, },
"nixos-persistence": { "nixos-persistence": {
"locked": { "locked": {
"lastModified": 1675359654, "lastModified": 1668668915,
"narHash": "sha256-FPxzuvJkcO49g4zkWLSeuZkln54bLoTtrggZDJBH90I=", "narHash": "sha256-QjY4ZZbs9shwO4LaLpvlU2bO9J1juYhO9NtV3nrbnYQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd", "rev": "5df9108b346f8a42021bf99e50de89c9caa251c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +787,11 @@
"nixpkgs-wayland": { "nixpkgs-wayland": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1676084149, "lastModified": 1674656022,
"narHash": "sha256-abTVSVKLol9er5rXPFJ65lB7kIGv3pFswLYtsJd3+Cg=", "narHash": "sha256-/GPbEGC4rfvG/ySNmwGmXA9w7o0NxducqVXJJREN328=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "13ad7c7fe8e309526caa18cbcfb7a7c87c51cfd6", "rev": "880c0dc1dc100b2938e49206cc145fbec39ca532",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -822,11 +834,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1675942811, "lastModified": 1674459583,
"narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "724bfc0892363087709bd3a5a1666296759154b1", "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -838,11 +850,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1676087160, "lastModified": 1674651781,
"narHash": "sha256-el2tNbWUhpz0IBoORS144xjMTi9WIqbQWRBmrsF4M64=", "narHash": "sha256-EXq3gfw6uJLlyaSkv1GiFuJx5fVkBFKeAe2UBqTZ7wA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1ddd5cf5cc7215ea63f1dee09016b53cc79034e5", "rev": "30a00b5df32dfa34f069e83bc92283bd614cd021",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -855,6 +867,7 @@
"inputs": { "inputs": {
"bernbot": "bernbot", "bernbot": "bernbot",
"blog": "blog", "blog": "blog",
"catppuccin-discord": "catppuccin-discord",
"eww": "eww", "eww": "eww",
"helix": "helix", "helix": "helix",
"home": "home", "home": "home",
@ -942,11 +955,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1675391458, "lastModified": 1674095406,
"narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", "narHash": "sha256-RexH/1rZTiX4OhdYkuJP3MuANJ+JRgoLKL60iHm//T0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", "rev": "5f7315b9800e2e500e6834767a57e39f7dbfd495",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -991,11 +1004,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1675374853, "lastModified": 1672824257,
"narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=", "narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58", "rev": "5f264a7d6c8af27d41ff440c05262b022c055593",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

4
flake.nix
View File

@ -37,8 +37,8 @@
eww.inputs.nixpkgs.follows = "nixpkgs"; eww.inputs.nixpkgs.follows = "nixpkgs";
nix-colors.url = "github:Misterio77/nix-colors"; nix-colors.url = "github:Misterio77/nix-colors";
# catppuccin-discord.url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css"; catppuccin-discord.url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
# catppuccin-discord.flake = false; catppuccin-discord.flake = false;
}; };
outputs = inputs: let outputs = inputs: let

1
modules/develop/godot.nix Normal file
View File

@ -0,0 +1 @@
{pkgs, ...}: {environment.systemPackages = with pkgs; [godot-bin godot-headless-bin godot-server-bin];}

12
pkgs-set/overlays/obsidian.nix Normal file
View File

@ -0,0 +1,12 @@
final: prev: {
obsidian = prev.obsidian.overrideAttrs (old: {
installPhase =
prev.lib.replaceStrings
["makeWrapper ${final.electron_18}/bin/electron $out/bin/obsidian"]
[
'' makeWrapper ${final.electron_20}/bin/electron $out/bin/obsidian \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"''
]
old.installPhase;
});
}

1
pkgs-set/pkgs-to-export.nix
View File

@ -2,6 +2,7 @@ pkgs: (
pkgs.lib.getAttrs pkgs.lib.getAttrs
[ [
"fractal-next" "fractal-next"
"obsidian"
"comic-mono" "comic-mono"
"chromium" "chromium"
"discordo" "discordo"

1
users/modules/chromium/default.nix
View File

@ -29,7 +29,6 @@
"clngdbkpkpeebahjckkjfobafhncgmne" # stylus "clngdbkpkpeebahjckkjfobafhncgmne" # stylus
"hlepfoohegkhhmjieoechaddaejaokhf" # refined github "hlepfoohegkhhmjieoechaddaejaokhf" # refined github
"annfbnbieaamhaimclajlajpijgkdblo" # dark theme "annfbnbieaamhaimclajlajpijgkdblo" # dark theme
"nblkbiljcjfemkfjnhoobnojjgjdmknf" # pronoundb
]; ];
}; };
} }

4
users/modules/sway/default.nix
View File

@ -95,7 +95,7 @@
"type:touchpad" = { "type:touchpad" = {
accel_profile = "adaptive"; accel_profile = "adaptive";
tap = "enabled"; tap = "enabled";
scroll_method = "two_finger"; scroll_method = "edge";
dwt = "enabled"; dwt = "enabled";
events = "disabled_on_external_mouse"; events = "disabled_on_external_mouse";
}; };
@ -103,10 +103,10 @@
output = { output = {
"*" = { "*" = {
bg = "${config.home.homeDirectory}/.config/wallpaper fill"; bg = "${config.home.homeDirectory}/.config/wallpaper fill";
adaptive_sync = "on";
}; };
"eDP-1" = { "eDP-1" = {
scale = "2"; scale = "2";
adaptive_sync = "off";
}; };
"HDMI-A-1" = { "HDMI-A-1" = {
mode = "1920x1080@74.973Hz"; mode = "1920x1080@74.973Hz";

12
users/patriot/default.nix
View File

@ -117,8 +117,8 @@ in {
# cli stuff # cli stuff
["zoxide" "zsh" "fzf" "starship" "direnv"] ["zoxide" "zsh" "fzf" "starship" "direnv"]
# dev stuff # dev stuff
["helix" "git" "ssh"] ["helix" "git" "ssh" "obsidian"]
["lollypop"] ["lollypop" "newsflash"]
]; ];
in in
l.flatten [ l.flatten [
@ -218,6 +218,10 @@ in {
dejavu_fonts dejavu_fonts
# Programs # Programs
bitwarden bitwarden
cargo-outdated
cargo-release
cargo-udeps
vulkan-tools
krita krita
cachix cachix
gnupg gnupg
@ -233,11 +237,9 @@ in {
# fractal-next # fractal-next
obs-studio obs-studio
libreoffice-fresh libreoffice-fresh
# helvum helvum
easyeffects
nix-output-monitor nix-output-monitor
prismlauncher prismlauncher
godot_4
]; ];
}; };
programs = { programs = {