Ittihadyya/adyya-flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Ittihadyya:2c9c995c51a63eb24f26e2f87a2fcf018a80f6b9
Branches Tags
Ittihadyya:trunk
Ittihadyya:ntfy
..
compare: Ittihadyya:f795228518f673a3c7a5a5bc0e3ada7141c0e6c3
Branches Tags
Ittihadyya:trunk
Ittihadyya:ntfy

No commits in common. "2c9c995c51a63eb24f26e2f87a2fcf018a80f6b9" and "f795228518f673a3c7a5a5bc0e3ada7141c0e6c3" have entirely different histories.
2c9c995c51 ... f795228518

11 changed files with 46 additions and 137 deletions
Show stats Expand all files Collapse all files

7
adyya-pkgs/adyya_pkgs.mod.nix
View file

@ -54,16 +54,13 @@
]; ];
} }
) )
/* /* ({
({
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
gts = final.callPackage ./gts.nix {}; gts = final.callPackage ./gts.nix {};
}) })
]; ];
}) })*/ # not needed right now. One: gts is now on fructose Two: The latest version of gts is now on nixpkgs
*/
# not needed right now. One: gts is now on fructose Two: The latest version of gts is now on nixpkgs
]; ];
personal.modules = [ personal.modules = [
{ {

8
apps.mod.nix
View file

@ -6,13 +6,13 @@
ps ps
wget wget
libqalculate libqalculate
magic-wormhole # magic-wormhole # disabled because of a build failure, currently writing an issue for it
]; ];
programs = { programs = {
# For the love of Fucking please keep them in alphabetical order to soothe my brain # For the love of Fucking please keep them in alphabetical order to soothe my brain
btop = { /* btop = {
enable = true; enable = true; # disabled because of build failure, watch https://github.com/NixOS/nixpkgs/issues/368672 .
}; };*/
emacs = { emacs = {
enable = true; enable = true;
}; };

3
art.mod.nix
View file

@ -14,8 +14,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
krita krita
inkscape inkscape
libresprite # tbh, it's kinda embarrasing how far behind this is on updates libresprite
aseprite
darktable darktable
obs-studio obs-studio
# pureref # not updated on nixpkgs apparently # pureref # not updated on nixpkgs apparently

2
audio.mod.nix
View file

@ -2,7 +2,7 @@
personal.modules = [ personal.modules = [
{ {
programs.noisetorch.enable = true; programs.noisetorch.enable = true;
services.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

11
dev.mod.nix
View file

@ -9,15 +9,7 @@
extraConfig = { extraConfig = {
core = { core = {
editor = "emacs"; editor = "emacs";
sshCommand = "ssh -i ~/.ssh/id_ed25519 -i ~/.ssh/github"; #github wants a password protected ssh key, which wouldn't work with my usual workflow -e sshCommand = "ssh -i ~/.ssh/id_ed25519";
};
url = {
"ssh://git@ssh.github.com:443/" = {
insteadOf = [
"git@github.com:"
"gh:"
];
};
}; };
}; };
}; };
@ -38,7 +30,6 @@
jnoortheen.nix-ide jnoortheen.nix-ide
mkhl.direnv mkhl.direnv
matthewpi.caddyfile-support matthewpi.caddyfile-support
vue.volar
]; ];
}; };
} }

123
flake.lock
View file

@ -137,59 +137,6 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": [
"stylix",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"stylix",
"nixpkgs"
],
"nixpkgs-stable": [
"stylix",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1731363552,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"stylix",
"git-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"
}
},
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -214,11 +161,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736089250, "lastModified": 1735381016,
"narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +182,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735774425, "lastModified": 1733085484,
"narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,11 +202,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736047960, "lastModified": 1735222882,
"narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "narHash": "sha256-kWNi45/mRjQMG+UpaZQ7KyPavYrKfle3WgLn9YeBBVg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "rev": "7e3246f6ad43b44bc1c16d580d7bf6467f971530",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -319,11 +266,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1735563628, "lastModified": 1735286948,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "narHash": "sha256-JMRV2RI58nV1UqLXqm+lcea1/dr92fYjWU5S+Rz3fmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "rev": "31ac92f9628682b294026f0860e14587a09ffb4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -335,11 +282,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1735291276,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,16 +314,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1735648875, "lastModified": 1732238832,
"narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=", "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50", "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -413,11 +360,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1736064798, "lastModified": 1734546875,
"narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=", "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930", "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,22 +381,20 @@
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"systems": "systems", "systems": "systems",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux"
"tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736179037, "lastModified": 1735253599,
"narHash": "sha256-uhLRE3x5TrFeQm1waBz6ecqa2EHilFM4jLxYbOJPGrU=", "narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a6b53aa677ab9bd9098abbdc47924854c76c3eb1", "rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -538,22 +483,6 @@
"type": "github" "type": "github"
} }
}, },
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1725758778,
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-zed",
"type": "github"
}
},
"vscode-server": { "vscode-server": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",

5
games.mod.nix
View file

@ -17,9 +17,8 @@
{pkgs, ...}: { {pkgs, ...}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
lutris lutris
bottles # bottles # disabled because of python 3.12 patool failing to build - https://github.com/NixOS/nixpkgs/issues/367772
heroic # heroic # disabled because of electron build failure - https://github.com/NixOS/nixpkgs/issues/368172
r2modman
]; ];
programs.mangohud.enable = true; programs.mangohud.enable = true;
} }

