xeovalyte/nix
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
xeovalyte 2024-05-10 19:36:46 +02:00
commit 60b28466a3
No known key found for this signature in database
7 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
flake.lock generated
View File

@ -25,11 +25,19 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
<<<<<<< HEAD
"lastModified": 1713524729,
"narHash": "sha256-nHNh+7wMy3oON7Nabd4hNPARAhHvYOyqZfR2opKidfk=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "55eb93f0324e5a47c8b2c112983ce4f6bd4040c0",
=======
"lastModified": 1713931409,
"narHash": "sha256-GTdTWfJW1LT4OW9Sp5EAyuyc6Ig5Ez9lZZVG7rcEr8U=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "afa2d40b6b54185449dc67c958107d5652035a3f",
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
"type": "gitlab"
},
"original": {
@ -61,11 +69,19 @@
]
},
"locked": {
<<<<<<< HEAD
"lastModified": 1712983920,
"narHash": "sha256-TlFwckmidm+bd/1GP9HV0m6FBCRuiTH2uevxiPM0XW0=",
"owner": "getchoo",
"repo": "nix-exprs",
"rev": "acc4ee73f36cf25e97f6e5b8aa49dfffa67aa9a4",
=======
"lastModified": 1713574676,
"narHash": "sha256-ZV/JEAi7vEUjq2rFBZ0tEPQvSwGM+9uU5npyPjFJkOs=",
"owner": "getchoo",
"repo": "nix-exprs",
"rev": "54f61b3c3c726d8b325583617edb0bb24a8764ab",
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
"type": "github"
},
"original": {
@ -170,11 +186,19 @@
"systems": "systems_4"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1713214544,
"narHash": "sha256-36qa6MOhCBd39YPC0FgapwGRHZXjstw8BQuKdFzwQ4k=",
"owner": "hyprwm",
"repo": "hyprlock",
"rev": "2bce52f094c49109520ad37fc8f0d051acaace55",
=======
"lastModified": 1713777162,
"narHash": "sha256-cF5DfaRfqVcDSqIG+ePLPS9rATElKhWNLS/9MXpMzk8=",
"owner": "hyprwm",
"repo": "hyprlock",
"rev": "8658386f212f29447874fe62fa665c5864cdcc41",
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
"type": "github"
},
"original": {
@ -204,11 +228,19 @@
},
"nixpkgs": {
"locked": {
<<<<<<< HEAD
"lastModified": 1713344939,
"narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
=======
"lastModified": 1713725259,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
"type": "github"
},
"original": {
@ -234,11 +266,19 @@
},
"nixpkgs-unstable": {
"locked": {
<<<<<<< HEAD
"lastModified": 1713297878,
"narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
=======
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
>>>>>>> 8c44307b001a101539dfbe1f78fd669b2967a8fd
"type": "github"
},
"original": {

1
hosts/laptop/default.nix
View File

@ -10,6 +10,7 @@
../../modules/system/programs/syncthing.nix
../../modules/system/programs/thunar.nix
../../modules/system/programs/virtualization.nix
../../modules/system/programs/waydroid.nix
../../modules/system/utils/common.nix
../../modules/system/utils/docker.nix
../../modules/system/utils/fprint.nix

1
hosts/laptop/home.nix
View File

@ -7,6 +7,7 @@
../../modules/home/programs/common.nix
../../modules/home/programs/firefox.nix
../../modules/home/programs/git.nix
../../modules/home/programs/joplin.nix
../../modules/home/programs/kitty.nix
# ../../modules/home/programs/modrinth.nix
../../modules/home/programs/neovim

1
modules/home/programs/common.nix
View File

@ -6,7 +6,6 @@
onlyoffice-bin
vlc
signal-desktop
logseq
unstable.webcord
unstable.localsend
bitwarden

5
modules/home/programs/firefox.nix
View File

@ -1,8 +1,13 @@
{ inputs, pkgs, ... }:
{
home.packages = with pkgs; [
unstable.firefoxpwa
];
programs.firefox = {
enable = true;
# nativeMessagingHosts = [ pkgs.unstable.firefoxpwa ];
profiles.xeovalyte = {
search.engines = {
"Nix" = {

7
modules/home/programs/joplin.nix Normal file
View File

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
unstable.joplin-desktop
];
}

5
modules/system/programs/waydroid.nix Normal file
View File

@ -0,0 +1,5 @@
{ ... }:
{
virtualisation.waydroid.enable = true;
}