feat: added some stuff

This commit is contained in:
Nick 2025-01-03 17:10:21 -06:00
parent 9b9becb2c1
commit dd99b3a827
10 changed files with 142 additions and 148 deletions

View file

@ -11,7 +11,7 @@
user0Name = "Nick"; user0Name = "Nick";
user1Name = "Garnet"; user1Name = "Garnet";
synologyName = "synology"; synologyName = "synology";
synologyIP = "192.168.50.209"; synologyIP = "192.168.50.210";
in { in {
label = "Synology"; label = "Synology";
sync = "MWRGX2V-F5XKE5E-REP6ECT-OOPFBMF-22NHSMW-YFBU6MB-PLFUN63-R3MW2QX"; sync = "MWRGX2V-F5XKE5E-REP6ECT-OOPFBMF-22NHSMW-YFBU6MB-PLFUN63-R3MW2QX";

View file

@ -8,7 +8,7 @@ in {
label = peertubeLabel; label = peertubeLabel;
name = peertubeName; name = peertubeName;
email = { email = {
address0 = "nick@${domain3}"; address0 = "noreply@${domain3}";
}; };
sops = { sops = {
path0 = "${sopsPath}/${peertubeName}"; path0 = "${sopsPath}/${peertubeName}";

213
flake.lock generated
View file

@ -82,15 +82,15 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1717312683,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
"owner": "edolstra", "owner": "nix-community",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "edolstra", "owner": "nix-community",
"repo": "flake-compat", "repo": "flake-compat",
"type": "github" "type": "github"
} }
@ -178,24 +178,6 @@
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
@ -210,7 +192,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": [ "systems": [
"ngipkgs", "ngipkgs",
@ -231,9 +213,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,
@ -265,23 +247,17 @@
} }
}, },
"ghostty": { "ghostty": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable",
"zig": "zig"
},
"locked": { "locked": {
"lastModified": 1735362327, "lastModified": 1702368251,
"narHash": "sha256-kD49xAUMCWU60IRKoJiyJTaEUum7rk45OYjZfwWr3Ck=", "narHash": "sha256-hafrDmzGplzm+vdIo+LkOjRfA4qRcy5JmpGGksnht5c=",
"owner": "ghostty-org", "owner": "clo4",
"repo": "ghostty", "repo": "ghostty-hm-module",
"rev": "6cbd69da7839260508466f9dfb2bc0c0fbb43991", "rev": "887e13a6e7acf5ffaab0119d96e476d84db90904",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ghostty-org", "owner": "clo4",
"repo": "ghostty", "repo": "ghostty-hm-module",
"type": "github" "type": "github"
} }
}, },
@ -391,7 +367,7 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": "lix",
"nixpkgs": [ "nixpkgs": [
@ -414,12 +390,12 @@
"inputs": { "inputs": {
"buildbot-nix": "buildbot-nix", "buildbot-nix": "buildbot-nix",
"dream2nix": "dream2nix", "dream2nix": "dream2nix",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1734391563, "lastModified": 1734391563,
@ -435,6 +411,27 @@
"type": "github" "type": "github"
} }
}, },
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_2",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1735925666,
"narHash": "sha256-RjsPeJePvEkB+2/mBGhpHrh/H+v4T1xgJzdoRXwSFhM=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "c4dd42fb284f12d7adafa0a0e566e8ed0ea76f9f",
"type": "github"
},
"original": {
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734126203, "lastModified": 1734126203,
@ -452,22 +449,6 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1733423277,
"narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e36963a147267afc055f7cf65225958633e536bf",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1734202038, "lastModified": 1734202038,
"narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=", "narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=",
@ -483,6 +464,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1735669367,
"narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1730741070, "lastModified": 1730741070,
@ -499,23 +496,23 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733229606, "lastModified": 1735471104,
"narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1734649271,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
@ -531,7 +528,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1729265718, "lastModified": 1729265718,
"narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
@ -571,7 +568,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"ngipkgs", "ngipkgs",
@ -621,7 +618,7 @@
}, },
"purescript-overlay": { "purescript-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"ngipkgs", "ngipkgs",
"dream2nix", "dream2nix",
@ -667,15 +664,37 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"lix-module": "lix-module", "lix-module": "lix-module",
"ngipkgs": "ngipkgs", "ngipkgs": "ngipkgs",
"nixpkgs": "nixpkgs_2", "nixos-cosmic": "nixos-cosmic",
"nixpkgs": "nixpkgs_3",
"nur": "nur", "nur": "nur",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"sops-nix": "sops-nix_2", "sops-nix": "sops-nix_2",
"systems": "systems_4", "systems": "systems_3",
"yazi": "yazi" "yazi": "yazi"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": {
"nixpkgs": [
"nixos-cosmic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1735784864,
"narHash": "sha256-tIl5p3ueaPw7T5T1UXkLc8ISMk6Y8CI/D/rd0msf73I=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "04d5f1836721461b256ec452883362c5edc5288e",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"yazi", "yazi",
@ -776,21 +795,6 @@
} }
}, },
"systems_2": { "systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -805,7 +809,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": { "systems_3": {
"locked": { "locked": {
"lastModified": 1680978846, "lastModified": 1680978846,
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
@ -820,7 +824,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": { "systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -880,9 +884,9 @@
}, },
"yazi": { "yazi": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1735318734, "lastModified": 1735318734,
@ -897,31 +901,6 @@
"repo": "yazi", "repo": "yazi",
"type": "github" "type": "github"
} }
},
"zig": {
"inputs": {
"flake-compat": [
"ghostty"
],
"flake-utils": "flake-utils",
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1717848532,
"narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -16,8 +16,9 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
ghostty = { ghostty = {
url = "github:ghostty-org/ghostty"; url = "github:clo4/ghostty-hm-module";
}; };
nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
# edgedb = { # edgedb = {
# url = "github:edgedb/packages-nix"; # url = "github:edgedb/packages-nix";
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
@ -54,25 +55,19 @@
flake = {config, ...}: { flake = {config, ...}: {
nixosConfigurations = { nixosConfigurations = {
desktop = desktop = inputs.self.lib.mkLinuxSystem [
inputs.self.lib.mkLinuxSystem [ ./systems/desktop
./systems/desktop ./profiles/user0
./profiles/user0 ./profiles/user1
./profiles/user1 config.nixosModules.personal
config.nixosModules.personal config.nixosModules.desktop
config.nixosModules.desktop config.nixosModules.shared
config.nixosModules.shared inputs.home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default
inputs.lix-module.nixosModules.default inputs.nur.modules.nixos.default
inputs.nur.modules.nixos.default inputs.sops-nix.nixosModules.sops
inputs.sops-nix.nixosModules.sops inputs.nixos-cosmic.nixosModules.default
] ];
// {
systemPackages = [
# Add Ghostty package here
inputs.ghostty.packages.x86_64-linux.default
];
};
laptop = inputs.self.lib.mkLinuxSystem [ laptop = inputs.self.lib.mkLinuxSystem [
./systems/laptop ./systems/laptop
./profiles/user0 ./profiles/user0

View file

@ -41,7 +41,7 @@ in {
(modules) (modules)
brave brave
flameshot flameshot
# ghostty ghostty
misc-android misc-android
misc-desktop misc-desktop
misc-internet misc-internet

View file

@ -5,6 +5,12 @@ in {
name = "Social Media"; name = "Social Media";
toolbar = false; toolbar = false;
bookmarks = [ bookmarks = [
{
name = "upRootNutrition";
url = "https://upRootNutrition.com";
tags = ["uprootnutrition" "up" "root" "nutrition"];
keyword = "Root";
}
{ {
name = "Disboard"; name = "Disboard";
url = "https://disboard.org"; url = "https://disboard.org";

View file

@ -1,7 +1,10 @@
{ {
inputs, programs.ghostty = {
pkgs, enable = true;
... settings = {
}: { confirm-close-surface = false;
home.packages = [inputs.ghostty.packages.${pkgs.system}.default]; theme = "catppuccin-macchiato";
window-decoration = false;
};
};
} }

View file

@ -3,7 +3,6 @@
inherit inherit
(pkgs.kdePackages) (pkgs.kdePackages)
# KDE Packages # KDE Packages
kolourpaint kolourpaint
okular okular
partitionmanager partitionmanager
@ -16,6 +15,7 @@
gnome-software gnome-software
gparted gparted
usbimager usbimager
nomacs
; ;
}; };
} }

View file

@ -2,9 +2,8 @@
home.packages = builtins.attrValues { home.packages = builtins.attrValues {
inherit inherit
(pkgs) (pkgs)
shotcut # shotcut
# syncplay # syncplay
; ;
}; };
} }

12
nixos/modules/cosmic.nix Executable file
View file

@ -0,0 +1,12 @@
{
nix.settings = {
substituters = ["https://cosmic.cachix.org/"];
trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
};
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
services = {
desktopManager.cosmic.enable = true;
displayManager.cosmic-greeter.enable = true;
};
}