2
nerd.mod.nix
View file

@ -8,7 +8,7 @@
chemtool chemtool
avogadro2 avogadro2
]; ];
programs.sagemath.enable = true; # programs.sagemath.enable = true; # disabled because of https://github.com/NixOS/nixpkgs/issues/368655
} }
) )
]; ];

14
services/forgejo/runner.mod.nix
View file

@ -9,8 +9,7 @@
}: { }: {
services.gitea-actions-runner = { services.gitea-actions-runner = {
package = pkgs.forgejo-runner; package = pkgs.forgejo-runner;
/* /* instances = {
instances = {
${config.networking.hostName} = { ${config.networking.hostName} = {
enable = true; enable = true;
hostPackages = with pkgs; hostPackages = with pkgs;
@ -29,13 +28,10 @@
settings = {}; settings = {};
tokenFile = config.sops.templates."forgejo_runner.env.secrets.yaml".path; tokenFile = config.sops.templates."forgejo_runner.env.secrets.yaml".path;
url = "https://git.collective-conciousness.monster"; url = "https://git.collective-conciousness.monster";
}; };
}; }; */
*/ };
};
} }
) )
]; ];
} } # this isn't working at all, right now. For some reasom fructose fails to start the containers when podman dns isn't enabled, but if it is, pihole fails to bind to :53, i'll probably have to just change the pihole port and enable podman dns? anyways, besides that, glucose doesn't work *at all* with the runner, it never did, so i really should figure that out at some point. :TODO
# this isn't working at all, right now. For some reasom fructose fails to start the containers when podman dns isn't enabled, but if it is, pihole fails to bind to :53, i'll probably have to just change the pihole port and enable podman dns? anyways, besides that, glucose doesn't work *at all* with the runner, it never did, so i really should figure that out at some point. :TODO

6
sops.mod.nix
View file

@ -20,10 +20,8 @@
sops.secrets.remote-build-ssh-privkey = {}; sops.secrets.remote-build-ssh-privkey = {};
} }
]; ];
/* /* aspartame.modules = [
aspartame.modules = [ ]; */
];
*/
sucrose.modules = [ sucrose.modules = [
( (
{config, ...}: { {config, ...}: {

2
sway.mod.nix
View file

@ -217,7 +217,7 @@
map_to_output = ''"UGD Artist 12 pro 0x19201012"''; map_to_output = ''"UGD Artist 12 pro 0x19201012"'';
}; };
"type:keyboard" = { "type:keyboard" = {
xkb_layout = "ro,us(colemak_dh)"; xkb_layout = "us(colemak_dh),us";
xkb_options = "grp:rctrl_toggle"; xkb_options = "grp:rctrl_toggle";
}; };
}; };